aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities
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/Entities
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/Entities')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index d2d85dbfca6..1b60f5d730b 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -13712,6 +13712,9 @@ void Unit::UpdateCharmAI()
delete i_AI;
i_AI = i_disabledAI;
i_disabledAI = nullptr;
+
+ if (GetTypeId() == TYPEID_UNIT)
+ ToCreature()->AI()->OnCharmed(false);
}
}
else