Fix ScriptContext crashing without a WorldLoaded function
This commit is contained in:
committed by
Matthias Mailänder
parent
f2b3a9f837
commit
b5f5d5f9d5
@@ -284,18 +284,21 @@ namespace OpenRA.Scripting
|
|||||||
|
|
||||||
public void WorldLoaded()
|
public void WorldLoaded()
|
||||||
{
|
{
|
||||||
if (FatalErrorOccurred)
|
if (FatalErrorOccurred || runtime.Globals["WorldLoaded"] is not LuaFunction worldLoaded)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using (var worldLoaded = (LuaFunction)runtime.Globals["WorldLoaded"])
|
worldLoaded.Call().Dispose();
|
||||||
worldLoaded.Call().Dispose();
|
|
||||||
}
|
}
|
||||||
catch (LuaException e)
|
catch (LuaException e)
|
||||||
{
|
{
|
||||||
FatalError(e);
|
FatalError(e);
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
worldLoaded?.Dispose();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Tick()
|
public void Tick()
|
||||||
|
|||||||
Reference in New Issue
Block a user