GameMode is now an enum

This commit is contained in:
Dylan K. Taylor
2019-03-31 16:19:36 +01:00
parent 0017c0087a
commit 42a263a9df
9 changed files with 128 additions and 104 deletions

View File

@ -25,6 +25,7 @@ namespace pocketmine\event\player;
use pocketmine\event\Cancellable;
use pocketmine\event\CancellableTrait;
use pocketmine\GameMode;
use pocketmine\Player;
/**
@ -33,15 +34,15 @@ use pocketmine\Player;
class PlayerGameModeChangeEvent extends PlayerEvent implements Cancellable{
use CancellableTrait;
/** @var int */
/** @var GameMode */
protected $gamemode;
public function __construct(Player $player, int $newGamemode){
public function __construct(Player $player, GameMode $newGamemode){
$this->player = $player;
$this->gamemode = $newGamemode;
}
public function getNewGamemode() : int{
public function getNewGamemode() : GameMode{
return $this->gamemode;
}
}

View File

@ -86,7 +86,7 @@ class QueryRegenerateEvent extends ServerEvent{
}
}
$this->gametype = ($server->getGamemode() & 0x01) === 0 ? "SMP" : "CMP";
$this->gametype = ($server->getGamemode()->getMagicNumber() & 0x01) === 0 ? "SMP" : "CMP";
$this->version = $server->getVersion();
$this->server_engine = $server->getName() . " " . $server->getPocketMineVersion();
$level = $server->getLevelManager()->getDefaultLevel();