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

ChunkLoader: remove getLoaderId() (take 2)

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-01-25 18:58:01 +00:00
parent bb27c76d13
commit 6ee484e401
4 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,7 @@ use function is_infinite;
use function is_nan;
use function lcg_value;
use function sin;
use function spl_object_id;
use const M_PI_2;
abstract class Entity extends Location implements Metadatable, EntityIds{
@ -1621,10 +1622,10 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
if(!$this->justCreated){
$newChunk = $this->level->getViewersForPosition($this);
foreach($this->hasSpawned as $player){
if(!isset($newChunk[$player->getLoaderId()])){
if(!isset($newChunk[spl_object_id($player)])){
$this->despawnFrom($player);
}else{
unset($newChunk[$player->getLoaderId()]);
unset($newChunk[spl_object_id($player)]);
}
}
foreach($newChunk as $player){
@ -1767,8 +1768,9 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
* @param Player $player
*/
public function spawnTo(Player $player) : void{
if(!isset($this->hasSpawned[$player->getLoaderId()])){
$this->hasSpawned[$player->getLoaderId()] = $player;
$id = spl_object_id($player);
if(!isset($this->hasSpawned[$id])){
$this->hasSpawned[$id] = $player;
$this->sendSpawnPacket($player);
}
@ -1797,13 +1799,14 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
* @param bool $send
*/
public function despawnFrom(Player $player, bool $send = true) : void{
if(isset($this->hasSpawned[$player->getLoaderId()])){
$id = spl_object_id($player);
if(isset($this->hasSpawned[$id])){
if($send){
$pk = new RemoveEntityPacket();
$pk->entityUniqueId = $this->id;
$player->sendDataPacket($pk);
}
unset($this->hasSpawned[$player->getLoaderId()]);
unset($this->hasSpawned[$id]);
}
}