From d144724e2fd8a74a3e896751dc9c866b3932f815 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 21 Oct 2014 19:23:32 +0200 Subject: Core/Entities: First batch of removing implicit conversions of ObjectGuid to uint64 (cherry picked from commit 9cc7044546eaaaf4fd7a999c5e074ad0ea3d47ef) --- src/server/game/AI/CreatureAI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/game/AI/CreatureAI.cpp') diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index c355b07ed24..907152b03cb 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -53,7 +53,7 @@ void CreatureAI::Talk(uint8 id, WorldObject const* whisperTarget /*= nullptr*/) // Disable CreatureAI when charmed void CreatureAI::OnCharmed(bool isNew) { - if (isNew && !me->IsCharmed() && me->LastCharmerGUID) + if (isNew && !me->IsCharmed() && !me->LastCharmerGUID.IsEmpty()) { if (!me->HasReactState(REACT_PASSIVE)) { -- cgit v1.2.3