diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index 2a067a1ae..81ec32fdd 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -42,6 +42,7 @@ import network.packets.swg.zone.baselines.Baseline.BaselineType; import network.packets.swg.zone.object_controller.PostureUpdate; import resources.HologramColour; import resources.Posture; +import resources.PvpFaction; import resources.PvpFlag; import resources.PvpStatus; import resources.Race; @@ -807,6 +808,9 @@ public class CreatureObject extends TangibleObject { } return isPlayer() && ((CreatureObject) otherObject).isPlayer() + && getPvpFaction() != PvpFaction.NEUTRAL + && otherObject.getPvpFaction() != PvpFaction.NEUTRAL + && getPvpFaction() != otherObject.getPvpFaction() && getPvpStatus() == PvpStatus.SPECIALFORCES && otherObject.getPvpStatus() == PvpStatus.SPECIALFORCES; }