Fix ScriptContext crashing without a WorldLoaded function

2023-05-21 10:45:54 +02:00
parent f2b3a9f837
commit b5f5d5f9d5
1 changed files with 6 additions and 3 deletions
--- a/OpenRA.Game/Scripting/ScriptContext.cs
+++ b/OpenRA.Game/Scripting/ScriptContext.cs
@@ -284,18 +284,21 @@ namespace OpenRA.Scripting

 		public void WorldLoaded()
 		{
-			if (FatalErrorOccurred)
+			if (FatalErrorOccurred || runtime.Globals["WorldLoaded"] is not LuaFunction worldLoaded)
 				return;

 			try
 			{
-				using (var worldLoaded = (LuaFunction)runtime.Globals["WorldLoaded"])
-					worldLoaded.Call().Dispose();
+				worldLoaded.Call().Dispose();
 			}
 			catch (LuaException e)
 			{
 				FatalError(e);
 			}
+			finally
+			{
+				worldLoaded?.Dispose();
+			}
 		}

 		public void Tick()