Merge pull request #30 from sp1ky/master

Allow Factions to defend their territory from Factionless PVP protected players
2011-08-22 13:16:09 -07:00
parent 409f98e1e6 b2ad4b43e4
commit ba1d3cee42
2 changed files with 6 additions and 0 deletions
--- 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;