mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 16:51:42 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/entity/Entity.php
View File

@ -96,8 +96,8 @@ abstract class Entity{
/** @var EntityMetadataCollection */
private $networkProperties;
/** @var Location */
private $worldLastKnownLocation;
/** @var Vector3 */
public $worldLastKnownLocation;
/** @var EntityDamageEvent|null */
protected $lastDamageCause = null;
@ -1210,7 +1210,7 @@ abstract class Entity{
$this->location->world
);
$this->checkChunks();
$this->getWorld()->onEntityMoved($this);
$this->checkBlockCollision();
$this->checkGroundState($movX, $movY, $movZ, $dx, $dy, $dz);
$this->updateFallState($dy, $this->onGround);
@ -1309,15 +1309,17 @@ abstract class Entity{
return false;
}
if($pos instanceof Position and $pos->isValid() and $pos->getWorld() !== $this->getWorld()){
if(!$this->switchWorld($pos->getWorld())){
return false;
}
$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->isValid() ? $pos->getWorld() : $oldWorld;
if($oldWorld !== $newWorld){
$this->despawnFromAll();
$oldWorld->removeEntity($this);
}
$this->location = Location::fromObject(
$pos,
$this->location->world,
$newWorld,
$this->location->yaw,
$this->location->pitch
);
@ -1326,7 +1328,11 @@ abstract class Entity{
$this->blocksAround = null;
$this->checkChunks();
if($oldWorld !== $newWorld){
$newWorld->addEntity($this);
}else{
$newWorld->onEntityMoved($this);
}
return true;
}
@ -1347,11 +1353,6 @@ abstract class Entity{
return false;
}
protected function checkChunks() : void{
$this->getWorld()->onEntityMoved($this, $this->worldLastKnownLocation);
$this->worldLastKnownLocation = $this->location->asLocation();
}
protected function resetLastMovements() : void{
$this->lastLocation = $this->location->asLocation();
$this->lastMotion = clone $this->motion;
@ -1421,29 +1422,6 @@ abstract class Entity{
return false;
}
protected function switchWorld(World $targetWorld) : bool{
if($this->closed){
return false;
}
if($this->location->isValid()){
$this->getWorld()->removeEntity($this);
$this->despawnFromAll();
}
$this->location = new Location(
$this->location->x,
$this->location->y,
$this->location->z,
$this->location->yaw,
$this->location->pitch,
$targetWorld
);
$this->getWorld()->addEntity($this);
return true;
}
public function getId() : int{
return $this->id;
}

2
src/entity/projectile/Projectile.php
View File

@ -261,7 +261,7 @@ abstract class Projectile extends Entity{
$this->location->pitch = (atan2($this->motion->y, $f) * 180 / M_PI);
}
$this->checkChunks();
$this->getWorld()->onEntityMoved($this);
$this->checkBlockCollision();
Timings::$entityMoveTimer->stopTiming();

4
src/player/Player.php
View File

@ -648,9 +648,9 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
}
}
protected function switchWorld(World $targetWorld) : bool{
protected function setPosition(Vector3 $pos) : bool{
$oldWorld = $this->location->isValid() ? $this->location->getWorld() : null;
if(parent::switchWorld($targetWorld)){
if(parent::setPosition($pos)){
if($oldWorld !== null){
foreach($this->usedChunks as $index => $status){
World::getXZ($index, $X, $Z);

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();
}
}
}