diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-09-19 17:41:24 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-09-19 17:41:24 +0200 |
| commit | 3b52fcc7693f14f2b7e6f2130a73379ec33bd5c0 (patch) | |
| tree | 5e9aad7a3564e7d3d74a1ffd91579db41bb0c388 /src/server/game/Globals/ObjectMgr.cpp | |
| parent | 10b068ce5dbf9da7be6a727e0cdb0360f5c4b615 (diff) | |
| parent | f34bae89d3869ddc5f74a85d9a6fa44f67ca4635 (diff) | |
Merge remote-tracking branch 'origin/6.x_implement_taxi' into 6.x
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 5352112caca..b048afe16a6 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -5673,9 +5673,10 @@ uint32 ObjectMgr::GetNearestTaxiNode(float x, float y, float z, uint32 mapid, ui float dist = 10000; uint32 id = 0; + uint32 requireFlag = (team == ALLIANCE) ? TAXI_NODE_FLAG_ALLIANCE : TAXI_NODE_FLAG_HORDE; for (TaxiNodesEntry const* node : sTaxiNodesStore) { - if (!node || node->MapID != mapid || (!node->MountCreatureID[team == ALLIANCE ? 1 : 0] && node->MountCreatureID[0] != 32981)) // dk flight + if (!node || node->MapID != mapid || !(node->Flags & requireFlag)) continue; uint8 field = (uint8)((node->ID - 1) / 8); |