Merge branch 'master' into mcpe-1.2

This commit is contained in:
Dylan K. Taylor
2017-08-17 17:14:16 +01:00
215 changed files with 1482 additions and 1257 deletions

View File

@ -427,7 +427,7 @@ class Server{
* @return string
*/
public static function getGamemodeString(int $mode) : string{
switch((int) $mode){
switch($mode){
case Player::SURVIVAL:
return "%gameMode.survival";
case Player::CREATIVE:
@ -1208,7 +1208,7 @@ class Server{
return (int) $v[$variable];
}
return $this->properties->exists($variable) ? (int) $this->properties->get($variable) : (int) $defaultValue;
return $this->properties->exists($variable) ? (int) $this->properties->get($variable) : $defaultValue;
}
/**
@ -1216,7 +1216,7 @@ class Server{
* @param int $value
*/
public function setConfigInt(string $variable, int $value){
$this->properties->set($variable, (int) $value);
$this->properties->set($variable, $value);
}
/**