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

World: add additional checks to addEntity() and removeEntity()

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-12-14 18:55:52 +00:00
parent 24ac5f8be0
commit 48623f4e79
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/world/World.php
View File

@ -66,6 +66,7 @@ use pocketmine\player\Player;
use pocketmine\scheduler\AsyncPool;
use pocketmine\Server;
use pocketmine\timings\Timings;
use pocketmine\utils\AssumptionFailedError;
use pocketmine\utils\Limits;
use pocketmine\utils\ReversePriorityQueue;
use pocketmine\world\biome\Biome;
@ -2141,6 +2142,13 @@ class World implements ChunkManager{
if($entity->getWorld() !== $this){
throw new \InvalidArgumentException("Invalid Entity world");
}
if(array_key_exists($entity->getId(), $this->entities)){
if($this->entities[$entity->getId()] === $entity){
throw new \InvalidArgumentException("Entity " . $entity->getId() . " has already been added to this world");
}else{
throw new AssumptionFailedError("Found two different entities sharing entity ID " . $entity->getId());
}
}
$pos = $entity->getPosition()->asVector3();
$chunk = $this->getOrLoadChunkAtPosition($pos);
if($chunk === null){
@ -2164,6 +2172,9 @@ class World implements ChunkManager{
if($entity->getWorld() !== $this){
throw new \InvalidArgumentException("Invalid Entity world");
}
if(!array_key_exists($entity->getId(), $this->entities)){
throw new \InvalidArgumentException("Entity is not tracked by this world (possibly already removed?)");
}
$pos = $this->entityLastKnownPositions[$entity->getId()];
$chunk = $this->getChunk($pos->getFloorX() >> 4, $pos->getFloorZ() >> 4);
if($chunk !== null){ //we don't care if the chunk already went out of scope