mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-30 07:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Player: update properties when assigning game mode, fixes #3005

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-08-01 19:02:06 +01:00
parent 4818e04540
commit d09e79e682
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/player/Player.php
View File

@ -350,12 +350,11 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
$this->lastPlayed = $nbt->getLong("lastPlayed", $now); $this->lastPlayed = $nbt->getLong("lastPlayed", $now);
if($this->server->getForceGamemode() or !$nbt->hasTag("playerGameType", IntTag::class)){ if($this->server->getForceGamemode() or !$nbt->hasTag("playerGameType", IntTag::class)){
$this->gamemode = $this->server->getGamemode(); $this->internalSetGameMode($this->server->getGamemode());
}else{ }else{
$this->gamemode = GameMode::fromMagicNumber($nbt->getInt("playerGameType") & 0x03); //TODO: bad hack here to avoid crashes on corrupted data $this->internalSetGameMode(GameMode::fromMagicNumber($nbt->getInt("playerGameType") & 0x03)); //TODO: bad hack here to avoid crashes on corrupted data
} }
$this->allowFlight = $this->isCreative();
$this->keepMovement = true; $this->keepMovement = true;
if($this->isOp()){ if($this->isOp()){
$this->setRemoveFormat(false); $this->setRemoveFormat(false);
@ -1109,6 +1108,19 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
return $this->gamemode; return $this->gamemode;
} }
protected function internalSetGameMode(GameMode $gameMode) : void{
$this->gamemode = $gameMode;
$this->allowFlight = $this->isCreative();
$this->hungerManager->setEnabled($this->isSurvival());
if($this->isSpectator()){
$this->setFlying(true);
}elseif($this->isSurvival()){
$this->setFlying(false);
}
}
/** /**
* Sets the gamemode, and if needed, kicks the Player. * Sets the gamemode, and if needed, kicks the Player.
* *
@ -1127,18 +1139,11 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
return false; return false;
} }
$this->gamemode = $gm; $this->internalSetGameMode($gm);
$this->allowFlight = $this->isCreative();
$this->hungerManager->setEnabled($this->isSurvival());
if($this->isSpectator()){ if($this->isSpectator()){
$this->setFlying(true);
$this->despawnFromAll(); $this->despawnFromAll();
}else{ }else{
if($this->isSurvival()){
$this->setFlying(false);
}
$this->spawnToAll(); $this->spawnToAll();
} }