mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-18 11:45:30 +00:00
Code Issues Projects Releases Wiki Activity

Entity: assume that position has a valid World during setPosition()

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-12-27 19:20:37 +00:00
parent f215207a27
commit 793081d803
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/entity/Entity.php
View File

@ -1306,8 +1306,7 @@ abstract class Entity{
} }
$oldWorld = $this->getWorld(); $oldWorld = $this->getWorld();
//TODO: staying in the same world when the target is invalid is probably not expected behaviour... this should bail instead $newWorld = $pos instanceof Position ? $pos->getWorld() : $oldWorld;
$newWorld = $pos instanceof Position && $pos->isValid() ? $pos->getWorld() : $oldWorld;
if($oldWorld !== $newWorld){ if($oldWorld !== $newWorld){
$this->despawnFromAll(); $this->despawnFromAll();
$oldWorld->removeEntity($this); $oldWorld->removeEntity($this);