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

Fixed client crashing (temp.), fixed clients not spawning. (Fixes #1640 #1636 #1590 #1573)

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-07-14 02:19:14 +02:00
parent eccd82ca4b
commit 6c442551f7
8 changed files with 89 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,8 +77,10 @@ class ServerScheduler{
* @return void
*/
public function scheduleAsyncTask(AsyncTask $task){
$id = $this->nextId();
$task->setTaskId($id);
$this->asyncPool->submit($task);
$this->asyncTaskStorage[spl_object_hash($task)] = $task;
$this->asyncTaskStorage[$id] = $task;
++$this->asyncTasks;
}
@ -222,6 +224,12 @@ class ServerScheduler{
if($this->asyncTasks > 0){ //Garbage collector
$this->asyncPool->collect([$this, "collectAsyncTask"]);
foreach($this->asyncTaskStorage as $asyncTask){
if($asyncTask->isFinished() and !$asyncTask->isCompleted()){
$this->collectAsyncTask($asyncTask);
}
}
}
}
@ -230,7 +238,7 @@ class ServerScheduler{
--$this->asyncTasks;
$task->onCompletion(Server::getInstance());
$task->setCompleted();
unset($this->asyncTaskStorage[spl_object_hash($task)]);
unset($this->asyncTaskStorage[$task->getTaskId()]);
return true;
}
return false;