From 81fdf3f77c2646599b8d6f984f13eb373a03af15 Mon Sep 17 00:00:00 2001 From: Oniryck Date: Fri, 9 Sep 2016 20:51:59 +0100 Subject: [PATCH] Fix possible problem with 'allow two side interaction' and loot. --- src/game/Object/ObjectMgr.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/game/Object/ObjectMgr.cpp b/src/game/Object/ObjectMgr.cpp index 2492b0a2b..5569ac5a7 100644 --- a/src/game/Object/ObjectMgr.cpp +++ b/src/game/Object/ObjectMgr.cpp @@ -8225,7 +8225,12 @@ bool PlayerCondition::Meets(Player const* player, Map const* map, WorldObject co return faction && player->GetReputationMgr().GetRank(faction) >= ReputationRank(m_value2); } case CONDITION_TEAM: - return uint32(player->GetTeam()) == m_value1; + { + if (conditionSourceType == CONDITION_FROM_REFERING_LOOT && sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_AUCTION)) + { return true; } + else + { return uint32(player->GetTeam()) == m_value1; } + } case CONDITION_SKILL: return player->HasSkill(m_value1) && player->GetBaseSkillValue(m_value1) >= m_value2; case CONDITION_QUESTREWARDED: