mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 19:02:59 +00:00
Code Issues Projects Releases Wiki Activity

Entity: fix chunk tracking consistency issues, fixed attempted chunk loading in origin world when teleporting to a different position in a different world

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-12-10 18:13:18 +00:00
parent 5282ae3298
commit e925423749
4 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/world/World.php
View File

@ -2136,11 +2136,13 @@ class World implements ChunkManager{
if($entity->getWorld() !== $this){
throw new \InvalidArgumentException("Invalid Entity world");
}
$chunk = $this->getOrLoadChunkAtPosition($entity->getPosition());
$pos = $entity->getPosition()->asVector3();
$chunk = $this->getOrLoadChunkAtPosition($pos);
if($chunk === null){
throw new \InvalidArgumentException("Cannot add an Entity in an ungenerated chunk");
}
$chunk->addEntity($entity);
$entity->worldLastKnownLocation = $pos;
if($entity instanceof Player){
$this->players[$entity->getId()] = $entity;
@ -2157,7 +2159,7 @@ class World implements ChunkManager{
if($entity->getWorld() !== $this){
throw new \InvalidArgumentException("Invalid Entity world");
}
$pos = $entity->getPosition();
$pos = $entity->worldLastKnownLocation;
$chunk = $this->getChunk($pos->getFloorX() >> 4, $pos->getFloorZ() >> 4);
if($chunk !== null){ //we don't care if the chunk already went out of scope
$chunk->removeEntity($entity);
@ -2175,11 +2177,12 @@ class World implements ChunkManager{
/**
* @internal
*/
public function onEntityMoved(Entity $entity, Position $oldPosition) : void{
public function onEntityMoved(Entity $entity) : void{
if(!array_key_exists($entity->getId(), $this->entities)){
//this can happen if the entity was teleported before addEntity() was called
return;
}
$oldPosition = $entity->worldLastKnownLocation;
$newPosition = $entity->getPosition();
$oldChunkX = $oldPosition->getFloorX() >> 4;
@ -2216,6 +2219,7 @@ class World implements ChunkManager{
}
$newChunk->addEntity($entity);
$entity->worldLastKnownLocation = $newPosition->asVector3();
}
}
}