Fixed spawning of Tile entities via chunk packets

src/pocketmine/Player.php

@@ -525,21 +525,15 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 			unset($this->chunkACK[$identifier]);
 			if(isset($this->usedChunks[$index])){
 				$this->usedChunks[$index][0] = true;
-				if($this->spawned === true){
 				$X = null;
 				$Z = null;
 				Level::getXZ($index, $X, $Z);
+
 				foreach($this->getLevel()->getChunkEntities($X, $Z) as $entity){
 					if($entity !== $this){
 						$entity->spawnTo($this);
 					}
 				}
-					foreach($this->getLevel()->getChunkTiles($X, $Z) as $tile){
-						if($tile instanceof Spawnable){
-							$tile->spawnTo($this);
-						}
-					}
-				}
 			}
 		}
 	}

src/pocketmine/command/defaults/BanCommand.php

@@ -24,7 +24,6 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\Player;
-
 use pocketmine\utils\TextFormat;
 
 class BanCommand extends VanillaCommand{

src/pocketmine/command/defaults/BanIpCommand.php

@@ -24,7 +24,6 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\Player;
-
 use pocketmine\utils\TextFormat;
 
 class BanIpCommand extends VanillaCommand{

src/pocketmine/command/defaults/DeopCommand.php

@@ -24,7 +24,6 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\Player;
-
 use pocketmine\utils\TextFormat;
 
 class DeopCommand extends VanillaCommand{

src/pocketmine/command/defaults/GiveCommand.php

@@ -25,7 +25,6 @@ use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\item\Item;
 use pocketmine\Player;
-
 use pocketmine\utils\TextFormat;
 
 class GiveCommand extends VanillaCommand{

src/pocketmine/command/defaults/HelpCommand.php

@@ -24,7 +24,6 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\ConsoleCommandSender;
-
 use pocketmine\utils\TextFormat;
 
 class HelpCommand extends VanillaCommand{

src/pocketmine/command/defaults/KickCommand.php

@@ -24,7 +24,6 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\Player;
-
 use pocketmine\utils\TextFormat;
 
 class KickCommand extends VanillaCommand{

src/pocketmine/command/defaults/MeCommand.php

@@ -23,7 +23,6 @@ namespace pocketmine\command\defaults;
 
 use pocketmine\command\CommandSender;
 use pocketmine\Player;
-
 use pocketmine\utils\TextFormat;
 
 class MeCommand extends VanillaCommand{

src/pocketmine/command/defaults/OpCommand.php

@@ -24,7 +24,6 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\Player;
-
 use pocketmine\utils\TextFormat;
 
 class OpCommand extends VanillaCommand{

src/pocketmine/command/defaults/PardonCommand.php

@@ -23,7 +23,6 @@ namespace pocketmine\command\defaults;
 
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
-
 use pocketmine\utils\TextFormat;
 
 class PardonCommand extends VanillaCommand{

src/pocketmine/command/defaults/PardonIpCommand.php

@@ -23,7 +23,6 @@ namespace pocketmine\command\defaults;
 
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
-
 use pocketmine\utils\TextFormat;
 
 class PardonIpCommand extends VanillaCommand{

src/pocketmine/command/defaults/PluginsCommand.php

@@ -22,7 +22,6 @@
 namespace pocketmine\command\defaults;
 
 use pocketmine\command\CommandSender;
-
 use pocketmine\utils\TextFormat;
 
 class PluginsCommand extends VanillaCommand{

src/pocketmine/command/defaults/ReloadCommand.php

@@ -23,7 +23,6 @@ namespace pocketmine\command\defaults;
 
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
-
 use pocketmine\utils\TextFormat;
 
 class ReloadCommand extends VanillaCommand{

src/pocketmine/command/defaults/SayCommand.php

@@ -24,7 +24,6 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\CommandSender;
 use pocketmine\command\ConsoleCommandSender;
 use pocketmine\Player;
-
 use pocketmine\utils\TextFormat;
 
 class SayCommand extends VanillaCommand{

src/pocketmine/command/defaults/SetWorldSpawnCommand.php

@@ -25,7 +25,6 @@ use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
-
 use pocketmine\utils\TextFormat;
 
 class SetWorldSpawnCommand extends VanillaCommand{

src/pocketmine/command/defaults/SpawnpointCommand.php

@@ -25,7 +25,6 @@ use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\level\Position;
 use pocketmine\Player;
-
 use pocketmine\utils\TextFormat;
 
 class SpawnpointCommand extends VanillaCommand{

src/pocketmine/command/defaults/StatusCommand.php

@@ -22,7 +22,6 @@
 namespace pocketmine\command\defaults;
 
 use pocketmine\command\CommandSender;
-
 use pocketmine\utils\TextFormat;
 
 class StatusCommand extends VanillaCommand{

src/pocketmine/command/defaults/TeleportCommand.php

@@ -26,7 +26,6 @@ use pocketmine\command\CommandSender;
 use pocketmine\level\Position;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
-
 use pocketmine\utils\TextFormat;
 
 class TeleportCommand extends VanillaCommand{

src/pocketmine/command/defaults/TellCommand.php

@@ -23,7 +23,6 @@ namespace pocketmine\command\defaults;
 
 use pocketmine\command\CommandSender;
 use pocketmine\Player;
-
 use pocketmine\utils\TextFormat;
 
 class TellCommand extends VanillaCommand{

src/pocketmine/command/defaults/VersionCommand.php

@@ -24,7 +24,6 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\CommandSender;
 use pocketmine\network\protocol\Info;
 use pocketmine\plugin\Plugin;
-
 use pocketmine\utils\TextFormat;
 
 class VersionCommand extends VanillaCommand{

src/pocketmine/command/defaults/WhitelistCommand.php

@@ -23,7 +23,6 @@ namespace pocketmine\command\defaults;
 
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
-
 use pocketmine\utils\TextFormat;
 
 class WhitelistCommand extends VanillaCommand{

src/pocketmine/entity/Entity.php

@@ -32,7 +32,6 @@ use pocketmine\event\entity\EntityMoveEvent;
 use pocketmine\event\entity\EntitySpawnEvent;
 use pocketmine\event\entity\EntityTeleportEvent;
 use pocketmine\level\format\Chunk;
-
 use pocketmine\level\Level;
 use pocketmine\level\Position;
 use pocketmine\math\AxisAlignedBB;
@@ -43,13 +42,13 @@ use pocketmine\nbt\tag\Byte;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Float;
 use pocketmine\nbt\tag\Short;
-use pocketmine\Network;
 use pocketmine\network\protocol\MoveEntityPacket_PosRot;
 use pocketmine\network\protocol\MovePlayerPacket;
 use pocketmine\network\protocol\RemoveEntityPacket;
 use pocketmine\network\protocol\SetEntityMotionPacket;
 use pocketmine\network\protocol\SetTimePacket;
 use pocketmine\network\protocol\UnloadChunkPacket;
+use pocketmine\Network;
 use pocketmine\Player;
 use pocketmine\plugin\Plugin;
 use pocketmine\Server;

src/pocketmine/entity/Human.php

@@ -29,10 +29,10 @@ use pocketmine\nbt\tag\Byte;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Enum;
 use pocketmine\nbt\tag\Short;
-use pocketmine\Network;
 use pocketmine\network\protocol\AddPlayerPacket;
 use pocketmine\network\protocol\RemovePlayerPacket;
 use pocketmine\network\protocol\SetEntityMotionPacket;
+use pocketmine\Network;
 use pocketmine\Player;
 use pocketmine\utils\TextFormat;
 

src/pocketmine/event/player/PlayerItemHeldEvent.php

@@ -21,8 +21,8 @@
 
 namespace pocketmine\event\player;
 
-use pocketmine\Event;
 use pocketmine\event\Cancellable;
+use pocketmine\Event;
 use pocketmine\item\Item;
 use pocketmine\Player;
 

src/pocketmine/event/server/DataPacketReceiveEvent.php

@@ -21,8 +21,8 @@
 
 namespace pocketmine\event\server;
 
-use pocketmine\event\Cancellable;
 use pocketmine\event;
+use pocketmine\event\Cancellable;
 use pocketmine\network\protocol\DataPacket;
 use pocketmine\Player;
 

src/pocketmine/event/server/DataPacketSendEvent.php

@@ -21,8 +21,8 @@
 
 namespace pocketmine\event\server;
 
-use pocketmine\event\Cancellable;
 use pocketmine\event;
+use pocketmine\event\Cancellable;
 use pocketmine\network\protocol\DataPacket;
 use pocketmine\Player;
 

src/pocketmine/item/Tool.php

@@ -22,8 +22,8 @@
 
 namespace pocketmine\item;
 
-use pocketmine\entity\Entity;
 use pocketmine\block\Block;
+use pocketmine\entity\Entity;
 
 abstract class Tool extends Item{
 

src/pocketmine/level/Level.php

@@ -37,13 +37,13 @@ use pocketmine\level\format\Chunk;
 use pocketmine\level\format\LevelProvider;
 use pocketmine\level\format\SimpleChunk;
 use pocketmine\level\generator\Generator;
-
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector2;
 use pocketmine\math\Vector3;
 use pocketmine\metadata\BlockMetadataStore;
 use pocketmine\metadata\Metadatable;
 use pocketmine\metadata\MetadataValue;
+use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\Byte;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Double;
@@ -58,6 +58,7 @@ use pocketmine\Player;
 use pocketmine\plugin\Plugin;
 use pocketmine\Server;
 use pocketmine\tile\Sign;
+use pocketmine\tile\Spawnable;
 use pocketmine\tile\Tile;
 use pocketmine\utils\Cache;
 use pocketmine\utils\ReversePriorityQueue;
@@ -1266,7 +1267,16 @@ class Level implements ChunkManager, Metadatable{
 			}
 		}
 
-		$ordered = zlib_encode(Binary::writeLInt($X) . Binary::writeLInt($Z) . $orderedIds . $orderedData . $orderedSkyLight . $orderedLight . $biomeIds . $biomeColors, ZLIB_ENCODING_DEFLATE, self::$COMPRESSION_LEVEL);
+		$tiles = "";
+		$nbt = new NBT(NBT::LITTLE_ENDIAN);
+		foreach($chunk->getTiles() as $tile){
+			if($tile instanceof Spawnable){
+				$nbt->setData($tile->getSpawnCompound());
+				$tiles .= $nbt->write();
+			}
+		}
+
+		$ordered = zlib_encode(Binary::writeLInt($X) . Binary::writeLInt($Z) . $orderedIds . $orderedData . $orderedSkyLight . $orderedLight . $biomeIds . $biomeColors . $tiles, ZLIB_ENCODING_DEFLATE, self::$COMPRESSION_LEVEL);
 
 		if(ADVANCED_CACHE == true and $Yndex === 0xff){
 			Cache::add($identifier, $ordered, 60);

src/pocketmine/level/format/anvil/Chunk.php

@@ -29,7 +29,6 @@ use pocketmine\nbt\tag\Byte;
 use pocketmine\nbt\tag\ByteArray;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Enum;
-
 use pocketmine\nbt\tag\IntArray;
 use pocketmine\utils\Binary;
 
@@ -74,7 +73,7 @@ class Chunk extends BaseChunk{
 		}
 
 		if(!isset($this->nbt->BiomeColors) or !($this->nbt->BiomeColors instanceof IntArray)){
-			$this->nbt->BiomeColors = new IntArray("BiomeColors", array_fill(0, 156, Binary::readInt("\x01\x85\xb2\x4a")));
+			$this->nbt->BiomeColors = new IntArray("BiomeColors", array_fill(0, 156, Binary::readInt("\x00\x85\xb2\x4a")));
 		}
 
 		$sections = [];

src/pocketmine/level/format/generic/BaseChunk.php

@@ -206,7 +206,7 @@ abstract class BaseChunk implements Chunk{
 	}
 
 	public function setBiomeColor($x, $z, $R, $G, $B){
-		$this->biomeColors[($z << 4) + $x] = 0x01000000 | (($R & 0xFF) << 16) | (($G & 0xFF) << 8) | ($B & 0xFF);
+		$this->biomeColors[($z << 4) + $x] = 0 | (($R & 0xFF) << 16) | (($G & 0xFF) << 8) | ($B & 0xFF);
 	}
 
 	public function getHighestBlockAt($x, $z){

src/pocketmine/tile/Chest.php

@@ -34,8 +34,6 @@ use pocketmine\nbt\tag\Enum;
 use pocketmine\nbt\tag\Int;
 use pocketmine\nbt\tag\Short;
 use pocketmine\nbt\tag\String;
-use pocketmine\network\protocol\EntityDataPacket;
-use pocketmine\Player;
 
 class Chest extends Spawnable implements InventoryHolder, Container{
 
@@ -220,37 +218,23 @@ class Chest extends Spawnable implements InventoryHolder, Container{
 		return true;
 	}
 
-	public function spawnTo(Player $player){
-		if($this->closed){
-			return false;
-		}
-
-		$nbt = new NBT(NBT::LITTLE_ENDIAN);
+	public function getSpawnCompound(){
 		if($this->isPaired()){
-			$nbt->setData(new Compound("", array(
+			return new Compound("", array(
 				new String("id", Tile::CHEST),
 				new Int("x", (int) $this->x),
 				new Int("y", (int) $this->y),
 				new Int("z", (int) $this->z),
 				new Int("pairx", (int) $this->namedtag->pairx),
 				new Int("pairz", (int) $this->namedtag->pairz)
-			)));
+			));
 		}else{
-			$nbt->setData(new Compound("", array(
+			return new Compound("", array(
 				new String("id", Tile::CHEST),
 				new Int("x", (int) $this->x),
 				new Int("y", (int) $this->y),
 				new Int("z", (int) $this->z)
-			)));
-		}
-
-		$pk = new EntityDataPacket;
-		$pk->x = $this->x;
-		$pk->y = $this->y;
-		$pk->z = $this->z;
-		$pk->namedtag = $nbt->write();
-		$player->dataPacket($pk);
-
-		return true;
+			));
+		}
 	}
 }

src/pocketmine/tile/Sign.php

@@ -22,12 +22,9 @@
 namespace pocketmine\tile;
 
 use pocketmine\level\format\Chunk;
-use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Int;
 use pocketmine\nbt\tag\String;
-use pocketmine\network\protocol\EntityDataPacket;
-use pocketmine\Player;
 
 class Sign extends Spawnable{
 
@@ -45,6 +42,7 @@ class Sign extends Spawnable{
 		if(!isset($nbt->Text4)){
 			$nbt->Text4 = new String("Text4", "");
 		}
+
 		parent::__construct($chunk, $nbt);
 	}
 
@@ -67,30 +65,17 @@ class Sign extends Spawnable{
 		);
 	}
 
-	public function spawnTo(Player $player){
-		if($this->closed){
-			return false;
-		}
-
-		$nbt = new NBT(NBT::LITTLE_ENDIAN);
-		$nbt->setData(new Compound("", array(
+	public function getSpawnCompound(){
+		return new Compound("", array(
 			new String("Text1", $this->namedtag["Text1"]),
 			new String("Text2", $this->namedtag["Text2"]),
-			new String("Text3", $this->namedtag["Text4"]),
+			new String("Text3", $this->namedtag["Text3"]),
 			new String("Text4", $this->namedtag["Text4"]),
 			new String("id", Tile::SIGN),
 			new Int("x", (int) $this->x),
 			new Int("y", (int) $this->y),
 			new Int("z", (int) $this->z)
-		)));
-		$pk = new EntityDataPacket;
-		$pk->x = $this->x;
-		$pk->y = $this->y;
-		$pk->z = $this->z;
-		$pk->namedtag = $nbt->write();
-		$player->dataPacket($pk);
-
-		return true;
+		));
 	}
 
 }

src/pocketmine/tile/Spawnable.php

@@ -22,11 +22,31 @@
 namespace pocketmine\tile;
 
 use pocketmine\level\format\Chunk;
+use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\Compound;
+use pocketmine\network\protocol\EntityDataPacket;
 use pocketmine\Player;
 
 abstract class Spawnable extends Tile{
-	public abstract function spawnTo(Player $player);
+
+	public function spawnTo(Player $player){
+		if($this->closed){
+			return false;
+		}
+
+		$nbt = new NBT(NBT::LITTLE_ENDIAN);
+		$nbt->setData($this->getSpawnCompound());
+		$pk = new EntityDataPacket;
+		$pk->x = $this->x;
+		$pk->y = $this->y;
+		$pk->z = $this->z;
+		$pk->namedtag = $nbt->write();
+		$player->dataPacket($pk);
+
+		return true;
+	}
+
+	public abstract function getSpawnCompound();
 
 	public function __construct(Chunk $chunk, Compound $nbt){
 		parent::__construct($chunk, $nbt);