fix(plugins): Exports, Reload Crash

Author: skuzzis

plugin_files/bin/scripting/0_events.js

@@ -10,7 +10,8 @@ const LoadEventFile = (global) => {
         const handlers = eventHandlers[eventName]
         for (let i = 0; i < handlers.length; i++) {
             if ((typeof handlers[i].handle) == "function") {
-                const result = (handlers[i].handle.apply(null, eventData) || EventResult.Continue);
+                let result = (handlers[i].handle.apply(null, eventData));
+                if (result == null || result == undefined) result = EventResult.Continue;
                 if (result != EventResult.Continue) return result
             }
         }
@@ -28,7 +29,8 @@ const LoadEventFile = (global) => {
         const handlers = eventHandlers[eventName]
         for (let i = 0; i < handlers.length; i++) {
             if ((typeof handlers[i].handle) == "function") {
-                const result = (handlers[i].handle.apply(null, eventData) || EventResult.Continue);
+                let result = (handlers[i].handle.apply(null, eventData));
+                if (result == null || result == undefined) result = EventResult.Continue;
                 if (result != EventResult.Continue) return result
             }
         }

src/plugins/object.cpp

@@ -19,10 +19,6 @@ PluginObject::PluginObject(std::string m_name, ContextKinds m_kind)
 
 PluginObject::~PluginObject()
 {
-    if (eventFunctionPtr)
-    {
-        delete eventFunctionPtr;
-    }
 }
 
 void PluginObject::RegisterEventHandlerJSON(EValue* functionPtr)
@@ -57,9 +53,6 @@ void PluginObject::UnregisterEventHandling(std::string eventName)
 
 EventResult PluginObject::TriggerEvent(std::string invokedBy, std::string eventName, std::vector<std::any> eventPayload, ClassData* eventObject)
 {
-    if (GetPluginState() == PluginState_t::Stopped && eventName != "OnPluginStart" && eventName != "OnAllPluginsLoaded")
-        return EventResult::Continue;
-
     if (!eventFunctionPtr)
         return EventResult::Continue;
 
@@ -101,9 +94,6 @@ EventResult PluginObject::TriggerEvent(std::string invokedBy, std::string eventN
 
 EventResult PluginObject::TriggerEventJSON(std::string invokedBy, std::string eventName, std::string eventPayload, ClassData* eventObject)
 {
-    if (GetPluginState() == PluginState_t::Stopped && eventName != "OnPluginStart" && eventName != "OnAllPluginsLoaded")
-        return EventResult::Continue;
-
     if (!eventFunctionPtr)
         return EventResult::Continue;
 
@@ -304,6 +294,17 @@ void PluginObject::DestroyScriptingEnvironment()
         g_commandsManager.UnregisterCommand(command);
 
     eventHandlers.clear();
+
+    if (eventFunctionPtr) {
+        delete eventFunctionPtr;
+        eventFunctionPtr = nullptr;
+    }
+
+    if (eventFunctionPtrJSON) {
+        delete eventFunctionPtrJSON;
+        eventFunctionPtrJSON = nullptr;
+    }
+
     delete ctx;
 }
 

src/scripting/entities/weapons.cpp

@@ -390,7 +390,5 @@ LoadScriptingComponent(weapons, [](PluginObject plugin, EContext* ctx) -> void {
                 }
             }
         }
-
-        SetStateChanged((uintptr_t)vmbodyComponent, "CBaseEntity", "m_CBodyComponent", 0);
     });
 })