From 66818e178a82f09b4b8cd1e6efd7c17a640ce065 Mon Sep 17 00:00:00 2001 From: Johnmacro Date: Sun, 12 May 2019 17:20:45 +0900 Subject: [PATCH 1/3] DefaultPermissions: Fix typos in permission descriptions (#2918) --- src/pocketmine/permission/DefaultPermissions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/permission/DefaultPermissions.php b/src/pocketmine/permission/DefaultPermissions.php index 967029c53..606e55a9e 100644 --- a/src/pocketmine/permission/DefaultPermissions.php +++ b/src/pocketmine/permission/DefaultPermissions.php @@ -58,11 +58,11 @@ abstract class DefaultPermissions{ $whitelist = self::registerPermission(new Permission(self::ROOT . ".command.whitelist", "Allows the user to modify the server whitelist", Permission::DEFAULT_OP), $commands); self::registerPermission(new Permission(self::ROOT . ".command.whitelist.add", "Allows the user to add a player to the server whitelist"), $whitelist); - self::registerPermission(new Permission(self::ROOT . ".command.whitelist.remove", "Allows the user to remove a player to the server whitelist"), $whitelist); + self::registerPermission(new Permission(self::ROOT . ".command.whitelist.remove", "Allows the user to remove a player from the server whitelist"), $whitelist); self::registerPermission(new Permission(self::ROOT . ".command.whitelist.reload", "Allows the user to reload the server whitelist"), $whitelist); self::registerPermission(new Permission(self::ROOT . ".command.whitelist.enable", "Allows the user to enable the server whitelist"), $whitelist); self::registerPermission(new Permission(self::ROOT . ".command.whitelist.disable", "Allows the user to disable the server whitelist"), $whitelist); - self::registerPermission(new Permission(self::ROOT . ".command.whitelist.list", "Allows the user to list all the players on the server whitelist"), $whitelist); + self::registerPermission(new Permission(self::ROOT . ".command.whitelist.list", "Allows the user to list all players on the server whitelist"), $whitelist); $whitelist->recalculatePermissibles(); $ban = self::registerPermission(new Permission(self::ROOT . ".command.ban", "Allows the user to ban people", Permission::DEFAULT_OP), $commands); From bb93d4f8de8463ffe051944c319a6f165444b26d Mon Sep 17 00:00:00 2001 From: Johnmacro Date: Sun, 12 May 2019 17:21:39 +0900 Subject: [PATCH 2/3] TimeCommand: Fix commands.time.query message (#2917) --- src/pocketmine/command/defaults/TimeCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/command/defaults/TimeCommand.php b/src/pocketmine/command/defaults/TimeCommand.php index db88d63fb..2b358140f 100644 --- a/src/pocketmine/command/defaults/TimeCommand.php +++ b/src/pocketmine/command/defaults/TimeCommand.php @@ -81,7 +81,7 @@ class TimeCommand extends VanillaCommand{ }else{ $level = $sender->getServer()->getDefaultLevel(); } - $sender->sendMessage(new TranslationContainer("commands.time.query", [$level->getTime()])); + $sender->sendMessage($sender->getServer()->getLanguage()->translateString("commands.time.query", [$level->getTime()])); return true; } From 5a351d3caf6d6ee5778e5dce822fa367fee719dc Mon Sep 17 00:00:00 2001 From: Frago9876543210 Date: Sun, 12 May 2019 14:06:05 +0300 Subject: [PATCH 3/3] Fix for Server::hasOfflinePlayerData (#2919) --- src/pocketmine/Server.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index e8000a5fe..09084ddb1 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -799,6 +799,7 @@ class Server{ * @return bool */ public function hasOfflinePlayerData(string $name) : bool{ + $name = strtolower($name); return file_exists($this->getDataPath() . "players/$name.dat"); }