From 233dacfbb8e9f537c14616004ad745a193995673 Mon Sep 17 00:00:00 2001 From: Blaymoira Date: Sun, 22 Feb 2009 19:10:59 +0100 Subject: *Small POI correction in Stormwind Guard gossup --HG-- branch : trunk --- src/bindings/scripts/scripts/guard/guards.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/bindings/scripts') diff --git a/src/bindings/scripts/scripts/guard/guards.cpp b/src/bindings/scripts/scripts/guard/guards.cpp index 4d50626f177..01da1da33df 100644 --- a/src/bindings/scripts/scripts/guard/guards.cpp +++ b/src/bindings/scripts/scripts/guard/guards.cpp @@ -3286,7 +3286,7 @@ void SendClassTrainerMenu_guard_stormwind(Player *player, Creature *_Creature, u player->SEND_GOSSIP_MENU(900,_Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 3: //Warrior - player->SEND_POI(-8624.54, 402.61, 6, 6, 0, "Pig and Whistle Tavern"); + player->SEND_POI(-8690.11, 324.85, 6, 6, 0, "Command Center"); player->SEND_GOSSIP_MENU(901,_Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Druid -- cgit v1.2.3 From 8c4d3fb1e4c9a969a907353dcb668c0a4b58bfeb Mon Sep 17 00:00:00 2001 From: megamage Date: Sun, 22 Feb 2009 16:47:29 -0600 Subject: *Fix a crash caused by npc_overlord_morghorAI script. --HG-- branch : trunk --- .../scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/bindings/scripts') diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp index ad851eeaa1f..d5035d2cfc1 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp @@ -718,6 +718,12 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI Unit* Illi = Unit::GetUnit((*m_creature), IllidanGUID); + if(!plr || !Illi) + { + EnterEvadeMode(); + return; + } + switch(Step) { case 0: return 0; break; -- cgit v1.2.3