mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-08 04:38:35 +00:00
Code Issues Projects Releases Wiki Activity

Player: fixed logic of move-into-bad-chunk checks

Browse Source 
particularly the hack with chunk switching was causing unexpected behaviour wrt. invisible players.
This commit is contained in:
Dylan K. Taylor 2018-03-23 19:34:45 +00:00
parent c19cf22ac5
commit a185b78486
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pocketmine/Player.php
View File

@ -1541,17 +1541,12 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$this->server->getLogger()->debug("Old position: " . $this->asVector3() . ", new position: " . $this->newPosition); $this->server->getLogger()->debug("Old position: " . $this->asVector3() . ", new position: " . $this->newPosition);
$revert = true; $revert = true;
}else{ }else{
if($this->chunk === null or !$this->chunk->isGenerated()){ $chunkX = $newPos->getFloorX() >> 4;
$chunk = $this->level->getChunk($newPos->getFloorX() >> 4, $newPos->getFloorZ() >> 4, false); $chunkZ = $newPos->getFloorZ() >> 4;
if($chunk === null or !$chunk->isGenerated()){
if(!$this->level->isChunkLoaded($chunkX, $chunkZ) or !$this->level->isChunkGenerated($chunkX, $chunkZ)){
$revert = true; $revert = true;
$this->nextChunkOrderRun = 0; $this->nextChunkOrderRun = 0;
}else{
if($this->chunk !== null){
$this->chunk->removeEntity($this);
}
$this->chunk = $chunk;
}
} }
} }