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

Fixed my lua fuckery some more.

Browse Source
This commit is contained in:
Filip Maj 2018-04-07 14:24:33 -04:00
parent bbd4fcef3b
commit 29e3f61b6b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,6 @@ namespace FFXIVClassic_Map_Server.Actors
//Event Related //Event Related
public uint currentEventOwner = 0; public uint currentEventOwner = 0;
public string currentEventName = ""; public string currentEventName = "";
public Coroutine currentEventRunning; public Coroutine currentEventRunning;
//Player Info //Player Info
@ -1678,6 +1677,8 @@ namespace FFXIVClassic_Map_Server.Actors
public void StartEvent(Actor owner, EventStartPacket start) public void StartEvent(Actor owner, EventStartPacket start)
{ {
currentEventOwner = start.scriptOwnerActorID;
currentEventName = start.triggerName;
LuaEngine.GetInstance().EventStarted(this, owner, start); LuaEngine.GetInstance().EventStarted(this, owner, start);
} }

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

@ -349,6 +349,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;
player.currentEventRunning = coroutine;
DynValue value = coroutine.Resume(args2); DynValue value = coroutine.Resume(args2);
ResolveResume(player, coroutine, value); ResolveResume(player, coroutine, value);
} }