From 840690d801a38c124d6bbdb1e98ca4386dd0b9a1 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Mon, 18 May 2015 15:52:31 +0200 Subject: [PATCH] Replaced old deprecated calls --- src/pocketmine/Player.php | 3 +++ src/pocketmine/entity/Entity.php | 4 ++-- src/pocketmine/inventory/ChestInventory.php | 4 ++-- src/pocketmine/inventory/DoubleChestInventory.php | 4 ++-- src/pocketmine/level/Explosion.php | 2 +- src/pocketmine/level/Level.php | 4 ++-- src/pocketmine/tile/Spawnable.php | 2 +- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 226421704..472d5ce60 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -3044,6 +3044,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade } $this->sendPosition($this, null, null, 1, Network::CHANNEL_WORLD_CHUNKS); + $this->spawnToAll(); $this->forceMovement = $this->teleportPosition; $this->teleportPosition = null; @@ -3068,6 +3069,8 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade if(!$this->checkTeleportPosition()){ $this->forceMovement = $oldPos; + }else{ + $this->spawnToAll(); } diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php index 96561cd4e..dbaebaf4e 100644 --- a/src/pocketmine/entity/Entity.php +++ b/src/pocketmine/entity/Entity.php @@ -1343,7 +1343,7 @@ abstract class Entity extends Location implements Metadatable{ $this->chunk = $this->level->getChunk($this->x >> 4, $this->z >> 4, true); if(!$this->justCreated){ - $newChunk = $this->level->getUsingChunk($this->x >> 4, $this->z >> 4); + $newChunk = $this->level->getChunkPlayers($this->x >> 4, $this->z >> 4); foreach($this->hasSpawned as $player){ if(!isset($newChunk[$player->getId()])){ $this->despawnFrom($player); @@ -1449,7 +1449,7 @@ abstract class Entity extends Location implements Metadatable{ if($this->chunk === null){ return; } - foreach($this->level->getUsingChunk($this->chunk->getX(), $this->chunk->getZ()) as $player){ + foreach($this->level->getChunkPlayers($this->chunk->getX(), $this->chunk->getZ()) as $player){ if($player->loggedIn === true){ $this->spawnTo($player); } diff --git a/src/pocketmine/inventory/ChestInventory.php b/src/pocketmine/inventory/ChestInventory.php index 4c0b40e9a..844bbf897 100644 --- a/src/pocketmine/inventory/ChestInventory.php +++ b/src/pocketmine/inventory/ChestInventory.php @@ -51,7 +51,7 @@ class ChestInventory extends ContainerInventory{ $pk->case1 = 1; $pk->case2 = 2; if(($level = $this->getHolder()->getLevel()) instanceof Level){ - Server::broadcastPacket($level->getUsingChunk($this->getHolder()->getX() >> 4, $this->getHolder()->getZ() >> 4), $pk->setChannel(Network::CHANNEL_WORLD_EVENTS)); + Server::broadcastPacket($level->getChunkPlayers($this->getHolder()->getX() >> 4, $this->getHolder()->getZ() >> 4), $pk->setChannel(Network::CHANNEL_WORLD_EVENTS)); } } } @@ -65,7 +65,7 @@ class ChestInventory extends ContainerInventory{ $pk->case1 = 1; $pk->case2 = 0; if(($level = $this->getHolder()->getLevel()) instanceof Level){ - Server::broadcastPacket($level->getUsingChunk($this->getHolder()->getX() >> 4, $this->getHolder()->getZ() >> 4), $pk->setChannel(Network::CHANNEL_WORLD_EVENTS)); + Server::broadcastPacket($level->getChunkPlayers($this->getHolder()->getX() >> 4, $this->getHolder()->getZ() >> 4), $pk->setChannel(Network::CHANNEL_WORLD_EVENTS)); } } parent::onClose($who); diff --git a/src/pocketmine/inventory/DoubleChestInventory.php b/src/pocketmine/inventory/DoubleChestInventory.php index a73fa29da..7c882a8db 100644 --- a/src/pocketmine/inventory/DoubleChestInventory.php +++ b/src/pocketmine/inventory/DoubleChestInventory.php @@ -106,7 +106,7 @@ class DoubleChestInventory extends ChestInventory implements InventoryHolder{ $pk->case1 = 1; $pk->case2 = 2; if(($level = $this->right->getHolder()->getLevel()) instanceof Level){ - Server::broadcastPacket($level->getUsingChunk($this->right->getHolder()->getX() >> 4, $this->right->getHolder()->getZ() >> 4), $pk->setChannel(Network::CHANNEL_WORLD_EVENTS)); + Server::broadcastPacket($level->getChunkPlayers($this->right->getHolder()->getX() >> 4, $this->right->getHolder()->getZ() >> 4), $pk->setChannel(Network::CHANNEL_WORLD_EVENTS)); } } } @@ -120,7 +120,7 @@ class DoubleChestInventory extends ChestInventory implements InventoryHolder{ $pk->case1 = 1; $pk->case2 = 0; if(($level = $this->right->getHolder()->getLevel()) instanceof Level){ - Server::broadcastPacket($level->getUsingChunk($this->right->getHolder()->getX() >> 4, $this->right->getHolder()->getZ() >> 4), $pk->setChannel(Network::CHANNEL_WORLD_EVENTS)); + Server::broadcastPacket($level->getChunkPlayers($this->right->getHolder()->getX() >> 4, $this->right->getHolder()->getZ() >> 4), $pk->setChannel(Network::CHANNEL_WORLD_EVENTS)); } } parent::onClose($who); diff --git a/src/pocketmine/level/Explosion.php b/src/pocketmine/level/Explosion.php index cd5d3a0b8..abe0be5d9 100644 --- a/src/pocketmine/level/Explosion.php +++ b/src/pocketmine/level/Explosion.php @@ -215,7 +215,7 @@ class Explosion{ $pk->z = $this->source->z; $pk->radius = $this->size; $pk->records = $send; - Server::broadcastPacket($this->level->getUsingChunk($source->x >> 4, $source->z >> 4), $pk->setChannel(Network::CHANNEL_BLOCKS)); + Server::broadcastPacket($this->level->getChunkPlayers($source->x >> 4, $source->z >> 4), $pk->setChannel(Network::CHANNEL_BLOCKS)); return true; } diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index 2862a0153..ff0dc326c 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -435,7 +435,7 @@ class Level implements ChunkManager, Metadatable{ $pk = $sound->encode(); if($players === null){ - $players = $this->getUsingChunk($sound->x >> 4, $sound->z >> 4); + $players = $this->getChunkPlayers($sound->x >> 4, $sound->z >> 4); } if($pk !== null){ @@ -451,7 +451,7 @@ class Level implements ChunkManager, Metadatable{ $pk = $particle->encode(); if($players === null){ - $players = $this->getUsingChunk($particle->x >> 4, $particle->z >> 4); + $players = $this->getChunkPlayers($particle->x >> 4, $particle->z >> 4); } if($pk !== null){ diff --git a/src/pocketmine/tile/Spawnable.php b/src/pocketmine/tile/Spawnable.php index 72d941e57..77bdb3ed2 100644 --- a/src/pocketmine/tile/Spawnable.php +++ b/src/pocketmine/tile/Spawnable.php @@ -59,7 +59,7 @@ abstract class Spawnable extends Tile{ return; } - foreach($this->getLevel()->getUsingChunk($this->chunk->getX(), $this->chunk->getZ()) as $player){ + foreach($this->getLevel()->getChunkPlayers($this->chunk->getX(), $this->chunk->getZ()) as $player){ if($player->spawned === true){ $this->spawnTo($player); }