mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 01:46:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'minor-next' into major-next

Browse Source
This commit is contained in:
Dylan K. Taylor
2023-09-08 11:22:44 +01:00
parent e96e68d221 aa916b2c49
commit a4f3476190
16 changed files with 132 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/command/defaults/DefaultGamemodeCommand.php
View File

@ -53,7 +53,8 @@ class DefaultGamemodeCommand extends VanillaCommand{
return true;
}
$sender->getServer()->getConfigGroup()->setConfigString(ServerProperties::GAME_MODE, $gameMode->name());
//TODO: this probably shouldn't use the enum name directly
$sender->getServer()->getConfigGroup()->setConfigString(ServerProperties::GAME_MODE, $gameMode->name);
$sender->sendMessage(KnownTranslationFactory::commands_defaultgamemode_success($gameMode->getTranslatableName()));
return true;
}

4
src/command/defaults/GamemodeCommand.php
View File

@ -61,13 +61,13 @@ class GamemodeCommand extends VanillaCommand{
return true;
}
if($target->getGamemode()->equals($gameMode)){
if($target->getGamemode() === $gameMode){
$sender->sendMessage(KnownTranslationFactory::pocketmine_command_gamemode_failure($target->getName()));
return true;
}
$target->setGamemode($gameMode);
if(!$gameMode->equals($target->getGamemode())){
if($gameMode !== $target->getGamemode()){
$sender->sendMessage(KnownTranslationFactory::pocketmine_command_gamemode_failure($target->getName()));
}else{
if($target === $sender){