diff --git a/src/pocketmine/MemoryManager.php b/src/pocketmine/MemoryManager.php index 3392ea2c6..530dd3bcf 100644 --- a/src/pocketmine/MemoryManager.php +++ b/src/pocketmine/MemoryManager.php @@ -177,6 +177,13 @@ class MemoryManager{ return $this->lowMemory; } + /** + * @return int + */ + public function getGlobalMemoryLimit() : int{ + return $this->globalMemoryLimit; + } + /** * @return bool */ diff --git a/src/pocketmine/command/defaults/StatusCommand.php b/src/pocketmine/command/defaults/StatusCommand.php index ac707ca78..d937f75e0 100644 --- a/src/pocketmine/command/defaults/StatusCommand.php +++ b/src/pocketmine/command/defaults/StatusCommand.php @@ -102,8 +102,9 @@ class StatusCommand extends VanillaCommand{ $sender->sendMessage(TextFormat::GOLD . "Heap memory: " . TextFormat::RED . number_format(round(($rUsage[0] / 1024) / 1024, 2), 2) . " MB."); $sender->sendMessage(TextFormat::GOLD . "Maximum memory (system): " . TextFormat::RED . number_format(round(($mUsage[2] / 1024) / 1024, 2), 2) . " MB."); - if($server->getProperty("memory.global-limit") > 0){ - $sender->sendMessage(TextFormat::GOLD . "Maximum memory (manager): " . TextFormat::RED . number_format(round($server->getProperty("memory.global-limit"), 2), 2) . " MB."); + $globalLimit = $server->getMemoryManager()->getGlobalMemoryLimit(); + if($globalLimit > 0){ + $sender->sendMessage(TextFormat::GOLD . "Maximum memory (manager): " . TextFormat::RED . number_format(round($globalLimit, 2), 2) . " MB."); } foreach($server->getLevelManager()->getLevels() as $level){