Core/AI: Fix crashes caused by charmed Creatures having null AI for 1 map update tick

Port From (https://github.com/TrinityCore/TrinityCore/commit/8c25abca72772e2962bac7f460a567a943388a05)
This commit is contained in:
hondacrx
2022-05-30 14:56:15 -04:00
parent 1040f80181
commit f07b6fecd5
2 changed files with 65 additions and 4 deletions
+22 -4
View File
@@ -196,7 +196,7 @@ namespace Game.Entities
// All position info based actions have been executed, reset info
_positionUpdateInfo.Reset();
if (GetAI() == null && (!IsPlayer() || (IsCharmed() && GetCharmerGUID().IsCreature())))
if (HasScheduledAIChange() && (!IsPlayer() || (IsCharmed() && GetCharmerGUID().IsCreature())))
UpdateCharmAI();
RefreshAI();
@@ -1223,11 +1223,11 @@ namespace Game.Entities
bool charmed = IsCharmed();
if (charmed)
PushAI(null);
PushAI(GetScheduledChangeAI());
else
{
RestoreDisabledAI();
PushAI(null); //This could actually be PopAI() to get the previous AI but it's required atm to trigger UpdateCharmAI()
PushAI(GetScheduledChangeAI()); //This could actually be PopAI() to get the previous AI but it's required atm to trigger UpdateCharmAI()
}
}
@@ -1235,10 +1235,28 @@ namespace Game.Entities
{
// Keep popping the stack until we either reach the bottom or find a valid AI
while (PopAI())
if (GetTopAI() != null)
if (GetTopAI() != null && GetTopAI() is not ScheduledChangeAI)
return;
}
UnitAI GetScheduledChangeAI()
{
Creature creature = ToCreature();
if (creature != null)
return new ScheduledChangeAI(creature);
else
return null;
}
bool HasScheduledAIChange()
{
UnitAI ai = GetAI();
if (ai != null)
return ai is ScheduledChangeAI;
else
return true;
}
public bool IsPossessedByPlayer()
{
return HasUnitState(UnitState.Possessed) && GetCharmerGUID().IsPlayer();