Merge branch 'next-minor'

This commit is contained in:
Dylan K. Taylor
2019-12-03 11:55:45 +00:00
17 changed files with 78 additions and 50 deletions

View File

@ -59,7 +59,6 @@ class GamemodeCommand extends VanillaCommand{
return true;
}
$target = $sender;
if(isset($args[1])){
$target = $sender->getServer()->getPlayer($args[1]);
if($target === null){
@ -67,7 +66,9 @@ class GamemodeCommand extends VanillaCommand{
return true;
}
}elseif(!($sender instanceof Player)){
}elseif($sender instanceof Player){
$target = $sender;
}else{
throw new InvalidCommandSyntaxException();
}