mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-25 14:17:46 +00:00
Code Activity

If kickEvent is fired, the current event is popped. Commited Inventory changes.

Browse source
This commit is contained in:
Filip Maj 2017-12-17 14:43:38 -05:00
parent 1e9d61c838
commit 7e2246e8d8
2 changed files with 517 additions and 445 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

958
FFXIVClassic Map Server/actors/chara/player/Inventory.cs
View file

File diff suppressed because it is too large Load diff

4
FFXIVClassic Map Server/actors/chara/player/Player.cs
View file

@ -1691,6 +1691,8 @@ namespace FFXIVClassic_Map_Server.Actors
if (actor == null) if (actor == null)
return; return;
runningEvents.Pop();
List<LuaParam> lParams = LuaUtils.CreateLuaParamList(parameters); List<LuaParam> lParams = LuaUtils.CreateLuaParamList(parameters);
SubPacket spacket = KickEventPacket.BuildPacket(actorId, actor.actorId, 0x75dc1, conditionName, lParams); SubPacket spacket = KickEventPacket.BuildPacket(actorId, actor.actorId, 0x75dc1, conditionName, lParams);
spacket.DebugPrintSubPacket(); spacket.DebugPrintSubPacket();
@ -1702,6 +1704,8 @@ namespace FFXIVClassic_Map_Server.Actors
if (actor == null) if (actor == null)
return; return;
runningEvents.Pop();
List<LuaParam> lParams = LuaUtils.CreateLuaParamList(parameters); List<LuaParam> lParams = LuaUtils.CreateLuaParamList(parameters);
SubPacket spacket = KickEventPacket.BuildPacket(actorId, actor.actorId, unknown, conditionName, lParams); SubPacket spacket = KickEventPacket.BuildPacket(actorId, actor.actorId, unknown, conditionName, lParams);
spacket.DebugPrintSubPacket(); spacket.DebugPrintSubPacket();