From c43d34af79f3eb3bd2296532a8a81b8b1bd47757 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Sun, 6 Nov 2011 09:20:03 +0100 Subject: [PATCH] Fix the nofaction wilderness invuln bug. --- .../massivecraft/factions/listeners/FactionsEntityListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java index 1e471af6..a3002ff4 100644 --- a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java +++ b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java @@ -207,7 +207,7 @@ public class FactionsEntityListener extends EntityListener // You can not hurt neutrals in their own territory. boolean ownTerritory = defender.isInOwnTerritory(); - if (ownTerritory && relation == Rel.NEUTRAL) + if (defender.hasFaction() && ownTerritory && relation == Rel.NEUTRAL) { attacker.msg("You can't hurt %s in their own territory unless you declare them as an enemy.", defender.describeTo(attacker)); defender.msg("%s tried to hurt you.", attacker.describeTo(defender, true));