aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/AI/CreatureAI.cpp
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2016-05-05 11:56:25 +0200
committerTreeston <treeston.mmoc@gmail.com>2016-05-05 11:56:25 +0200
commit35a66a33fc089b2fbafec3528ecc39d03b896f2c (patch)
treec96ef91c9dff75a47f6ef2395473bf34f0ec7ebc /src/server/game/AI/CreatureAI.cpp
parent769b7ff7fd2cb86f5b9978d15ea20c398273ec48 (diff)
parent26b084a90ff3e4f0601e72c283bd3296d4640585 (diff)
Merge pull request #16020 from Treeston/3.3.5-CharmAiFix
CreatureAI: Adjust AI behavior when a charm ends
Diffstat (limited to 'src/server/game/AI/CreatureAI.cpp')
-rw-r--r--src/server/game/AI/CreatureAI.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index 6ceb4f01c48..8e6540ed89c 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -29,11 +29,13 @@
#include "Language.h"
//Disable CreatureAI when charmed
-void CreatureAI::OnCharmed(bool /*apply*/)
+void CreatureAI::OnCharmed(bool apply)
{
- //me->IsAIEnabled = !apply;*/
- me->NeedChangeAI = true;
- me->IsAIEnabled = false;
+ if (apply)
+ {
+ me->NeedChangeAI = true;
+ me->IsAIEnabled = false;
+ }
}
AISpellInfoType* UnitAI::AISpellInfo;