cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some minor lua related crashing when the parent file was not found for some reason. Used decorated message for error output, not normal message.

Browse Source
This commit is contained in:
Filip Maj
2016-07-16 19:52:13 -04:00
parent 110cfbccc2
commit d26b64b458
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FFXIVClassic Map Server/actors/chara/npc/Npc.cs
View File

@@ -336,7 +336,7 @@ namespace FFXIVClassic_Map_Server.Actors
if (File.Exists(String.Format("./scripts/unique/{0}/{1}/{2}.lua", zone.zoneName, className, uniqueIdentifier))) if (File.Exists(String.Format("./scripts/unique/{0}/{1}/{2}.lua", zone.zoneName, className, uniqueIdentifier)))
child = LuaEngine.LoadScript(String.Format("./scripts/unique/{0}/{1}/{2}.lua", zone.zoneName, className, uniqueIdentifier)); child = LuaEngine.LoadScript(String.Format("./scripts/unique/{0}/{1}/{2}.lua", zone.zoneName, className, uniqueIdentifier));
if (parent == null && child == null) if (parent == null)
{ {
LuaEngine.SendError(player, String.Format("ERROR: Could not find script for actor {0}.", GetName())); LuaEngine.SendError(player, String.Format("ERROR: Could not find script for actor {0}.", GetName()));
return null; return null;
@@ -347,7 +347,7 @@ namespace FFXIVClassic_Map_Server.Actors
if (child != null && !child.Globals.Get("onEventStarted").IsNil()) if (child != null && !child.Globals.Get("onEventStarted").IsNil())
coroutine = child.CreateCoroutine(child.Globals["onEventStarted"]).Coroutine; coroutine = child.CreateCoroutine(child.Globals["onEventStarted"]).Coroutine;
else if (!parent.Globals.Get("onEventStarted").IsNil()) else if (parent.Globals.Get("onEventStarted") != null && !parent.Globals.Get("onEventStarted").IsNil())
coroutine = parent.CreateCoroutine(parent.Globals["onEventStarted"]).Coroutine; coroutine = parent.CreateCoroutine(parent.Globals["onEventStarted"]).Coroutine;
else else
return null; return null;

6
FFXIVClassic Map Server/actors/chara/player/Player.cs
View File

@@ -1140,7 +1140,7 @@ namespace FFXIVClassic_Map_Server.Actors
} }
catch (ScriptRuntimeException e) catch (ScriptRuntimeException e)
{ {
Program.Log.Error("[LUA] {0}", e.Message); Program.Log.Error("[LUA] {0}", e.DecoratedMessage);
EndEvent(); EndEvent();
} }
} }
@@ -1161,7 +1161,7 @@ namespace FFXIVClassic_Map_Server.Actors
} }
catch (ScriptRuntimeException e) catch (ScriptRuntimeException e)
{ {
Program.Log.Error("[LUA] {0}", e.Message); Program.Log.Error("[LUA] {0}", e.DecoratedMessage);
EndEvent(); EndEvent();
} }
} }
@@ -1186,7 +1186,7 @@ namespace FFXIVClassic_Map_Server.Actors
} }
catch (ScriptRuntimeException e) catch (ScriptRuntimeException e)
{ {
Program.Log.Error("[LUA] {0}", e.Message); Program.Log.Error("[LUA] {0}", e.DecoratedMessage);
EndEvent(); EndEvent();
} }
} }