Merge branch 'master' of github.com:MassiveCraft/Factions

2011-08-22 23:49:08 -05:00
parent e970c02808 33ee470e7f
commit 72bf1492c3
3 changed files with 7 additions and 1 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;