mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-13 15:05:33 +00:00
Code Issues Projects Releases Wiki Activity

Player: Don't rely on magic numbers for gamemodes

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-02-27 11:01:26 +00:00
parent 31336a0d09
commit ba616ed8a7
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pocketmine/Player.php
View File

@ -1379,11 +1379,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
* @return bool * @return bool
*/ */
public function isSurvival(bool $literal = false) : bool{ public function isSurvival(bool $literal = false) : bool{
if($literal){ return $this->gamemode === GameMode::SURVIVAL or (!$literal and $this->gamemode === GameMode::ADVENTURE);
return $this->gamemode === GameMode::SURVIVAL;
}else{
return ($this->gamemode & 0x01) === 0;
}
} }
/** /**
@ -1395,11 +1391,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
* @return bool * @return bool
*/ */
public function isCreative(bool $literal = false) : bool{ public function isCreative(bool $literal = false) : bool{
if($literal){ return $this->gamemode === GameMode::CREATIVE or (!$literal and $this->gamemode === GameMode::SPECTATOR);
return $this->gamemode === GameMode::CREATIVE;
}else{
return ($this->gamemode & 0x01) === 1;
}
} }
/** /**
@ -1411,11 +1403,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
* @return bool * @return bool
*/ */
public function isAdventure(bool $literal = false) : bool{ public function isAdventure(bool $literal = false) : bool{
if($literal){ return $this->gamemode === GameMode::ADVENTURE or (!$literal and $this->gamemode === GameMode::SPECTATOR);
return $this->gamemode === GameMode::ADVENTURE;
}else{
return ($this->gamemode & 0x02) > 0;
}
} }
/** /**