mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-17 11:18:52 +00:00
Code Issues Projects Releases Wiki Activity

Fixed kick messages

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-06-25 20:50:16 +02:00
parent 873e35f416
commit 9877271d70
4 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pocketmine/Player.php
View File

@ -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;
}

2
src/pocketmine/command/defaults/KickCommand.php
View File

@ -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;
}

10
src/pocketmine/scheduler/AsyncTask.php
View File

@ -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;
});
}
/**

2
src/pocketmine/scheduler/ServerScheduler.php
View File

@ -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;