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

Core/AI: Add some checks to catch if the AI changes mid-update for players.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/1015f307041b25b47a9bb4bc76ac4ed78c49d735)
This commit is contained in:
hondacrx
2021-11-15 23:22:08 -05:00
parent 593a4b9df8
commit bc84e62688
5 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Unit/Unit.Fields.cs
+1
View File
@@ -33,6 +33,7 @@ namespace Game.Entities
//AI
protected UnitAI i_AI;
protected UnitAI i_disabledAI;
bool m_aiLocked;
//Movement
protected float[] m_speed_rate = new float[(int)UnitMoveType.Max];
Source/Game/Entities/Unit/Unit.Pets.cs
-1
View File
@@ -81,7 +81,6 @@ namespace Game.Entities
Cypher.Assert(newAI != null);
i_AI = newAI;
newAI.OnCharmed(true);
AIUpdateTick(0, true);
}
else
{
Source/Game/Entities/Unit/Unit.cs
+9 -8
View File
@@ -1168,27 +1168,28 @@ namespace Game.Entities
public virtual UnitAI GetAI() { return i_AI; }
public void AIUpdateTick(uint diff, bool force = false)
public void AIUpdateTick(uint diff)
{
if (diff == 0) // some places call with diff = 0, which does nothing (for now), see PR #22296
return;
UnitAI ai = GetAI();
if (ai != null)
{
m_aiLocked = true;
ai.UpdateAI(diff);
m_aiLocked = false;
}
}
public void SetAI(UnitAI newAI)
{
if (i_AI != null)
AIUpdateTick(0, true); // old AI gets a final tick if enabled
Cypher.Assert(!m_aiLocked, "Attempt to replace AI during AI update tick");
i_AI = newAI;
AIUpdateTick(0, true); // new AI gets its initial tick
}
public void ScheduleAIChange()
{
Cypher.Assert(!m_aiLocked, "Attempt to schedule AI change during AI update tick");
bool charmed = IsCharmed();
// if charm is applied, we can't have disabled AI already, and vice versa
if (charmed)
@@ -1204,9 +1205,9 @@ namespace Game.Entities
void RestoreDisabledAI()
{
Cypher.Assert(!m_aiLocked, "Attempt to restore AI during UpdateAI tick");
Cypher.Assert(IsPlayer() || i_disabledAI != null, "Attempt to restore disabled AI on creature without disabled AI");
i_AI = i_disabledAI;
AIUpdateTick(0, true);
}
public bool IsPossessing()