Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Movement: Fix stunned falling units freezing the client

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/b40cadd5a12445c1265db8d81b2a0c5e73fe6757)
This commit is contained in:
hondacrx
2022-01-05 23:23:07 -05:00
parent b527bd99d6
commit 20a31a52c2
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Movement/MotionMaster.cs
+16 -8
View File
@@ -102,11 +102,15 @@ namespace Game.Movement
public MotionMaster(Unit unit)
{
_owner = unit;
_flags = MotionMasterFlags.InitializationPending;
}
public void Initialize()
{
if (HasFlag(MotionMasterFlags.Delayed))
if (HasFlag(MotionMasterFlags.InitializationPending))
return;
if (HasFlag(MotionMasterFlags.Update))
{
_delayedActions.Enqueue(new DelayedAction(() => Initialize(), MotionMasterDelayedActionType.Initialize));
return;
@@ -125,9 +129,13 @@ namespace Game.Movement
if (!HasFlag(MotionMasterFlags.InitializationPending))
return;
AddFlag(MotionMasterFlags.Initializing);
RemoveFlag(MotionMasterFlags.InitializationPending);
DirectInitialize();
ResolveDelayedActions();
RemoveFlag(MotionMasterFlags.InitializationPending);
RemoveFlag(MotionMasterFlags.Initializing);
}
public bool Empty()
@@ -297,7 +305,7 @@ namespace Game.Movement
if (!_owner)
return;
if (HasFlag(MotionMasterFlags.InitializationPending))
if (HasFlag(MotionMasterFlags.InitializationPending | MotionMasterFlags.Initializing))
return;
Cypher.Assert(!Empty(), $"MotionMaster:Update: update called without Initializing! ({_owner.GetGUID()})");
@@ -559,9 +567,9 @@ namespace Game.Movement
public void MoveConfused()
{
if (_owner.IsTypeId(TypeId.Player))
Add(new ConfusedGenerator<Player>());
Add(new ConfusedMovementGenerator<Player>());
else
Add(new ConfusedGenerator<Creature>());
Add(new ConfusedMovementGenerator<Creature>());
}
public void MoveFleeing(Unit enemy, uint time)
@@ -574,10 +582,10 @@ namespace Game.Movement
if (time != 0)
Add(new TimedFleeingGenerator(enemy.GetGUID(), time));
else
Add(new FleeingGenerator<Creature>(enemy.GetGUID()));
Add(new FleeingMovementGenerator<Creature>(enemy.GetGUID()));
}
else
Add(new FleeingGenerator<Player>(enemy.GetGUID()));
Add(new FleeingMovementGenerator<Player>(enemy.GetGUID()));
}
public void MovePoint(uint id, Position pos, bool generatePath = true, float? finalOrient = null)
@@ -883,7 +891,7 @@ namespace Game.Movement
return;
// rooted units don't move (also setting falling+root flag causes client freezes)
if (_owner.HasUnitState(UnitState.Root))
if (_owner.HasUnitState(UnitState.Root | UnitState.Stunned))
return;
_owner.SetFall(true);