[7689] Batter EventAI loading checks and fix one from possible crash cases. Author: NoFantasy

--HG--
branch : trunk

1 files changed, 5 insertions, 4 deletions

diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp
index bcd3500cb68..2cc5d4f14cc 100644
--- a/src/game/CreatureEventAI.cpp
+++ b/src/game/CreatureEventAI.cpp
@@ -900,10 +900,11 @@ void CreatureEventAI::ProcessAction(uint16 type, uint32 param1, uint32 param2, u
             else
             {
                 //if not available, use pActionInvoker
-                Unit* pTarget = GetTargetByType(param2, pActionInvoker);
-
-                if (Player* pPlayer = pTarget->GetCharmerOrOwnerPlayerOrPlayerItself())
-                    pPlayer->RewardPlayerAndGroupAtEvent(param1, m_creature);
+                if (Unit* pTarget = GetTargetByType(param2, pActionInvoker))
+                {
+                    if (Player* pPlayer = pTarget->GetCharmerOrOwnerPlayerOrPlayerItself())
+                        pPlayer->RewardPlayerAndGroupAtEvent(param1, m_creature);
+                }
             }
         }
         break;