mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 18:32:55 +00:00
Code Issues Projects Releases Wiki Activity

Removed Tile numeric runtime IDs, use block hashes instead

Browse Source 
Tiles are level-local and are not indexed globally like entities. There is pretty much zero point to them having numeric runtime IDs.
This commit is contained in:
Dylan K. Taylor
2018-08-19 16:37:04 +01:00
parent 92aeab0d00
commit 7c41bfcdf3
3 changed files with 12 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/pocketmine/level/format/Chunk.php
View File

@ -69,8 +69,6 @@ class Chunk{
/** @var Tile[] */
protected $tiles = [];
/** @var Tile[] */
protected $tileList = [];
/** @var Entity[] */
protected $entities = [];
@ -595,11 +593,11 @@ class Chunk{
if($tile->isClosed()){
throw new \InvalidArgumentException("Attempted to add a garbage closed Tile to a chunk");
}
$this->tiles[$tile->getId()] = $tile;
if(isset($this->tileList[$index = (($tile->x & 0x0f) << 12) | (($tile->z & 0x0f) << 8) | ($tile->y & 0xff)]) and $this->tileList[$index] !== $tile){
$this->tileList[$index]->close();
if(isset($this->tiles[$index = (($tile->x & 0x0f) << 12) | (($tile->z & 0x0f) << 8) | ($tile->y & 0xff)]) and $this->tiles[$index] !== $tile){
$this->tiles[$index]->close();
}
$this->tileList[$index] = $tile;
$this->tiles[$index] = $tile;
if($this->isInit){
$this->hasChanged = true;
}
@ -609,8 +607,7 @@ class Chunk{
* @param Tile $tile
*/
public function removeTile(Tile $tile){
unset($this->tiles[$tile->getId()]);
unset($this->tileList[(($tile->x & 0x0f) << 12) | (($tile->z & 0x0f) << 8) | ($tile->y & 0xff)]);
unset($this->tiles[(($tile->x & 0x0f) << 12) | (($tile->z & 0x0f) << 8) | ($tile->y & 0xff)]);
if($this->isInit){
$this->hasChanged = true;
}
@ -650,7 +647,7 @@ class Chunk{
*/
public function getTile(int $x, int $y, int $z){
$index = ($x << 12) | ($z << 8) | $y;
return $this->tileList[$index] ?? null;
return $this->tiles[$index] ?? null;
}
/**