Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/AI: Fix remaining charming issue

Browse Source 
Make creatures evade when a charming expires and they cannot attack the charmer (i.e. charmer with .gm on)
This commit is contained in:
jackpoz
2020-03-02 20:43:52 +01:00
parent 817ae5bca6
commit 69809d1203
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/game/AI/CreatureAI.cpp
View File

@@ -62,6 +62,9 @@ void CreatureAI::OnCharmed(bool isNew)
}
me->LastCharmerGUID.Clear();
if (!me->IsInCombat())
EnterEvadeMode(EVADE_REASON_NO_HOSTILES);
}
UnitAI::OnCharmed(isNew);

3
src/server/game/AI/SmartScripts/SmartAI.cpp
View File

@@ -706,6 +706,9 @@ void SmartAI::OnCharmed(bool /*isNew*/)
if (Unit* lastCharmer = ObjectAccessor::GetUnit(*me, me->LastCharmerGUID))
me->EngageWithTarget(lastCharmer);
me->LastCharmerGUID.Clear();
if (!me->IsInCombat())
EnterEvadeMode(EVADE_REASON_NO_HOSTILES);
}
}