diff options
| author | megamage <none@none> | 2009-02-22 17:35:14 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-22 17:35:14 -0600 |
| commit | 107218fe44c5a45023950f11ee3562abfcdd2c95 (patch) | |
| tree | 5a3aae5c74723b26cd016596199674af81fa1355 /src/bindings/scripts | |
| parent | 7190332fcea1dcc6ed8ce59c6bfb542522775e35 (diff) | |
| parent | 90d5e05aafff0f3dabd294811b4f82b024317a4a (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/bindings/scripts')
| -rw-r--r-- | src/bindings/scripts/scripts/guard/guards.cpp | 2 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/bindings/scripts/scripts/guard/guards.cpp b/src/bindings/scripts/scripts/guard/guards.cpp index b825c75b6ab..6caa6519c74 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, 7, 6, 0, "Pig and Whistle Tavern"); + player->SEND_POI(-8690.11, 324.85, 7, 6, 0, "Command Center"); player->SEND_GOSSIP_MENU(901,_Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 4: //Druid 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 0ae8afd9f6c..36bff1796e6 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; |