Core/Reputation: Fix reaction with rival factions
Port From (https://github.com/TrinityCore/TrinityCore/commit/e8b1bb5ca565897b6d39f9740bf0af3a1cf40a59)
This commit is contained in:
@@ -456,8 +456,8 @@ namespace Game
|
|||||||
|
|
||||||
void SetAtWar(FactionState faction, bool atWar)
|
void SetAtWar(FactionState faction, bool atWar)
|
||||||
{
|
{
|
||||||
// not allow declare war to own faction
|
// Do not allow to declare war to our own faction. But allow for rival factions (eg Aldor vs Scryer).
|
||||||
if (atWar && Convert.ToBoolean(faction.Flags & FactionFlags.PeaceForced))
|
if (atWar && faction.Flags.HasAnyFlag(FactionFlags.PeaceForced) && !faction.Flags.HasAnyFlag(FactionFlags.Rival))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// already set
|
// already set
|
||||||
|
|||||||
Reference in New Issue
Block a user