diff options
| author | tartalo <none@none> | 2009-10-25 02:47:04 +0200 |
|---|---|---|
| committer | tartalo <none@none> | 2009-10-25 02:47:04 +0200 |
| commit | 7cb1b4fa864d1f8d3e61a3d1bf9e4a17cc7280d5 (patch) | |
| tree | 5b91bfd90232ad59c2297a4fa8fb1f6c56a92088 | |
| parent | 19ea9b8de4ad24a96dec925fac0eccb5b1897e7f (diff) | |
Violet Hold: Fix some despawning timers
Check pointers to avoid possible crashes
--HG--
branch : trunk
| -rw-r--r-- | src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp | 4 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp index 39220b2903f..f566f27918e 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp @@ -246,7 +246,7 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance Creature *pSinclari = instance->GetCreature(uiSinclari); if (pSinclari) pSinclari->SummonCreature(CREATURE_CYANIGOSA,PortalLocation[0].x,PortalLocation[0].y, - PortalLocation[0].z,PortalLocation[0].orientation,TEMPSUMMON_CORPSE_DESPAWN,90000); + PortalLocation[0].z,PortalLocation[0].orientation,TEMPSUMMON_CORPSE_DESPAWN,0); break; } case 1: @@ -261,7 +261,7 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance { pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL,PortalLocation[uiLocation].x,PortalLocation[uiLocation].y, PortalLocation[uiLocation].z,PortalLocation[uiLocation].orientation, - TEMPSUMMON_CORPSE_DESPAWN,0); + TEMPSUMMON_CORPSE_DESPAWN,900000); uiLocation = (++uiLocation)%3; } } diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp index d75c5179b2e..f290372715d 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp @@ -17,7 +17,7 @@ enum Creatures bool GossipHello_npc_sinclari(Player* pPlayer, Creature* pCreature) { ScriptedInstance* pInstance = pCreature->GetInstanceData(); - if (pInstance && pInstance->GetData(DATA_WAVE_COUNT) == 0) + if (pInstance && pInstance->GetData(DATA_WAVE_COUNT) == 0 && pPlayer) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_START_EVENT,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(1, pCreature->GetGUID()); return true; @@ -25,7 +25,8 @@ bool GossipHello_npc_sinclari(Player* pPlayer, Creature* pCreature) bool GossipSelect_npc_sinclari(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - pPlayer->CLOSE_GOSSIP_MENU(); + if (pPlayer) + pPlayer->CLOSE_GOSSIP_MENU(); ScriptedInstance* pInstance = pCreature->GetInstanceData(); if (pInstance) pInstance->SetData(DATA_WAVE_COUNT,1); |