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: flag for despawn if entering ungenerated terrain

Browse Source 
previously this created an empty chunk for the entity to hang around in until the terrain was generated, but that's problematic for several reasons, most importantly the fact that non-generated chunks are not saved.
This commit is contained in:
Dylan K. Taylor 2020-12-03 18:36:54 +00:00
parent ec2feeffcb
commit 1e7f9214cc
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/entity/Entity.php
View File

@ -1366,7 +1366,16 @@ abstract class Entity{
if($this->chunk !== null){ if($this->chunk !== null){
$this->chunk->removeEntity($this); $this->chunk->removeEntity($this);
} }
$this->chunk = $this->getWorld()->loadChunk($chunkX, $chunkZ, true); $this->chunk = $this->getWorld()->loadChunk($chunkX, $chunkZ, false);
if($this->chunk === null){
//TODO: this is a non-ideal solution for a hard problem
//when this happens the entity won't be tracked by any chunk, so we can't have it hanging around in memory
//we also can't allow this to cause chunk generation, nor can we just create an empty ungenerated chunk
//for it, because an empty chunk won't get saved, so the entity will vanish anyway. Therefore, this is
//the cleanest way to make sure this doesn't result in leaks.
$this->getWorld()->getLogger()->debug("Entity $this->id is in ungenerated terrain, flagging for despawn");
$this->flagForDespawn();
}
$this->chunkX = $chunkX; $this->chunkX = $chunkX;
$this->chunkZ = $chunkZ; $this->chunkZ = $chunkZ;