From e60da4f7b43f47a72e26917e60b3f65e48766d92 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Tue, 29 Aug 2017 00:38:07 -0400 Subject: [PATCH] Wasn't actually sending packets. Changed casting animation back and moved castbar removal to cleanup. --- FFXIVClassic Map Server/actors/chara/Character.cs | 12 ++++++------ .../actors/chara/ai/state/MagicState.cs | 11 +++++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/FFXIVClassic Map Server/actors/chara/Character.cs b/FFXIVClassic Map Server/actors/chara/Character.cs index 522a13e5..b4f4e936 100644 --- a/FFXIVClassic Map Server/actors/chara/Character.cs +++ b/FFXIVClassic Map Server/actors/chara/Character.cs @@ -196,12 +196,12 @@ namespace FFXIVClassic_Map_Server.Actors while (true) { if (actions.Length - currentIndex >= 18) - BattleActionX18Packet.BuildPacket(actorId, animationId, commandId, actions, ref currentIndex); + zone.BroadcastPacketAroundActor(this, BattleActionX18Packet.BuildPacket(actorId, animationId, commandId, actions, ref currentIndex)); else if (actions.Length - currentIndex > 1) - BattleActionX10Packet.BuildPacket(actorId, animationId, commandId, actions, ref currentIndex); + zone.BroadcastPacketAroundActor(this, BattleActionX10Packet.BuildPacket(actorId, animationId, commandId, actions, ref currentIndex)); else if (actions.Length - currentIndex == 1) { - BattleActionX01Packet.BuildPacket(actorId, animationId, commandId, actions[currentIndex]); + zone.BroadcastPacketAroundActor(this, BattleActionX01Packet.BuildPacket(actorId, animationId, commandId, actions[currentIndex])); currentIndex++; } else @@ -217,12 +217,12 @@ namespace FFXIVClassic_Map_Server.Actors while (true) { if (actions.Count - currentIndex >= 18) - BattleActionX18Packet.BuildPacket(actorId, animationId, commandId, actions, ref currentIndex); + zone.BroadcastPacketAroundActor(this, BattleActionX18Packet.BuildPacket(actorId, animationId, commandId, actions, ref currentIndex)); else if (actions.Count - currentIndex > 1) - BattleActionX10Packet.BuildPacket(actorId, animationId, commandId, actions, ref currentIndex); + zone.BroadcastPacketAroundActor(this, BattleActionX10Packet.BuildPacket(actorId, animationId, commandId, actions, ref currentIndex)); else if (actions.Count - currentIndex == 1) { - BattleActionX01Packet.BuildPacket(actorId, animationId, commandId, actions[currentIndex]); + zone.BroadcastPacketAroundActor(this, BattleActionX01Packet.BuildPacket(actorId, animationId, commandId, actions[currentIndex])); currentIndex++; } else diff --git a/FFXIVClassic Map Server/actors/chara/ai/state/MagicState.cs b/FFXIVClassic Map Server/actors/chara/ai/state/MagicState.cs index 1ca659b0..34ebcf5f 100644 --- a/FFXIVClassic Map Server/actors/chara/ai/state/MagicState.cs +++ b/FFXIVClassic Map Server/actors/chara/ai/state/MagicState.cs @@ -61,7 +61,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state { // todo: modify spellSpeed based on modifiers and stuff ((Player)owner).SendStartCastbar(spell.id, Utils.UnixTimeStampUTC(DateTime.Now.AddSeconds(spellSpeed))); - owner.DoBattleAction(spell.id, spell.battleAnimation, new BattleAction(target.actorId, 30128, 1, 0, 1)); //You begin casting (6F000002: BLM, 6F000003: WHM) + owner.DoBattleAction(spell.id, 0x6F000002, new BattleAction(target.actorId, 30128, 1, 0, 1)); //You begin casting (6F000002: BLM, 6F000003: WHM) } } @@ -103,11 +103,6 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state public override void OnComplete() { - if (owner.currentSubState == SetActorStatePacket.SUB_STATE_PLAYER) - { - ((Player)owner).SendEndCastbar(); - } - spell.targetFind.FindWithinArea(target, spell.validTarget); isCompleted = true; @@ -163,6 +158,10 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state public override void Cleanup() { + if (owner.currentSubState == SetActorStatePacket.SUB_STATE_PLAYER) + { + ((Player)owner).SendEndCastbar(); + } // command casting duration //var packets = new List(); //owner.zone.BroadcastPacketsAroundActor(owner, packets);