Merge branch 'master' into develop

This commit is contained in:
Filip Maj committed 2016-07-16 20:04:49 -04:00
commit 5b7ad2364b
2 files changed
+5 -5

No files matched your search

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