mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-04 17:06:16 +00:00
Code Issues Projects Releases Wiki Activity

Added support for extra data, improved BinaryStream

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-08-04 18:29:13 +02:00
parent 7fd053fb09
commit 9456e20770
11 changed files with 271 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/pocketmine/level/format/generic/BaseFullChunk.php
View File

@ -26,6 +26,7 @@ use pocketmine\entity\Entity;
use pocketmine\level\format\FullChunk;
use pocketmine\level\format\LevelProvider;
use pocketmine\level\generator\biome\Biome;
use pocketmine\level\Level;
use pocketmine\nbt\tag\Compound;
use pocketmine\Player;
use pocketmine\tile\Tile;
@ -59,6 +60,8 @@ abstract class BaseFullChunk implements FullChunk{
protected $NBTentities;
protected $extraData = [];
/** @var LevelProvider */
protected $provider;
@ -82,7 +85,7 @@ abstract class BaseFullChunk implements FullChunk{
* @param Compound[] $entities
* @param Compound[] $tiles
*/
protected function __construct($provider, $x, $z, $blocks, $data, $skyLight, $blockLight, array $biomeColors = [], array $heightMap = [], array $entities = [], array $tiles = []){
protected function __construct($provider, $x, $z, $blocks, $data, $skyLight, $blockLight, array $biomeColors = [], array $heightMap = [], array $entities = [], array $tiles = [], array $extraData = []){
$this->provider = $provider;
$this->x = (int) $x;
$this->z = (int) $z;
@ -95,7 +98,7 @@ abstract class BaseFullChunk implements FullChunk{
if(count($biomeColors) === 256){
$this->biomeColors = $biomeColors;
}else{
$this->biomeColors = array_fill(0, 256, Binary::readInt("\xff\x00\x00\x00\x00"));
$this->biomeColors = array_fill(0, 256, 0);
}
if(count($heightMap) === 256){
@ -104,6 +107,8 @@ abstract class BaseFullChunk implements FullChunk{
$this->heightMap = array_fill(0, 256, 127);
}
$this->extraData = $extraData;
$this->NBTtiles = $tiles;
$this->NBTentities = $entities;
}
@ -254,6 +259,24 @@ abstract class BaseFullChunk implements FullChunk{
}
}
public function getBlockExtraData($x, $y, $z){
if(isset($this->extraData[$index = Level::chunkBlockHash($x, $y, $z)])){
return $this->extraData[$index];
}
return 0;
}
public function setBlockExtraData($x, $y, $z, $data){
if($data === 0){
unset($this->extraData[Level::chunkBlockHash($x, $y, $z)]);
}else{
$this->extraData[Level::chunkBlockHash($x, $y, $z)] = $data;
}
$this->setChanged(true);
}
public function populateSkyLight(){
for($z = 0; $z < 16; ++$z){
for($x = 0; $x < 16; ++$x){
@ -336,6 +359,10 @@ abstract class BaseFullChunk implements FullChunk{
return $this->tiles;
}
public function getBlockExtraDataArray(){
return $this->extraData;
}
public function getTile($x, $y, $z){
$index = ($z << 12) | ($x << 8) | $y;
return isset($this->tileList[$index]) ? $this->tileList[$index] : null;