From 29e3f61b6b5a154f377ed738f7ed0580468840c1 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Sat, 7 Apr 2018 14:24:33 -0400 Subject: [PATCH] Fixed my lua fuckery some more. --- FFXIVClassic Map Server/actors/chara/player/Player.cs | 3 ++- FFXIVClassic Map Server/lua/LuaEngine.cs | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/FFXIVClassic Map Server/actors/chara/player/Player.cs b/FFXIVClassic Map Server/actors/chara/player/Player.cs index 00608e38..9e2a3228 100644 --- a/FFXIVClassic Map Server/actors/chara/player/Player.cs +++ b/FFXIVClassic Map Server/actors/chara/player/Player.cs @@ -90,7 +90,6 @@ namespace FFXIVClassic_Map_Server.Actors //Event Related public uint currentEventOwner = 0; public string currentEventName = ""; - public Coroutine currentEventRunning; //Player Info @@ -1678,6 +1677,8 @@ namespace FFXIVClassic_Map_Server.Actors public void StartEvent(Actor owner, EventStartPacket start) { + currentEventOwner = start.scriptOwnerActorID; + currentEventName = start.triggerName; LuaEngine.GetInstance().EventStarted(this, owner, start); } diff --git a/FFXIVClassic Map Server/lua/LuaEngine.cs b/FFXIVClassic Map Server/lua/LuaEngine.cs index 0659bdde..eadf697e 100644 --- a/FFXIVClassic Map Server/lua/LuaEngine.cs +++ b/FFXIVClassic Map Server/lua/LuaEngine.cs @@ -349,6 +349,7 @@ namespace FFXIVClassic_Map_Server.lua if (!script.Globals.Get(funcName).IsNil()) { Coroutine coroutine = script.CreateCoroutine(script.Globals[funcName]).Coroutine; + player.currentEventRunning = coroutine; DynValue value = coroutine.Resume(args2); ResolveResume(player, coroutine, value); }