From 2b84cb7be409160c38aa63e49f7b35b0b491dc91 Mon Sep 17 00:00:00 2001
From: Covered123 <58715544+JavierLeon9966@users.noreply.github.com>
Date: Fri, 20 May 2022 13:01:34 -0300
Subject: [PATCH] DisablePluginException now can be used to disable plugins
 (#4780)

closes #2671
---
 src/plugin/DisablePluginException.php | 28 +++++++++++++++++++++++++++
 src/plugin/PluginManager.php          |  7 ++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 src/plugin/DisablePluginException.php

diff --git a/src/plugin/DisablePluginException.php b/src/plugin/DisablePluginException.php
new file mode 100644
index 000000000..3c24e84b6
--- /dev/null
+++ b/src/plugin/DisablePluginException.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\plugin;
+
+final class DisablePluginException extends \RuntimeException{
+
+}
diff --git a/src/plugin/PluginManager.php b/src/plugin/PluginManager.php
index 6902c4d94..36dcd9195 100644
--- a/src/plugin/PluginManager.php
+++ b/src/plugin/PluginManager.php
@@ -444,7 +444,12 @@ class PluginManager{
 			$this->server->getLogger()->info($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_enable($plugin->getDescription()->getFullName())));
 
 			$plugin->getScheduler()->setEnabled(true);
-			$plugin->onEnableStateChange(true);
+			try{
+				$plugin->onEnableStateChange(true);
+			}catch(DisablePluginException){
+				$this->disablePlugin($plugin);
+			}
+
 			if($plugin->isEnabled()){ //the plugin may have disabled itself during onEnable()
 				$this->enabledPlugins[$plugin->getDescription()->getName()] = $plugin;