diff --git a/FFXIVClassic Map Server/actors/chara/Modifier.cs b/FFXIVClassic Map Server/actors/chara/Modifier.cs
new file mode 100644
index 00000000..e8073de1
--- /dev/null
+++ b/FFXIVClassic Map Server/actors/chara/Modifier.cs	
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FFXIVClassic_Map_Server.actors.chara
+{
+    enum Modifier : UInt32
+    {
+        None                   = 0,
+        Hp                     = 1,
+        HpPercent              = 2,
+        Mp                     = 3,
+        MpPercent              = 4,
+        Tp                     = 5,
+        TpPercent              = 6,
+        Regen                  = 7,
+        Refresh                = 8,
+        Strength               = 9,
+        Vitality               = 10,
+        Dexterity              = 11,
+        Intelligence           = 12,
+        Mind                   = 13,
+        Piety                  = 14,
+        Attack                 = 15,
+        Accuracy               = 16,
+        Defense                = 17,
+        Evasion                = 18,
+        MagicAttack            = 19,
+        MagicHeal              = 20, // is this needed? shouldnt it just be calc'd from mind
+        MagicAccuracy          = 21,
+        MagicEvasion           = 22,
+        MagicDefense           = 23,
+        MagicEnhancePotency    = 24,
+        MagicEnfeeblingPotency = 25,
+        ResistFire             = 26,
+        ResistIce              = 27,
+        ResistWind             = 28,
+        ResistLightning        = 29,
+        ResistEarth            = 30,
+        ResistWater            = 31, // <3 u jorge
+        AttackRange            = 32,
+        Speed                  = 33,
+
+        
+        /* fuck off
+        CRAFT_PROCESSING = 30,
+        CRAFT_MAGIC_PROCESSING = 31,
+        CRAFT_PROCESS_CONTROL = 32,
+
+        HARVEST_POTENCY = 33,
+        HARVEST_LIMIT = 34,
+        HARVEST_RATE = 35,
+        */
+    }
+}
diff --git a/FFXIVClassic Map Server/actors/chara/ai/state/AttackState.cs b/FFXIVClassic Map Server/actors/chara/ai/state/AttackState.cs
index ad5ac346..b2559b68 100644
--- a/FFXIVClassic Map Server/actors/chara/ai/state/AttackState.cs	
+++ b/FFXIVClassic Map Server/actors/chara/ai/state/AttackState.cs	
@@ -44,34 +44,36 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
                 return true;
             }
             */
-            if (owner.target == null || target.IsDead())
+            if (target == null || target.IsDead())
             {
-                return true;
+
             }
-
-            if (owner.target.actorId != owner.currentLockedTarget)
-                owner.aiContainer.ChangeTarget(Server.GetWorldManager().GetActorInWorld(owner.currentLockedTarget) as Character);
-
-            if (IsAttackReady())
+            else
             {
-                if (CanAttack())
-                {
-                    TryInterrupt();
+                if (owner.target != target || owner.target.actorId != owner.currentLockedTarget)
+                    owner.aiContainer.ChangeTarget(target = Server.GetWorldManager().GetActorInWorld(owner.currentLockedTarget) as Character);
 
-                    // todo: check weapon delay/haste etc and use that
-                    if (!interrupt)
+                if (IsAttackReady())
+                {
+                    if (CanAttack())
                     {
-                        OnComplete();
+                        TryInterrupt();
+
+                        // todo: check weapon delay/haste etc and use that
+                        if (!interrupt)
+                        {
+                            OnComplete();
+                        }
+                        else
+                        {
+
+                        }
+                        SetInterrupted(false);
                     }
                     else
                     {
-
+                        // todo: handle interrupt/paralyze etc
                     }
-                    SetInterrupted(false);
-                }
-                else
-                {
-                    // todo: handle interrupt/paralyze etc
                 }
             }
             return false;