Merge remote-tracking branch 'origin/master' into CustomFactionEvents

src/com/massivecraft/factions/Conf.java

@@ -135,11 +135,11 @@ public class Conf
 	public static int actionDeniedPainAmount = 2;
 
 	// commands which will be prevented if the player is a member of a permanent faction
-	public static Set<String> permanentFactionMemberDenyCommands = new HashSet<String>();
+	public static Set<String> permanentFactionMemberDenyCommands = new LinkedHashSet<String>();
 
 	// commands which will be prevented when in claimed territory of another faction
-	public static Set<String> territoryNeutralDenyCommands = new HashSet<String>();
+	public static Set<String> territoryNeutralDenyCommands = new LinkedHashSet<String>();
-	public static Set<String> territoryEnemyDenyCommands = new HashSet<String>();
+	public static Set<String> territoryEnemyDenyCommands = new LinkedHashSet<String>();
 	
 	public static double territoryShieldFactor = 0.3;
 
@@ -211,12 +211,15 @@ public class Conf
 	//public static boolean bankMembersCanWithdraw = false; //Have to be at least moderator to withdraw or pay money to another faction
 	public static boolean bankFactionPaysCosts = true; //The faction pays for faction command costs, such as sethome
 	public static boolean bankFactionPaysLandCosts = true; //The faction pays for land claiming costs.
-	
+
-	public static Set<String> worldsNoClaiming = new HashSet<String>();
+	// mainly for other plugins/mods that use a fake player to take actions, which shouldn't be subject to our protections
-	public static Set<String> worldsNoPowerLoss = new HashSet<String>();
+	public static Set<String> playersWhoBypassAllProtection = new LinkedHashSet<String>();
-	public static Set<String> worldsIgnorePvP = new HashSet<String>();
+
+	public static Set<String> worldsNoClaiming = new LinkedHashSet<String>();
+	public static Set<String> worldsNoPowerLoss = new LinkedHashSet<String>();
+	public static Set<String> worldsIgnorePvP = new LinkedHashSet<String>();
 	// TODO: A better solution Would be to have One wilderness faction per world.
-	//public static Set<String> worldsNoWildernessProtection = new HashSet<String>();
+	//public static Set<String> worldsNoWildernessProtection = new LinkedHashSet<String>();
 	
 	public static transient int mapHeight = 8;
 	public static transient int mapWidth = 39;

src/com/massivecraft/factions/FPlayer.java

@@ -648,7 +648,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
 		{
 			double cost = Econ.calculateClaimCost(ownedLand, currentFaction.isNormal());
 
-			if (Conf.econClaimUnconnectedFee != 0.0 && forFaction.getLandRoundedInWorld(flocation.getWorldName()) > 0 && !Board.isConnectedLocation(flocation, currentFaction))
+			if (Conf.econClaimUnconnectedFee != 0.0 && forFaction.getLandRoundedInWorld(flocation.getWorldName()) > 0 && !Board.isConnectedLocation(flocation, forFaction))
 				cost += Conf.econClaimUnconnectedFee;
 
 			if(Conf.bankEnabled && Conf.bankFactionPaysLandCosts && this.hasFaction())

src/com/massivecraft/factions/listeners/FactionsBlockListener.java

@@ -59,8 +59,10 @@ public class FactionsBlockListener implements Listener
 	
 	public static boolean playerCanBuildDestroyBlock(Player player, Block block, String action, boolean justCheck)
 	{
-		FPlayer me = FPlayers.i.get(player);
+		String name = player.getName();
+		if (Conf.playersWhoBypassAllProtection.contains(name)) return true;
 
+		FPlayer me = FPlayers.i.get(name);
 		if (me.hasAdminMode()) return true;
 
 		Location location = block.getLocation();

src/com/massivecraft/factions/listeners/FactionsEntityListener.java

@@ -222,7 +222,9 @@ public class FactionsEntityListener implements Listener
 		
 		if (attacker == null || attacker.getPlayer() == null)
 			return true;
-		
+
+		if (Conf.playersWhoBypassAllProtection.contains(attacker.getName())) return true;
+
 		if (attacker.hasLoginPvpDisabled())
 		{
 			if (notify) attacker.msg("<i>You can't hurt other players for " + Conf.noPVPDamageToOthersForXSecondsAfterLogin + " seconds after logging in.");

src/com/massivecraft/factions/listeners/FactionsPlayerListener.java

@@ -33,9 +33,6 @@ import com.massivecraft.factions.struct.FPerm;
 import com.massivecraft.factions.struct.Rel;
 import com.massivecraft.factions.util.VisualizeUtil;
 
-import java.util.logging.Level;
-
-
 
 public class FactionsPlayerListener implements Listener
 {
@@ -170,14 +167,20 @@ public class FactionsPlayerListener implements Listener
     // TODO: Possibly incorporate pain build... 
     public static boolean playerCanUseItemHere(Player player, Location loc, Material material, boolean justCheck)
 	{
-		FPlayer me = FPlayers.i.get(player);
+		String name = player.getName();
+		if (Conf.playersWhoBypassAllProtection.contains(name)) return true;
+
+		FPlayer me = FPlayers.i.get(name);
 		if (me.hasAdminMode()) return true;
 		if (Conf.materialsEditTools.contains(material) && ! FPerm.BUILD.has(me, loc, ! justCheck)) return false;
 		return true;
 	}
 	public static boolean canPlayerUseBlock(Player player, Block block, boolean justCheck)
 	{
-		FPlayer me = FPlayers.i.get(player);
+		String name = player.getName();
+		if (Conf.playersWhoBypassAllProtection.contains(name)) return true;
+
+		FPlayer me = FPlayers.i.get(name);
 		if (me.hasAdminMode()) return true;
 		Location loc = block.getLocation();
 		Material material = block.getType();