From 196a1296128ffcc30fdd16be1534b0db7332669c Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sat, 28 Mar 2009 11:24:50 -0600
Subject: *Fix a crash caused by eventai emote.

--HG--
branch : trunk
---
 src/bindings/scripts/scripts/creature/mob_event_ai.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp
index cd296910d2c..46adc7f91f2 100644
--- a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp
+++ b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp
@@ -1433,6 +1433,9 @@ CreatureAI* GetAI_mob_eventai(Creature* pCreature)
 
 bool ReceiveEmote_mob_eventai(Player* pPlayer, Creature* pCreature, uint32 uiEmote)
 {
+    if(pCreature->isCharmed())
+        return true;
+
     Mob_EventAI* pTmpCreature = (Mob_EventAI*)(pCreature->AI());
 
     if (pTmpCreature->bEmptyList)
-- 
cgit v1.2.3