Core/Movement: Ensure land and takeoff animations even if gravity enabled/disabled state is not what spline generator expects
Port From (https://github.com/TrinityCore/TrinityCore/commit/be3ae90dc488894afea8e4cca74d9105558fff53)
This commit is contained in:
@@ -754,16 +754,6 @@ namespace Game.Entities
|
||||
SendMessageToSet(packet, true);
|
||||
}
|
||||
|
||||
if (IsCreature() && updateAnimTier && IsAlive() && !HasUnitState(UnitState.Root))
|
||||
{
|
||||
if (IsGravityDisabled())
|
||||
SetAnimTier(AnimTier.Fly);
|
||||
else if (IsHovering())
|
||||
SetAnimTier(AnimTier.Hover);
|
||||
else
|
||||
SetAnimTier(AnimTier.Ground);
|
||||
}
|
||||
|
||||
if (IsAlive())
|
||||
{
|
||||
if (IsGravityDisabled() || IsHovering())
|
||||
@@ -774,6 +764,16 @@ namespace Game.Entities
|
||||
else if (IsPlayer()) // To update player who dies while flying/hovering
|
||||
SetPlayHoverAnim(false, false);
|
||||
|
||||
if (IsCreature() && updateAnimTier && IsAlive() && !HasUnitState(UnitState.Root))
|
||||
{
|
||||
if (IsGravityDisabled())
|
||||
SetAnimTier(AnimTier.Fly);
|
||||
else if (IsHovering())
|
||||
SetAnimTier(AnimTier.Hover);
|
||||
else
|
||||
SetAnimTier(AnimTier.Ground);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1137,16 +1137,6 @@ namespace Game.Entities
|
||||
SendMessageToSet(packet, true);
|
||||
}
|
||||
|
||||
if (IsCreature() && updateAnimTier && IsAlive() && !HasUnitState(UnitState.Root))
|
||||
{
|
||||
if (IsGravityDisabled())
|
||||
SetAnimTier(AnimTier.Fly);
|
||||
else if (IsHovering())
|
||||
SetAnimTier(AnimTier.Hover);
|
||||
else
|
||||
SetAnimTier(AnimTier.Ground);
|
||||
}
|
||||
|
||||
if (IsAlive())
|
||||
{
|
||||
if (IsGravityDisabled() || IsHovering())
|
||||
@@ -1157,6 +1147,16 @@ namespace Game.Entities
|
||||
else if (IsPlayer()) // To update player who dies while flying/hovering
|
||||
SetPlayHoverAnim(false, false);
|
||||
|
||||
if (IsCreature() && updateAnimTier && IsAlive() && !HasUnitState(UnitState.Root))
|
||||
{
|
||||
if (IsGravityDisabled())
|
||||
SetAnimTier(AnimTier.Fly);
|
||||
else if (IsHovering())
|
||||
SetAnimTier(AnimTier.Hover);
|
||||
else
|
||||
SetAnimTier(AnimTier.Ground);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user