Merge branch 'master' into mcpe-0.12

This commit is contained in:
Shoghi Cervantes
2015-08-31 17:51:07 +02:00
2 changed files with 4 additions and 4 deletions

View File

@ -33,11 +33,11 @@ class ServerKiller extends Thread{
public function run(){
sleep($this->time);
echo "\nTook to long to stop, server was killed forcefully!\n";
echo "\nTook too long to stop, server was killed forcefully!\n";
@\pocketmine\kill(getmypid());
}
public function getThreadName(){
return "Server Killer";
}
}
}