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

Merge branch 'stable'

Browse Source 
# Conflicts:
#	changelogs/3.14.md
#	resources/vanilla
#	src/VersionInfo.php
#	src/entity/Attribute.php
This commit is contained in:
Dylan K. Taylor
2020-07-08 11:46:02 +01:00
parent b79aa04530 b2249f93c0
commit da798817b5
6 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/plugins/TesterPlugin/src/pmmp/TesterPlugin/CheckTestCompletionTask.php
View File

@ -38,7 +38,7 @@ class CheckTestCompletionTask extends Task{
$test = $this->plugin->getCurrentTest();
if($test === null){
if(!$this->plugin->startNextTest()){
$this->plugin->getScheduler()->cancelTask($this->getHandler()->getTaskId());
$this->getHandler()->cancel();
$this->plugin->onAllTestsCompleted();
}
}elseif($test->isFinished() or $test->isTimedOut()){