Fixed an issue where InputSingleton was not reset when the UI Registry was cleared

Fixed an issue where PCall was called without popping the return value

Author: NixAJ

Source/Game-Lib/Game-Lib/Scripting/Handlers/UIHandler.cpp

@@ -88,6 +88,7 @@ namespace Scripting::UI
     void UIHandler::Clear()
     {
         entt::registry* registry = ServiceLocator::GetEnttRegistries()->uiRegistry;
+        auto& ctx = registry->ctx();
         auto& transformSystem = ECS::Transform2DSystem::Get(*registry);
 
         registry->view<ECS::Components::UI::Widget>().each([&transformSystem](entt::entity entity, ECS::Components::UI::Widget& widget)
@@ -108,9 +109,9 @@ namespace Scripting::UI
         transformSystem.ClearQueue();
         ServiceLocator::GetGameRenderer()->GetCanvasRenderer()->Clear();
 
-        if (registry->ctx().contains<ECS::Singletons::UISingleton>())
+        if (ctx.contains<ECS::Singletons::UISingleton>())
         {
-            ECS::Singletons::UISingleton& uiSingleton = registry->ctx().get<ECS::Singletons::UISingleton>();
+            ECS::Singletons::UISingleton& uiSingleton = ctx.get<ECS::Singletons::UISingleton>();
             uiSingleton.panelTemplates.clear();
             uiSingleton.textTemplates.clear();
 
@@ -124,7 +125,14 @@ namespace Scripting::UI
             uiSingleton.cursorCanvasEntity = entt::null;
             uiSingleton.allHoveredEntities.clear();
             uiSingleton.scriptWidgets.clear();
-        } 
+        }
+
+        if (ctx.contains<ECS::Singletons::InputSingleton>())
+        {
+            auto& inputSingleton = ctx.get<ECS::Singletons::InputSingleton>();
+            inputSingleton.globalKeyboardEvents.clear();
+            inputSingleton.eventIDToKeyboardEventIndex.clear();
+        }
     }
 
     // UI
@@ -974,6 +982,8 @@ namespace Scripting::UI
 
         ctx.PCall(5, 1);
         bool result = ctx.Get(false);
+        ctx.Pop();
+
         return result; // Return if we should consume the event or not
     }
 
@@ -991,6 +1001,8 @@ namespace Scripting::UI
 
         ctx.PCall(4 , 1);
         bool result = ctx.Get(false);
+        ctx.Pop();
+
         return result; // Return if we should consume the event or not
     }
 
@@ -1010,6 +1022,8 @@ namespace Scripting::UI
 
         ctx.PCall(3, 1);
         bool result = ctx.Get(false);
+        ctx.Pop();
+
         return result; // Return if widget should consume the event or not
     }
 

Source/Game-Lib/Game-Lib/Scripting/Handlers/UnitHandler.cpp

@@ -55,29 +55,22 @@ namespace Scripting
 
         u32 unitID = ctx.Get(std::numeric_limits<u32>().max(), 1);
         if (unitID == std::numeric_limits<u32>().max())
-        {
-            luaL_error(state, "Expected unitID as parameter 1");
-        }
+            return 0;
+
         entt::entity entityID = entt::entity(unitID);
 
         entt::registry* registry = ServiceLocator::GetEnttRegistries()->gameRegistry;
         if (!registry->valid(entityID))
-        {
-            luaL_error(state, "Invalid unitID");
-        }
+            return 0;
 
         if (!registry->all_of<ECS::Components::Model, ECS::Components::AttachmentData>(entityID))
-        {
-            luaL_error(state, "Unit does not have a model or attachment data");
-        }
+            return 0;
 
         ECS::Components::Model& model = registry->get<ECS::Components::Model>(entityID);
         ECS::Components::AttachmentData& attachmentData = registry->get<ECS::Components::AttachmentData>(entityID);
 
         if (!Util::Attachment::EnableAttachment(entityID, model, attachmentData, Attachment::Defines::Type::PlayerName))
-        {
-            luaL_error(state, "Failed to enable attachment");
-        }
+            return 0;
 
         const mat4x4* mat = Util::Attachment::GetAttachmentMatrix(attachmentData, Attachment::Defines::Type::PlayerName);
         vec3 position = (*mat)[3];

Source/Game-Lib/Game-Lib/Scripting/LuaState.cpp

@@ -216,8 +216,9 @@ namespace Scripting
         i32 result = lua_pcall(_state, numArgs, numResults, errorfunc);
         if (result != LUA_OK)
         {
+            const char* errorMsg = lua_tostring(_state, -1);
             NC_LOG_ERROR("[Scripting] Failed to run a script. Please check the errors below and correct them");
-            NC_LOG_ERROR("{0}", Get("Failed to read Luau Runtime Error"));
+            NC_LOG_ERROR("{0}", errorMsg);
             Pop();
         }
 

Source/Resources/Scripts/API/UI/Nameplate.luau

@@ -57,7 +57,6 @@ local function FormatText(health : number, healthPercent : number)
 end
 
 local function SetupNameplateMethods(nameplateTable : Nameplate)
-
     nameplateTable.SetEnabled = function(self : Nameplate, enabled : boolean)
         nameplateTable.border:SetEnabled(enabled);
     end