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

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

Browse Source
This commit is contained in:
Filip Maj 2017-03-17 17:20:34 -04:00
commit 545ce18f1f
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
FFXIVClassic Map Server/lua/LuaEngine.cs
View File

@ -185,6 +185,11 @@ namespace FFXIVClassic_Map_Server.lua
private void CallLuaFunctionNpc(Player player, Npc target, string funcName, params object[] args) private void CallLuaFunctionNpc(Player player, Npc target, string funcName, params object[] args)
{ {
object[] args2 = new object[args.Length + 2];
Array.Copy(args, 0, args2, 2, args.Length);
args2[0] = player;
args2[1] = target;
LuaScript parent = null, child = null; LuaScript parent = null, child = null;
if (File.Exists("./scripts/base/" + target.classPath + ".lua")) if (File.Exists("./scripts/base/" + target.classPath + ".lua"))
@ -218,7 +223,7 @@ namespace FFXIVClassic_Map_Server.lua
if (coroutine != null) if (coroutine != null)
{ {
DynValue value = coroutine.Resume(player, target, args); DynValue value = coroutine.Resume(args2);
ResolveResume(player, coroutine, value); ResolveResume(player, coroutine, value);
} }
} }
@ -261,6 +266,11 @@ namespace FFXIVClassic_Map_Server.lua
return; return;
} }
object[] args2 = new object[args.Length + 2];
Array.Copy(args, 0, args2, 2, args.Length);
args2[0] = player;
args2[1] = target;
string luaPath = GetScriptPath(target); string luaPath = GetScriptPath(target);
LuaScript script = LoadScript(luaPath); LuaScript script = LoadScript(luaPath);
if (script != null) if (script != null)
@ -268,7 +278,7 @@ namespace FFXIVClassic_Map_Server.lua
if (!script.Globals.Get(funcName).IsNil()) if (!script.Globals.Get(funcName).IsNil())
{ {
Coroutine coroutine = script.CreateCoroutine(script.Globals[funcName]).Coroutine; Coroutine coroutine = script.CreateCoroutine(script.Globals[funcName]).Coroutine;
DynValue value = coroutine.Resume(player, target, args); DynValue value = coroutine.Resume(args2);
ResolveResume(player, coroutine, value); ResolveResume(player, coroutine, value);
} }
else else
@ -284,6 +294,8 @@ namespace FFXIVClassic_Map_Server.lua
public void EventStarted(Player player, Actor target, EventStartPacket eventStart) public void EventStarted(Player player, Actor target, EventStartPacket eventStart)
{ {
List<LuaParam> lparams = eventStart.luaParams;
lparams.Insert(0, new LuaParam(2, eventStart.triggerName));
if (mSleepingOnPlayerEvent.ContainsKey(player.actorId)) if (mSleepingOnPlayerEvent.ContainsKey(player.actorId))
{ {
Coroutine coroutine = mSleepingOnPlayerEvent[player.actorId]; Coroutine coroutine = mSleepingOnPlayerEvent[player.actorId];
@ -292,7 +304,7 @@ namespace FFXIVClassic_Map_Server.lua
ResolveResume(null, coroutine, value); ResolveResume(null, coroutine, value);
} }
else else
CallLuaFunction(player, target, "onEventStarted", eventStart.triggerName); CallLuaFunction(player, target, "onEventStarted", LuaUtils.CreateLuaParamObjectList(lparams));
} }
private DynValue ResolveResume(Player player, Coroutine coroutine, DynValue value) private DynValue ResolveResume(Player player, Coroutine coroutine, DynValue value)