diff --git a/src/pocketmine/CrashDump.php b/src/pocketmine/CrashDump.php index 5bfc6b569..b727d2afb 100644 --- a/src/pocketmine/CrashDump.php +++ b/src/pocketmine/CrashDump.php @@ -24,6 +24,7 @@ namespace pocketmine; use pocketmine\network\mcpe\protocol\ProtocolInfo; use pocketmine\plugin\PluginBase; use pocketmine\plugin\PluginLoadOrder; +use pocketmine\plugin\PluginManager; use pocketmine\utils\Utils; use pocketmine\utils\VersionString; use raklib\RakLib; @@ -86,7 +87,7 @@ class CrashDump{ } private function pluginsData(){ - if(class_exists("pocketmine\\plugin\\PluginManager", false)){ + if($this->server->getPluginManager() instanceof PluginManager){ $this->addLine(); $this->addLine("Loaded plugins:"); $this->data["plugins"] = []; diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index b8e38a28d..55072d40c 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -1937,8 +1937,10 @@ class Server{ UPnP::RemovePortForward($this->getPort()); } - $this->getLogger()->debug("Disabling all plugins"); - $this->pluginManager->disablePlugins(); + if($this->pluginManager instanceof PluginManager){ + $this->getLogger()->debug("Disabling all plugins"); + $this->pluginManager->disablePlugins(); + } foreach($this->players as $player){ $player->close($player->getLeaveMessage(), $this->getProperty("settings.shutdown-message", "Server closed"));