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

Nuke block extradata

Browse Source 
this has been superseded by multi-layer blockstorages in 1.2.14+
This commit is contained in:
Dylan K. Taylor
2018-04-27 19:51:22 +01:00
parent 172c6420c1
commit 66963fbf9a
3 changed files with 3 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,9 +81,6 @@ class Chunk{
/** @var string */
protected $biomeIds;
/** @var int[] */
protected $extraData = [];
/** @var CompoundTag[] */
protected $NBTtiles = [];
@ -98,9 +95,8 @@ class Chunk{
* @param CompoundTag[] $tiles
* @param string $biomeIds
* @param int[] $heightMap
* @param int[] $extraData @deprecated
*/
public function __construct(int $chunkX, int $chunkZ, array $subChunks = [], array $entities = [], array $tiles = [], string $biomeIds = "", array $heightMap = [], array $extraData = []){
public function __construct(int $chunkX, int $chunkZ, array $subChunks = [], array $entities = [], array $tiles = [], string $biomeIds = "", array $heightMap = []){
$this->x = $chunkX;
$this->z = $chunkZ;
@ -128,8 +124,6 @@ class Chunk{
$this->biomeIds = str_repeat("\x00", 256);
}
$this->extraData = $extraData;
$this->NBTtiles = $tiles;
$this->NBTentities = $entities;
}
@ -254,37 +248,6 @@ class Chunk{
}
}
/**
* @deprecated This functionality no longer produces any visible effects and will be removed in a future release
*
* @param int $x 0-15
* @param int $y
* @param int $z 0-15
*
* @return int bitmap, (meta << 8) | id
*/
public function getBlockExtraData(int $x, int $y, int $z) : int{
return $this->extraData[Chunk::chunkBlockHash($x, $y, $z)] ?? 0;
}
/**
* @deprecated This functionality no longer produces any visible effects and will be removed in a future release
*
* @param int $x 0-15
* @param int $y
* @param int $z 0-15
* @param int $data bitmap, (meta << 8) | id
*/
public function setBlockExtraData(int $x, int $y, int $z, int $data){
if($data === 0){
unset($this->extraData[Chunk::chunkBlockHash($x, $y, $z)]);
}else{
$this->extraData[Chunk::chunkBlockHash($x, $y, $z)] = $data;
}
$this->hasChanged = true;
}
/**
* Returns the sky light level at the specified chunk block coordinates
*
@ -779,14 +742,6 @@ class Chunk{
return $this->heightMap;
}
/**
* @deprecated
* @return int[]
*/
public function getBlockExtraDataArray() : array{
return $this->extraData;
}
/**
* @return bool
*/
@ -970,21 +925,4 @@ class Chunk{
$chunk->terrainGenerated = (bool) ($flags & 1);
return $chunk;
}
/**
* @deprecated This will be removed in a future release
*
* Creates a block hash from chunk block coordinates. Used for extra data keys in chunk packets.
* @internal
*
* @param int $x 0-15
* @param int $y 0-255
* @param int $z 0-15
*
* @return int
*/
public static function chunkBlockHash(int $x, int $y, int $z) : int{
return ($x << 12) | ($z << 8) | $y;
}
}