diff --git a/src/API/EntityAPI.php b/src/API/EntityAPI.php index bb775751..58ed97e1 100644 --- a/src/API/EntityAPI.php +++ b/src/API/EntityAPI.php @@ -271,7 +271,7 @@ class EntityAPI{ } public function spawnAll(Player $player){ - foreach($this->getAll($player->level) as $e){ + foreach($player->level->entityList as $e){ if($e->class !== ENTITY_PLAYER){ $e->spawn($player); } diff --git a/src/Player.php b/src/Player.php index bbf857d6..35c6fd99 100755 --- a/src/Player.php +++ b/src/Player.php @@ -164,25 +164,28 @@ class Player{ } foreach($this->level->entityList as $e){ - if($e !== $this->entity){ + if($e->eid !== $this->entity->eid){ if($e->isPlayer()){ - $pk = new MoveEntityPacket_PosRot; + $pk = new MovePlayerPacket(); $pk->eid = $this->entity->eid; $pk->x = -256; $pk->y = 128; $pk->z = -256; $pk->yaw = 0; $pk->pitch = 0; + $pk->bodyYaw = 0; $e->player->dataPacket($pk); - $pk = new MoveEntityPacket_PosRot; + $pk = new MovePlayerPacket(); $pk->eid = $e->eid; $pk->x = -256; $pk->y = 128; $pk->z = -256; $pk->yaw = 0; $pk->pitch = 0; + $pk->bodyYaw = 0; $this->dataPacket($pk); + }else{ $pk = new RemoveEntityPacket; $pk->eid = $e->eid; @@ -240,7 +243,7 @@ class Player{ $this->entity->calculateVelocity(); if($terrain === true){ $this->orderChunks(); - $this->getNextChunk($this->level); + $this->server->schedule(1, [$this, "getNextChunk"], $this->level); } $this->entity->check = true; if($force === true){