From 9877271d70d5330047f3f21d6c42ade078ec0b33 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Wed, 25 Jun 2014 20:50:16 +0200
Subject: [PATCH] Fixed kick messages

---
 src/pocketmine/Player.php                       |  5 +++--
 src/pocketmine/command/defaults/KickCommand.php |  2 +-
 src/pocketmine/scheduler/AsyncTask.php          | 10 ----------
 src/pocketmine/scheduler/ServerScheduler.php    |  2 +-
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 16f9d135d..9dab60d16 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -1970,8 +1970,9 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 	public function kick($reason = ""){
 		$this->server->getPluginManager()->callEvent($ev = new PlayerKickEvent($this, $reason, "Kicked player " . $this->username . "." . ($reason !== "" ? " With reason: $reason" : "")));
 		if(!$ev->isCancelled()){
-			$this->sendMessage("You have been kicked. " . ($reason !== "" ? " Reason: $reason" : "") . "\n");
-			$this->close($ev->getQuitMessage(), $reason);
+			$message = TextFormat::BOLD . "You have been kicked." . ($reason !== "" ? TextFormat::RESET."\nReason: $reason" : "");
+			$this->sendMessage($message);
+			$this->close($ev->getQuitMessage(), $message);
 
 			return true;
 		}
diff --git a/src/pocketmine/command/defaults/KickCommand.php b/src/pocketmine/command/defaults/KickCommand.php
index 18b43f26e..a2388b4d9 100644
--- a/src/pocketmine/command/defaults/KickCommand.php
+++ b/src/pocketmine/command/defaults/KickCommand.php
@@ -61,7 +61,7 @@ class KickCommand extends VanillaCommand{
 			$sender->sendMessage($name . " not found.");
 		}
 
-		Command::broadcastCommandMessage($sender, "Kicked player " . $name . ". With reason:\n" . $reason);
+		Command::broadcastCommandMessage($sender, "Kicked player " . $name . ". With reason: " . $reason);
 
 		return true;
 	}
diff --git a/src/pocketmine/scheduler/AsyncTask.php b/src/pocketmine/scheduler/AsyncTask.php
index 379e7e724..bc0981be8 100644
--- a/src/pocketmine/scheduler/AsyncTask.php
+++ b/src/pocketmine/scheduler/AsyncTask.php
@@ -39,16 +39,6 @@ abstract class AsyncTask extends \Threaded{
 		$this->result = null;
 		$this->onRun();
 		$this->finished = true;
-		$this->complete = $this->result === null ? true : false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isCompleted(){
-		return $this->synchronized(function(){
-			return $this->complete === true;
-		});
 	}
 
 	/**
diff --git a/src/pocketmine/scheduler/ServerScheduler.php b/src/pocketmine/scheduler/ServerScheduler.php
index ecedd3dff..30949d462 100644
--- a/src/pocketmine/scheduler/ServerScheduler.php
+++ b/src/pocketmine/scheduler/ServerScheduler.php
@@ -215,7 +215,7 @@ class ServerScheduler{
 
 		if($this->asyncTasks > 0){ //Garbage collector
 			$this->asyncPool->collect(function (AsyncTask $task){
-				if($task->isCompleted() or ($task->isFinished() and !$task->hasResult())){
+				if($task->isFinished()){
 					--$this->asyncTasks;
 					$task->onCompletion(Server::getInstance());
 					return true;