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

Merge branch 'master' into mcpe-1.2

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-28 18:02:09 +01:00
parent c7fd3eb725 37b050f864
commit b5d2402c9b
20 changed files with 53 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/pocketmine/tile/Spawnable.php
View File

@ -31,11 +31,7 @@ use pocketmine\Player;
abstract class Spawnable extends Tile{
public function spawnTo(Player $player){
if($this->closed){
return false;
}
public function createSpawnPacket() : BlockEntityDataPacket{
$nbt = new NBT(NBT::LITTLE_ENDIAN);
$nbt->setData($this->getSpawnCompound());
$pk = new BlockEntityDataPacket();
@ -43,7 +39,16 @@ abstract class Spawnable extends Tile{
$pk->y = $this->y;
$pk->z = $this->z;
$pk->namedtag = $nbt->write(true);
$player->dataPacket($pk);
return $pk;
}
public function spawnTo(Player $player){
if($this->closed){
return false;
}
$player->dataPacket($this->createSpawnPacket());
return true;
}
@ -58,11 +63,8 @@ abstract class Spawnable extends Tile{
return;
}
foreach($this->getLevel()->getChunkPlayers($this->chunk->getX(), $this->chunk->getZ()) as $player){
if($player->spawned === true){
$this->spawnTo($player);
}
}
$pk = $this->createSpawnPacket();
$this->level->addChunkPacket($this->chunk->getX(), $this->chunk->getZ(), $pk);
}
protected function onChanged(){