Core/Entities: fix interaction of traps with ffa pvp and sanctuary flags

2018-01-24 12:06:19 -05:00
parent 461dff9b67
commit 659080b5a5
4 changed files with 31 additions and 17 deletions
@@ -2508,8 +2508,7 @@ namespace Game.Entities
                    }

                    // check FFA_PVP
-                    if (Convert.ToBoolean(GetByteValue(UnitFields.Bytes2, UnitBytes2Offsets.PvpFlag) & (byte)UnitBytes2Flags.FFAPvp)
-                        && Convert.ToBoolean(target.GetByteValue(UnitFields.Bytes2, UnitBytes2Offsets.PvpFlag) & (byte)UnitBytes2Flags.FFAPvp))
+                    if (IsFFAPvP() && target.IsFFAPvP())
                        return ReputationRank.Hostile;

                    if (selfPlayerOwner != null)