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

Merge branch '3.5'

Browse Source 
# Conflicts:
#	resources/locale
This commit is contained in:
Dylan K. Taylor 2019-01-02 21:25:57 +00:00
commit 71f123c616
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/pocketmine/Server.php
View File

@ -2293,6 +2293,7 @@ class Server{
//Force minimum uptime to be >= 120 seconds, to reduce the impact of spammy crash loops //Force minimum uptime to be >= 120 seconds, to reduce the impact of spammy crash loops
$spacing = ((int) \pocketmine\START_TIME) - time() + 120; $spacing = ((int) \pocketmine\START_TIME) - time() + 120;
if($spacing > 0){ if($spacing > 0){
echo "--- Waiting $spacing seconds to throttle automatic restart (you can kill the process safely now) ---" . PHP_EOL;
sleep($spacing); sleep($spacing);
} }
@Utils::kill(getmypid()); @Utils::kill(getmypid());

2
src/pocketmine/command/defaults/TitleCommand.php
View File

@ -82,7 +82,7 @@ class TitleCommand extends VanillaCommand{
$player->addActionBarMessage(implode(" ", array_slice($args, 2))); $player->addActionBarMessage(implode(" ", array_slice($args, 2)));
break; break;
case "times": case "times":
if(count($args) < 4){ if(count($args) < 5){
throw new InvalidCommandSyntaxException(); throw new InvalidCommandSyntaxException();
} }