Core/Movement: Corrected Animation Tier handling

Port From (https://github.com/TrinityCore/TrinityCore/commit/ee620856ad2918ae7ce91a37a980d9f2129a074a)
2022-05-03 13:29:52 -04:00
parent c921160078
commit 42046011e7
11 changed files with 54 additions and 34 deletions
@@ -659,7 +659,7 @@ namespace Game.Entities
            return IsInDist(obj, objBoundaryRadius);
        }

-        public bool SetDisableGravity(bool disable)
+        public bool SetDisableGravity(bool disable, bool updateAnimationTier = true)
        {
            if (disable == IsGravityDisabled())
                return false;
@@ -692,6 +692,16 @@ namespace Game.Entities
                SendMessageToSet(packet, true);
            }

+            if (IsCreature() && updateAnimationTier && IsAlive() && !HasUnitState(UnitState.Root) && !ToCreature().GetMovementTemplate().IsRooted())
+            {
+                if (IsGravityDisabled())
+                    SetAnimTier(AnimTier.Fly);
+                else if (IsHovering())
+                    SetAnimTier(AnimTier.Hover);
+                else
+                    SetAnimTier(AnimTier.Ground);
+            }
+
            return true;
        }

@@ -1011,7 +1021,7 @@ namespace Game.Entities
            return true;
        }

-        public bool SetHover(bool enable)
+        public bool SetHover(bool enable, bool updateAnimationTier = true)
        {
            if (enable == HasUnitMovementFlag(MovementFlag.Hover))
                return false;
@@ -1056,6 +1066,17 @@ namespace Game.Entities
                packet.MoverGUID = GetGUID();
                SendMessageToSet(packet, true);
            }
+
+            if (IsCreature() && updateAnimationTier && IsAlive() && !HasUnitState(UnitState.Root) && !ToCreature().GetMovementTemplate().IsRooted())
+            {
+                if (IsGravityDisabled())
+                    SetAnimTier(AnimTier.Fly);
+                else if (IsHovering())
+                    SetAnimTier(AnimTier.Hover);
+                else
+                    SetAnimTier(AnimTier.Ground);
+            }
+
            return true;
        }

@@ -1723,10 +1744,17 @@ namespace Game.Entities
            }

            if (arrived)
+            {
                DisableSpline();

+                AnimTier? animTier = MoveSpline.GetAnimation();
+                if (animTier.HasValue)
+                    SetAnimTier(animTier.Value);
+            }
+            
            UpdateSplinePosition();
        }
+
        void UpdateSplinePosition()
        {
            Vector4 loc = MoveSpline.ComputePosition();