refactor: rename Plugin to ScriptPlugin

fix: fix onLeft crash on client
fix: fix registerCommands not clear when disable on client

Author: ShrBox

src-client/lse/PluginManager.cpp

@@ -9,7 +9,7 @@
 #include "ll/api/utils/ErrorUtils.h"
 #include "ll/api/utils/StringUtils.h"
 #include "lse/Entry.h"
-#include "lse/Plugin.h"
+#include "lse/ScriptPlugin.h"
 
 #include <ScriptX/ScriptX.h>
 #include <exception>
@@ -65,7 +65,7 @@ ll::Expected<> PluginManager::load(ll::mod::Manifest manifest) {
         return ll::makeStringError("Plugin has already loaded");
     }
 
-    auto plugin = std::make_shared<Plugin>(manifest);
+    auto plugin = std::make_shared<ScriptPlugin>(manifest);
 
     return plugin->onLoad().transform([&, this] { addMod(manifest.name, plugin); });
 }
@@ -131,7 +131,7 @@ ll::Expected<> PluginManager::enable(std::string_view name) {
         }
     }
 #endif
-    auto plugin = std::static_pointer_cast<Plugin>(getMod(name));
+    auto plugin = std::static_pointer_cast<ScriptPlugin>(getMod(name));
     if (!plugin) {
         return ll::makeStringError("Plugin {0} not found"_tr(name));
     }
@@ -280,8 +280,11 @@ ll::Expected<> PluginManager::disable(std::string_view name) {
         NodeJsHelper::stopEngine(scriptEngine);
 #endif
 
-        if (auto res = std::static_pointer_cast<Plugin>(getMod(name))->onDisable(); !res) {
-            return res;
+        if (auto plugin = std::static_pointer_cast<ScriptPlugin>(getMod(name))) {
+            plugin->registeredCommands.clear();
+            if (auto res = plugin->onDisable(); !res) {
+                return res;
+            }
         }
         return {};
     } catch (const Exception&) {
@@ -292,7 +295,7 @@ ll::Expected<> PluginManager::disable(std::string_view name) {
 }
 
 ll::Expected<> PluginManager::unload(std::string_view name) {
-    if (auto res = std::static_pointer_cast<Plugin>(getMod(name))->onUnload(); !res) {
+    if (auto res = std::static_pointer_cast<ScriptPlugin>(getMod(name))->onUnload(); !res) {
         return res;
     }
     eraseMod(name);

src-server/lse/PluginManager.cpp

@@ -8,7 +8,7 @@
 #include "ll/api/service/GamingStatus.h"
 #include "ll/api/utils/StringUtils.h"
 #include "lse/Entry.h"
-#include "lse/Plugin.h"
+#include "lse/ScriptPlugin.h"
 
 #include <ScriptX/ScriptX.h>
 #include <exception>
@@ -125,7 +125,7 @@ ll::Expected<> PluginManager::load(ll::mod::Manifest manifest) {
     }
 
     auto scriptEngine = EngineManager::newEngine(manifest.name);
-    auto plugin       = std::make_shared<Plugin>(manifest);
+    auto plugin       = std::make_shared<ScriptPlugin>(manifest);
 
     try {
         EngineScope engineScope(scriptEngine.get());
@@ -271,7 +271,7 @@ ll::Expected<> PluginManager::unload(std::string_view name) {
         NodeJsHelper::stopEngine(scriptEngine);
 #endif
 
-        if (auto res = std::static_pointer_cast<Plugin>(getMod(name))->onUnload(); !res) {
+        if (auto res = std::static_pointer_cast<ScriptPlugin>(getMod(name))->onUnload(); !res) {
             return res;
         }
         eraseMod(name);

src/legacy/api/EventAPI.cpp

@@ -54,6 +54,8 @@
 #include "mc/world/item/VanillaItemNames.h"
 #include "mc/world/level/dimension/Dimension.h"
 
+#include <ll/api/service/GamingStatus.h>
+
 #ifdef LSE_BACKEND_NODEJS
 #include "legacy/main/NodeJsHelper.h"
 #endif
@@ -184,7 +186,7 @@ void EnableEventListener(int eventId) {
     case EVENT_TYPES::onLeft:
         bus.emplaceListener<PlayerDisconnectEvent>([](PlayerDisconnectEvent& ev) {
             IF_LISTENED(EVENT_TYPES::onLeft) {
-                if (checkClientIsServerThread()) {
+                if (checkClientIsServerThread() && ll::getGamingStatus() != ll::GamingStatus::Stopping) {
                     CallEvent(EVENT_TYPES::onLeft, PlayerClass::newPlayer(&ev.self())); // Not cancellable
                 }
             }

src/legacy/engine/EngineOwnData.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "legacy/main/Global.h"
-#include "lse/Plugin.h"
+#include "lse/ScriptPlugin.h"
 #include "utils/UsingScriptX.h"
 
 #include <ll/api/Expected.h>
@@ -34,7 +34,7 @@ struct EngineOwnData {
     ll::i18n::I18n i18n;
     std::string    defaultLocaleName;
 
-    std::shared_ptr<lse::Plugin> plugin;
+    std::shared_ptr<lse::ScriptPlugin> plugin;
 
     // Use standalone logger in EngineOwnData instead of plugin.getLogger() for allowing modify logger title.
     std::shared_ptr<ll::io::Logger> logger;

src/lse/Entry.cpp

@@ -151,7 +151,7 @@ void loadDebugEngine(const ll::mod::NativeMod& self) {
     // Init plugin instance for debug engine to prevent something unexpected.
     ll::mod::Manifest manifest;
     manifest.name              = "DebugEngine";
-    getEngineOwnData()->plugin = std::make_shared<lse::Plugin>(manifest);
+    getEngineOwnData()->plugin = std::make_shared<lse::ScriptPlugin>(manifest);
     // Init logger
     getEngineOwnData()->logger = ll::io::LoggerRegistry::getInstance().getOrCreate("DebugEngine");
 

src/lse/Entry.h

@@ -24,10 +24,6 @@ class LegacyScriptEngine {
 
     bool enable();
 
-    // bool disable();
-
-    // bool unload();
-
 private:
     ll::mod::NativeMod&            mSelf;
     Config                         config;        // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)

src/lse/Plugin.cpp src/lse/ScriptPlugin.cppsrc/lse/Plugin.cpp renamed to src/lse/ScriptPlugin.cpp

@@ -1,17 +1,16 @@
-#include "lse/Plugin.h"
-
-#include "lse/Entry.h"
 #include "legacy/engine/EngineOwnData.h"
 #include "ll/api/mod/Manifest.h"
 #include "ll/api/mod/Mod.h"
+#include "lse/Entry.h"
+#include "lse/ScriptPlugin.h"
 
 namespace lse {
 
-Plugin::Plugin(ll::mod::Manifest manifest) : ll::mod::Mod(std::move(manifest)) {}
+ScriptPlugin::ScriptPlugin(ll::mod::Manifest manifest) : ll::mod::Mod(std::move(manifest)) {}
 
-Plugin::~Plugin() { release(); }
+ScriptPlugin::~ScriptPlugin() { release(); }
 
-std::shared_ptr<ll::mod::Mod> Plugin::current() {
+std::shared_ptr<ll::mod::Mod> ScriptPlugin::current() {
     return lse::LegacyScriptEngine::getInstance().getManager().getMod(getEngineOwnData()->pluginName);
 }
 } // namespace lse

src/lse/Plugin.h src/lse/ScriptPlugin.hsrc/lse/Plugin.h renamed to src/lse/ScriptPlugin.h

@@ -7,7 +7,7 @@
 
 namespace lse {
 
-class Plugin : public ll::mod::Mod {
+class ScriptPlugin : public ll::mod::Mod {
     friend PluginManager;
 
 public:
@@ -22,8 +22,8 @@ class Plugin : public ll::mod::Mod {
 
     std::unordered_map<std::string, std::vector<ParamInfo>> registeredCommands;
 
-    explicit Plugin(ll::mod::Manifest manifest);
-    ~Plugin();
+    explicit ScriptPlugin(ll::mod::Manifest manifest);
+    ~ScriptPlugin();
 
     static std::shared_ptr<ll::mod::Mod> current();
 };