mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 09:56:06 +00:00
Code Issues Projects Releases Wiki Activity

Updated to new pthreads version, updated RakLib

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-09-27 13:37:27 +02:00
parent 0bcf639a98
commit ddc140af5e
10 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/pocketmine/Thread.php
View File

@ -28,6 +28,7 @@ abstract class Thread extends \Thread{
/** @var \ClassLoader */
protected $classLoader;
protected $isKilled = false;
public function getClassLoader(){
return $this->classLoader;
@ -68,16 +69,14 @@ abstract class Thread extends \Thread{
* Stops the thread using the best way possible. Try to stop it yourself before calling this.
*/
public function quit(){
if($this->isRunning()){
$this->kill();
}elseif(!$this->isJoined()){
$this->isKilled = true;
$this->notify();
if(!$this->isJoined()){
if(!$this->isTerminated()){
$this->join();
}else{
$this->kill();
}
}else{
$this->kill();
}
ThreadManager::getInstance()->remove($this);
@ -86,4 +85,4 @@ abstract class Thread extends \Thread{
public function getThreadName(){
return (new \ReflectionClass($this))->getShortName();
}
}
}