mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-17 03:08:58 +00:00
Code Issues Projects Releases Wiki Activity

Replaced old deprecated calls

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-05-18 15:52:31 +02:00
parent f3a53be117
commit 840690d801
7 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pocketmine/Player.php
View File

@ -3044,6 +3044,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
} }
$this->sendPosition($this, null, null, 1, Network::CHANNEL_WORLD_CHUNKS); $this->sendPosition($this, null, null, 1, Network::CHANNEL_WORLD_CHUNKS);
$this->spawnToAll();
$this->forceMovement = $this->teleportPosition; $this->forceMovement = $this->teleportPosition;
$this->teleportPosition = null; $this->teleportPosition = null;
@ -3068,6 +3069,8 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
if(!$this->checkTeleportPosition()){ if(!$this->checkTeleportPosition()){
$this->forceMovement = $oldPos; $this->forceMovement = $oldPos;
}else{
$this->spawnToAll();
} }

4
src/pocketmine/entity/Entity.php
View File

@ -1343,7 +1343,7 @@ abstract class Entity extends Location implements Metadatable{
$this->chunk = $this->level->getChunk($this->x >> 4, $this->z >> 4, true); $this->chunk = $this->level->getChunk($this->x >> 4, $this->z >> 4, true);
if(!$this->justCreated){ 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){ foreach($this->hasSpawned as $player){
if(!isset($newChunk[$player->getId()])){ if(!isset($newChunk[$player->getId()])){
$this->despawnFrom($player); $this->despawnFrom($player);
@ -1449,7 +1449,7 @@ abstract class Entity extends Location implements Metadatable{
if($this->chunk === null){ if($this->chunk === null){
return; 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){ if($player->loggedIn === true){
$this->spawnTo($player); $this->spawnTo($player);
} }

4
src/pocketmine/inventory/ChestInventory.php
View File

@ -51,7 +51,7 @@ class ChestInventory extends ContainerInventory{
$pk->case1 = 1; $pk->case1 = 1;
$pk->case2 = 2; $pk->case2 = 2;
if(($level = $this->getHolder()->getLevel()) instanceof Level){ 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->case1 = 1;
$pk->case2 = 0; $pk->case2 = 0;
if(($level = $this->getHolder()->getLevel()) instanceof Level){ 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); parent::onClose($who);

4
src/pocketmine/inventory/DoubleChestInventory.php
View File

@ -106,7 +106,7 @@ class DoubleChestInventory extends ChestInventory implements InventoryHolder{
$pk->case1 = 1; $pk->case1 = 1;
$pk->case2 = 2; $pk->case2 = 2;
if(($level = $this->right->getHolder()->getLevel()) instanceof Level){ 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->case1 = 1;
$pk->case2 = 0; $pk->case2 = 0;
if(($level = $this->right->getHolder()->getLevel()) instanceof Level){ 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); parent::onClose($who);

2
src/pocketmine/level/Explosion.php
View File

@ -215,7 +215,7 @@ class Explosion{
$pk->z = $this->source->z; $pk->z = $this->source->z;
$pk->radius = $this->size; $pk->radius = $this->size;
$pk->records = $send; $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; return true;
} }

4
src/pocketmine/level/Level.php
View File

@ -435,7 +435,7 @@ class Level implements ChunkManager, Metadatable{
$pk = $sound->encode(); $pk = $sound->encode();
if($players === null){ if($players === null){
$players = $this->getUsingChunk($sound->x >> 4, $sound->z >> 4); $players = $this->getChunkPlayers($sound->x >> 4, $sound->z >> 4);
} }
if($pk !== null){ if($pk !== null){
@ -451,7 +451,7 @@ class Level implements ChunkManager, Metadatable{
$pk = $particle->encode(); $pk = $particle->encode();
if($players === null){ if($players === null){
$players = $this->getUsingChunk($particle->x >> 4, $particle->z >> 4); $players = $this->getChunkPlayers($particle->x >> 4, $particle->z >> 4);
} }
if($pk !== null){ if($pk !== null){

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

@ -59,7 +59,7 @@ abstract class Spawnable extends Tile{
return; 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){ if($player->spawned === true){
$this->spawnTo($player); $this->spawnTo($player);
} }