diff --git a/src/API/ConsoleAPI.php b/src/API/ConsoleAPI.php index 3898fac2..86604c36 100644 --- a/src/API/ConsoleAPI.php +++ b/src/API/ConsoleAPI.php @@ -46,7 +46,7 @@ class ConsoleAPI{ $this->register("say", "", array($this, "defaultCommands")); $this->register("save-all", "", array($this, "defaultCommands")); $this->register("stop", "", array($this, "defaultCommands")); - $this->register("defaultgamemode", "", array($this, "defaultCommands")); + $this->register("defaultgamemode", "", array($this, "defaultCommands")); $this->server->api->ban->cmdWhitelist("help"); } @@ -61,29 +61,29 @@ class ConsoleAPI{ $output = ""; switch($cmd){ case "defaultgamemode": - $p = strtolower(array_shift($params)); - switch($p){ - case "creative": - $output .= "Default Gamemode is now Creative\n"; - $this->server->gamemode = CREATIVE; - break; - case "survival": - $output .= "Default Gamemode is now Survival\n"; - $this->server->gamemode = SURVIVAL; - break; - case "adventure": - $output .= "Default Gamemode is now Adventure\n"; - $this->server->gamemode = ADVENTURE; - break; - case "view": - $output .= "Default Gamemode is now View\n"; - $this->server->gamemode = VIEW; - break; - default: - $output .= "Usage: /defaultgamemode \n"; - break; - } + $gms = array( + "0" => SURVIVAL, + "survival" => SURVIVAL, + "s" => SURVIVAL, + "1" => CREATIVE, + "creative" => CREATIVE, + "c" => CREATIVE, + "2" => ADVENTURE, + "adventure" => ADVENTURE, + "a" => ADVENTURE, + "3" => VIEW, + "view" => VIEW, + "viewer" => VIEW, + "spectator" => VIEW, + "v" => VIEW, + ); + if(!isset($gms[strtolower($params[0])])){ + $output .= "Usage: /$cmd \n"; break; + } + $this->server->api->setProperty("gamemode", $gms[strtolower($params[0])]); + $output .= "Default Gamemode is now ".strtoupper($this->server->getGamemode()).".\n"; + break; case "invisible": $p = strtolower(array_shift($params)); switch($p){ diff --git a/src/API/PlayerAPI.php b/src/API/PlayerAPI.php index 8611198a..c801470a 100644 --- a/src/API/PlayerAPI.php +++ b/src/API/PlayerAPI.php @@ -146,7 +146,7 @@ class PlayerAPI{ $player = $this->server->api->player->get($params[1]); } if(!($player instanceof Player) or !isset($gms[strtolower($params[0])])){ - $output .= "Usage: /$cmd [player]\n"; + $output .= "Usage: /$cmd [player]\n"; break; } if($player->setGamemode($gms[strtolower($params[0])])){