zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-06-10 06:24:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into ai

Browse source
This commit is contained in:
Tahir Akhlaq 2017-07-11 20:52:43 +01:00
commit 7c08420206
28 changed files with 294 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

11
FFXIVClassic Map Server/lua/LuaEngine.cs
View file

@ -117,7 +117,7 @@ namespace FFXIVClassic_Map_Server.lua
Coroutine coroutine = mSleepingOnPlayerEvent[player.actorId];
mSleepingOnPlayerEvent.Remove(player.actorId);
DynValue value = coroutine.Resume(LuaUtils.CreateLuaParamObjectList(args));
ResolveResume(null, coroutine, value);
ResolveResume(player, coroutine, value);
}
catch (ScriptRuntimeException e)
{
@ -419,8 +419,13 @@ namespace FFXIVClassic_Map_Server.lua
player.EndEvent();
}
}
else
CallLuaFunction(player, target, "onEventStarted", false, LuaUtils.CreateLuaParamObjectList(lparams));
else
{
if (target is Director)
((Director)target).OnEventStart(player, LuaUtils.CreateLuaParamObjectList(lparams));
else
CallLuaFunction(player, target, "onEventStarted", false, LuaUtils.CreateLuaParamObjectList(lparams));
}
}
public DynValue ResolveResume(Actor actor, Coroutine coroutine, DynValue value)