Merge branch 'stable' into master

# Conflicts:
#	composer.lock
#	resources/vanilla
#	src/command/defaults/StatusCommand.php
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/level/format/SubChunk.php
This commit is contained in:
Dylan K. Taylor
2020-09-26 13:27:08 +01:00
7 changed files with 16 additions and 8 deletions

View File

@@ -54,9 +54,9 @@ class StatusCommand extends VanillaCommand{
$server = $sender->getServer();
$sender->sendMessage(TextFormat::GREEN . "---- " . TextFormat::WHITE . "Server status" . TextFormat::GREEN . " ----");
$time = microtime(true) - $server->getStartTime();
$time = (int) (microtime(true) - $server->getStartTime());
$seconds = floor($time % 60);
$seconds = $time % 60;
$minutes = null;
$hours = null;
$days = null;