From c063a4da291bbf7eb0a8522938f2a29f092657b3 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 25 Aug 2019 18:18:14 +0100 Subject: [PATCH] backport 5c1f1f00cbbcc6460927b922f993f1de8e1e046c: move assert.exception to PocketMine.php with the other stuff --- src/pocketmine/PocketMine.php | 1 + src/pocketmine/Server.php | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index f5c503fdf..0d346f72b 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -142,6 +142,7 @@ namespace pocketmine { ini_set("display_startup_errors", '1'); ini_set("default_charset", "utf-8"); @ini_set("opcache.mmap_base", bin2hex(random_bytes(8))); //Fix OPCache address errors + ini_set('assert.exception', '1'); } function server(){ diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index 100860de3..742bd2277 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -1565,8 +1565,6 @@ class Server{ return; } - ini_set('assert.exception', '1'); - if($this->logger instanceof MainLogger){ $this->logger->setLogDebug(\pocketmine\DEBUG > 1); }