Fix #172 crash

--HG--
branch : trunk

1 files changed, 6 insertions, 4 deletions

diff --git a/src/bindings/scripts/scripts/northrend/borean_tundra.cpp b/src/bindings/scripts/scripts/northrend/borean_tundra.cpp
index eb787f87267..1aa943ad610 100644
--- a/src/bindings/scripts/scripts/northrend/borean_tundra.cpp
+++ b/src/bindings/scripts/scripts/northrend/borean_tundra.cpp
@@ -637,13 +637,15 @@ struct TRINITY_DLL_DECL npc_nesingwary_trapperAI : public ScriptedAI
         m_creature->SetVisibility(VISIBILITY_OFF);
         Phase_Timer = 2500;
         Phase = 1;
+	go_caribou = NULL;
     }
     void EnterCombat(Unit *who) {}
     void MoveInLineOfSight(Unit *who) {}
     
     void JustDied(Unit* who)
     {
-        go_caribou->SetLootState(GO_JUST_DEACTIVATED);
+        if (go_caribou && go_caribou->GetTypeId() == TYPEID_GAMEOBJECT)
+	    go_caribou->SetLootState(GO_JUST_DEACTIVATED);
         
         TempSummon *summon = (TempSummon*)m_creature;
 	if (summon)
@@ -722,9 +724,9 @@ struct TRINITY_DLL_DECL npc_nesingwary_trapperAI : public ScriptedAI
                         
                         go_caribou->SetGoState(GO_STATE_ACTIVE);
                         
-                        Phase = 8;
-                        Phase_Timer = 1000;
-                        break;
+                    Phase = 8;
+                    Phase_Timer = 1000;
+                    break;
                         
                 case 8:
                     m_creature->CastSpell(m_creature,SPELL_TRAPPED,true);