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: Account for the possibility of Level being null in switchLevel()

Browse Source 
the Entity base also accounts for this, and assuming that this is automatically valid is causing lots of crashes. I am not sure of the circumstances under which this is suddenly becoming null, but this shouldn't assume that the level is valid nonetheless.
This commit is contained in:
Dylan K. Taylor 2018-06-09 16:20:51 +01:00
parent 37b445f210
commit 601811f0f8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Player.php
View File

@ -923,10 +923,12 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
protected function switchLevel(Level $targetLevel) : bool{ protected function switchLevel(Level $targetLevel) : bool{
$oldLevel = $this->level; $oldLevel = $this->level;
if(parent::switchLevel($targetLevel)){ if(parent::switchLevel($targetLevel)){
if($oldLevel !== null){
foreach($this->usedChunks as $index => $d){ foreach($this->usedChunks as $index => $d){
Level::getXZ($index, $X, $Z); Level::getXZ($index, $X, $Z);
$this->unloadChunk($X, $Z, $oldLevel); $this->unloadChunk($X, $Z, $oldLevel);
} }
}
$this->usedChunks = []; $this->usedChunks = [];
$this->level->sendTime($this); $this->level->sendTime($this);