mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-14 17:59:41 +00:00
Code Issues Projects Releases Wiki Activity

Fixed server crash on startup on 32-bit with memory limit set >= 4096MB

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-05-30 14:15:20 +01:00
parent 86f3b257a7
commit caced595d2
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pocketmine/MemoryManager.php
View File

@ -89,6 +89,11 @@ class MemoryManager{
$hardLimit = ((int) $this->server->getProperty("memory.main-hard-limit", $defaultMemory)); $hardLimit = ((int) $this->server->getProperty("memory.main-hard-limit", $defaultMemory));
if(PHP_INT_SIZE === 4 and $hardLimit >= 4096){
$this->server->getLogger()->warning("Cannot set memory limit higher than 4GB on 32-bit, defaulting to max 4095MB");
$hardLimit = 4095;
}
if($hardLimit <= 0){ if($hardLimit <= 0){
ini_set("memory_limit", -1); ini_set("memory_limit", -1);
}else{ }else{