mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-22 04:37:47 +00:00
Code Activity

Wasn't actually sending packets. Changed casting animation back and moved castbar removal to cleanup.

Browse source
This commit is contained in:
Filip Maj 2017-08-29 00:38:07 -04:00
parent 67485eafc0
commit e60da4f7b4
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
FFXIVClassic Map Server/actors/chara/Character.cs
View file

@ -196,12 +196,12 @@ namespace FFXIVClassic_Map_Server.Actors
while (true) while (true)
{ {
if (actions.Length - currentIndex >= 18) 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) 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) else if (actions.Length - currentIndex == 1)
{ {
BattleActionX01Packet.BuildPacket(actorId, animationId, commandId, actions[currentIndex]); zone.BroadcastPacketAroundActor(this, BattleActionX01Packet.BuildPacket(actorId, animationId, commandId, actions[currentIndex]));
currentIndex++; currentIndex++;
} }
else else
@ -217,12 +217,12 @@ namespace FFXIVClassic_Map_Server.Actors
while (true) while (true)
{ {
if (actions.Count - currentIndex >= 18) 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) 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) else if (actions.Count - currentIndex == 1)
{ {
BattleActionX01Packet.BuildPacket(actorId, animationId, commandId, actions[currentIndex]); zone.BroadcastPacketAroundActor(this, BattleActionX01Packet.BuildPacket(actorId, animationId, commandId, actions[currentIndex]));
currentIndex++; currentIndex++;
} }
else else

11
FFXIVClassic Map Server/actors/chara/ai/state/MagicState.cs
View file

@ -61,7 +61,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
{ {
// todo: modify spellSpeed based on modifiers and stuff // todo: modify spellSpeed based on modifiers and stuff
((Player)owner).SendStartCastbar(spell.id, Utils.UnixTimeStampUTC(DateTime.Now.AddSeconds(spellSpeed))); ((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() public override void OnComplete()
{ {
if (owner.currentSubState == SetActorStatePacket.SUB_STATE_PLAYER)
{
((Player)owner).SendEndCastbar();
}
spell.targetFind.FindWithinArea(target, spell.validTarget); spell.targetFind.FindWithinArea(target, spell.validTarget);
isCompleted = true; isCompleted = true;
@ -163,6 +158,10 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
public override void Cleanup() public override void Cleanup()
{ {
if (owner.currentSubState == SetActorStatePacket.SUB_STATE_PLAYER)
{
((Player)owner).SendEndCastbar();
}
// command casting duration // command casting duration
//var packets = new List<SubPacket>(); //var packets = new List<SubPacket>();
//owner.zone.BroadcastPacketsAroundActor(owner, packets); //owner.zone.BroadcastPacketsAroundActor(owner, packets);