From 9cda72f1ab8233ef4d0b152c19ab6c08b8221d66 Mon Sep 17 00:00:00 2001 From: Yogurt Date: Fri, 31 May 2019 23:42:52 -0700 Subject: [PATCH] Remove MP and TP before setting combo ids to actually take combo into account for MP and TP cost --- FFXIVClassic Map Server/actors/chara/Character.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/FFXIVClassic Map Server/actors/chara/Character.cs b/FFXIVClassic Map Server/actors/chara/Character.cs index 697be351..4959a655 100644 --- a/FFXIVClassic Map Server/actors/chara/Character.cs +++ b/FFXIVClassic Map Server/actors/chara/Character.cs @@ -1129,6 +1129,9 @@ namespace FFXIVClassic_Map_Server.Actors actions.AddAction(new CommandResult(actorId, 30202, 0)); } + DelMP(command.CalculateMpCost(this)); + DelTP(command.CalculateTpCost(this)); + //Now that we know if we hit the target we can check if the combo continues if (this is Player) { @@ -1139,8 +1142,6 @@ namespace FFXIVClassic_Map_Server.Actors ((Player)this).SetCombos(); } - DelMP(command.CalculateMpCost(this)); - DelTP(command.CalculateTpCost(this)); actions.CombineLists(); DoBattleAction(command.id, command.battleAnimation, actions.GetList());