From 81fe00a0a52a766b2651899961b8e031bc4f871b Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 18 Nov 2017 15:56:58 +0000 Subject: [PATCH] Slightly simplify Player->kick() --- src/pocketmine/Player.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index e4ea9b2bb..cbd63972b 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -3118,17 +3118,14 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ public function kick(string $reason = "", bool $isAdmin = true) : bool{ $this->server->getPluginManager()->callEvent($ev = new PlayerKickEvent($this, $reason, $this->getLeaveMessage())); if(!$ev->isCancelled()){ + $message = $reason; if($isAdmin){ if(!$this->isBanned()){ $message = "Kicked by admin." . ($reason !== "" ? " Reason: " . $reason : ""); - }else{ - $message = $reason; } }else{ if($reason === ""){ $message = "disconnectionScreen.noReason"; - }else{ - $message = $reason; } } $this->close($ev->getQuitMessage(), $message);