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

Non-npc stuff is now also using script system. Wrote new scripts for all sidemenu commands.

Browse Source
This commit is contained in:
Filip Maj
2016-06-18 12:26:29 -04:00
parent 4e69022072
commit 51bbf4ae2e
4 changed files with 17 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,9 +82,6 @@ namespace FFXIVClassic_Map_Server.Actors
public uint currentEventOwner = 0;
public string currentEventName = "";
public uint currentCommand = 0;
public string currentCommandName = "";
public Coroutine currentEventRunning;
//Player Info
@@ -1137,7 +1134,11 @@ namespace FFXIVClassic_Map_Server.Actors
currentEventRunning.Resume(objects.ToArray());
}
else
LuaEngine.DoActorOnEventStarted(this, owner, start);
{
currentEventRunning = LuaEngine.DoActorOnEventStarted(this, owner, start);
currentEventRunning.Resume(objects.ToArray());
}
}
public void UpdateEvent(EventUpdatePacket update)
@@ -1181,18 +1182,9 @@ namespace FFXIVClassic_Map_Server.Actors
currentEventOwner = 0;
currentEventName = "";
currentEventRunning = null;
}
public void EndCommand()
{
SubPacket p = EndEventPacket.BuildPacket(actorId, currentCommand, currentCommandName);
p.DebugPrintSubPacket();
QueuePacket(p);
currentCommand = 0;
currentCommandName = "";
}
public void SendInstanceUpdate()
{