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

More script work.

Browse Source
This commit is contained in:
Filip Maj
2016-06-19 23:16:31 -04:00
parent 8743042950
commit 97c1fb06cf
36 changed files with 298 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1144,11 +1144,31 @@ namespace FFXIVClassic_Map_Server.Actors
EndEvent();
}
}
else
{
EndEvent();
}
}
else
{
currentEventRunning = LuaEngine.DoActorOnEventStarted(this, owner, start);
currentEventRunning.Resume(objects.ToArray());
if (currentEventRunning != null)
{
try
{
currentEventRunning.Resume(objects.ToArray());
}
catch (ScriptRuntimeException e)
{
Program.Log.Error("[LUA] {0}", e.Message);
EndEvent();
}
}
else
{
EndEvent();
}
}
}
@@ -1159,8 +1179,18 @@ namespace FFXIVClassic_Map_Server.Actors
return;
if (currentEventRunning.State == CoroutineState.Suspended)
currentEventRunning.Resume(LuaUtils.CreateLuaParamObjectList(update.luaParams));
}
{
try
{
currentEventRunning.Resume(LuaUtils.CreateLuaParamObjectList(update.luaParams));
}
catch (ScriptRuntimeException e)
{
Program.Log.Error("[LUA] {0}", e.Message);
EndEvent();
}
}
}
public void KickEvent(Actor actor, string conditionName, params object[] parameters)
{