From b2ad4b43e407c4fc7c24b3dd8b38f13754ac3cb6 Mon Sep 17 00:00:00 2001
From: sp1ky <david@david-bannon.com>
Date: Fri, 12 Aug 2011 16:08:11 +0100
Subject: [PATCH] Allow PVP vs. Factionless in attacker's faction territory

---
 src/com/massivecraft/factions/Conf.java                       | 2 ++
 .../factions/listeners/FactionsEntityListener.java            | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/com/massivecraft/factions/Conf.java b/src/com/massivecraft/factions/Conf.java
index 3e686efe..47fd27ab 100644
--- a/src/com/massivecraft/factions/Conf.java
+++ b/src/com/massivecraft/factions/Conf.java
@@ -75,6 +75,8 @@ public class Conf {
 	
 	public static boolean disablePVPBetweenNeutralFactions = false;
 	public static boolean disablePVPForFactionlessPlayers = false;
+	public static boolean enablePVPAgainstFactionlessInAttackersLand = false;
+	
 	public static int noPVPDamageToOthersForXSecondsAfterLogin = 3;
 
 	public static boolean peacefulTerritoryDisablePVP = true;
diff --git a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
index 8ee6bd51..190276a8 100644
--- a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
+++ b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
@@ -206,6 +206,10 @@ public class FactionsEntityListener extends EntityListener {
 			attacker.sendMessage("You can't hurt other players until you join a faction.");
 			return false;
 		}
+		else if (defLocFaction == attacker.getFaction() && Conf.enablePVPAgainstFactionlessInAttackersLand) {
+			// Allow PVP vs. Factionless in attacker's faction territory
+			return true;
+		}
 		else if (!defender.hasFaction() && Conf.disablePVPForFactionlessPlayers) {
 			attacker.sendMessage("You can't hurt players who are not currently in a faction.");
 			return false;