From 759482b42bc32e71aef54f26a8428b0000edfbac Mon Sep 17 00:00:00 2001 From: sirikfoll Date: Fri, 13 Mar 2020 18:15:45 +0100 Subject: Core/Reputation: Fix Oracles/Frenzyheart not being set to war properly Closes #9469 (cherry picked from commit 47c49c391233d67e7cf992a2df9516f36d4f8ee5) --- src/server/game/Reputation/ReputationMgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/game/Reputation/ReputationMgr.cpp') diff --git a/src/server/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp index bdef5a3c38b..8f684896827 100644 --- a/src/server/game/Reputation/ReputationMgr.cpp +++ b/src/server/game/Reputation/ReputationMgr.cpp @@ -570,7 +570,7 @@ void ReputationMgr::SetAtWar(RepListID repListID, bool on) void ReputationMgr::SetAtWar(FactionState* faction, bool atWar) const { // Do not allow to declare war to our own faction. But allow for rival factions (eg Aldor vs Scryer). - if (atWar && faction->Flags.HasFlag(ReputationFlags::Peaceful)) + if (atWar && faction->Flags.HasFlag(ReputationFlags::Peaceful) && GetRank(sFactionStore.AssertEntry(faction->ID)) > REP_HATED) return; // already set -- cgit v1.2.3