aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/ItemHandler.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/game/ItemHandler.cpp b/src/game/ItemHandler.cpp
index b36fd844923..4cc3758f269 100644
--- a/src/game/ItemHandler.cpp
+++ b/src/game/ItemHandler.cpp
@@ -746,7 +746,13 @@ void WorldSession::SendListInventory( uint64 vendorguid )
{
if((pProto->AllowableClass & _player->getClassMask()) == 0 && pProto->Bonding == BIND_WHEN_PICKED_UP && !_player->isGameMaster())
continue;
-
+ // Only display items in vendor lists for the team the
+ // player is on. If GM on, display all items.
+ // `item_template`.`Faction` is actually `Team`.
+ // 1 == Horde / 2 == Alliance. Field will be renamed in later
+ // patch.
+ if (pProto->Faction == 1 && _player->GetTeam() == ALLIANCE || pProto->Faction == 2 && _player->GetTeam() == HORDE && !_player->isGameMaster())
+ continue;
++count;
// reputation discount