Merge remote-tracking branch 'origin/release/3.3' into release/3.4

This commit is contained in:
Dylan K. Taylor 2018-11-25 14:35:45 +00:00
commit c90d1faa81

View File

@ -2255,6 +2255,12 @@ class Server{
$this->forceShutdown();
$this->isRunning = false;
//Force minimum uptime to be >= 120 seconds, to reduce the impact of spammy crash loops
$spacing = ((int) \pocketmine\START_TIME) - time() + 120;
if($spacing > 0){
sleep($spacing);
}
@Utils::kill(getmypid());
exit(1);
}