Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Reputation: Fix reaction with rival factions

Browse Source 
Closes #9469
Ref #20661

(cherry picked from commit e85a48179e)
This commit is contained in:
Killyana
2017-11-25 19:35:44 +01:00
committed by funjoker
parent 66fa9e11cd
commit e8b1bb5ca5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Reputation/ReputationMgr.cpp
View File

@@ -445,8 +445,8 @@ void ReputationMgr::SetAtWar(RepListID repListID, bool on)
void ReputationMgr::SetAtWar(FactionState* faction, bool atWar) const
{
// not allow declare war to own faction
if (atWar && (faction->Flags & FACTION_FLAG_PEACE_FORCED))
// Do not allow to declare war to our own faction. But allow for rival factions (eg Aldor vs Scryer).
if (atWar && (faction->Flags & FACTION_FLAG_PEACE_FORCED) && !(faction->Flags & FACTION_FLAG_RIVAL))
return;
// already set