From dd84dfd56da21763840491c1ff2f363d73e9d6de Mon Sep 17 00:00:00 2001 From: maximius Date: Tue, 6 Oct 2009 13:16:10 -0700 Subject: *Utgarde Pinnacle: Svala fixes - Fix some crashes, complete ritual code and change defines by enums, by Tartalo *Fix Acherus Flightmaster for Alliance, by MrSmite *Fix The Party's Over achievement (Prince Taldaram) & Implement Good Grief achievement (Maiden of Grief), by Tartalo *Fix certaint things entering the threat list and never leaving, bugging mob's HP regeneration (ie: Priest's Lightwell).. again. Thanks Gyullo. --HG-- branch : trunk --- src/game/ObjectMgr.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/game/ObjectMgr.cpp') diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 73a85e55a41..588722213cb 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -5284,6 +5284,15 @@ uint32 ObjectMgr::GetTaxiMountDisplayId( uint32 id, uint32 team, bool allowed_al else mount_entry = node->MountCreatureID[0]; + // Fix for Alliance not being able to use Acherus taxi + // only one mount type for both sides + if (mount_entry == 0 && allowed_alt_team) + { + // Simply reverse the selection. At least one team in theory should + // have a valid mount ID to choose + mount_entry = (team == ALLIANCE) ? node->MountCreatureID[0] : node->MountCreatureID[1]; + } + CreatureInfo const *mount_info = GetCreatureTemplate(mount_entry); if (mount_info) { -- cgit v1.2.3