From c3d80d711dbef61dc3aa4a29901e35a4eca18220 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 20 Mar 2019 19:00:41 +0000 Subject: [PATCH 1/2] Fixed autosave time report measurement not using correct unit (as per master) --- src/pocketmine/Server.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index f01273a4f..ddf6f4ac5 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -2583,7 +2583,8 @@ class Server{ $this->getLogger()->debug("[Auto Save] Saving worlds..."); $start = microtime(true); $this->doAutoSave(); - $this->getLogger()->debug("[Auto Save] Save completed in " . round(microtime(true) - $start, 3) . "s"); + $time = (microtime(true) - $start); + $this->getLogger()->debug("[Auto Save] Save completed in " . ($time >= 1 ? round($time, 3) . "s" : round($time * 1000) . "ms")); } if($this->sendUsageTicker > 0 and --$this->sendUsageTicker === 0){ From 6a5502177906f38f171970754e22bdf7d827334b Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 21 Mar 2019 18:59:50 +0000 Subject: [PATCH 2/2] Flat: Allow asterisk in preset layers closes #2818 --- src/pocketmine/level/generator/Flat.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/level/generator/Flat.php b/src/pocketmine/level/generator/Flat.php index 153fb5783..c3672ba8e 100644 --- a/src/pocketmine/level/generator/Flat.php +++ b/src/pocketmine/level/generator/Flat.php @@ -106,7 +106,7 @@ class Flat extends Generator{ $split = array_map('\trim', explode(',', $layers)); $y = 0; foreach($split as $line){ - preg_match('#^(?:(\d+)x)?(.+)$#', $line, $matches); + preg_match('#^(?:(\d+)[x|*])?(.+)$#', $line, $matches); if(count($matches) !== 3){ throw new InvalidGeneratorOptionsException("Invalid preset layer \"$line\""); }