From 3b5dae4d804b79c1d10c805aecc2c6a88a302123 Mon Sep 17 00:00:00 2001
From: BuildTools <magnus@puj.dk>
Date: Tue, 15 Dec 2015 13:25:30 +0100
Subject: [PATCH] Remove join any perm

---
 plugin.yml                                             | 3 ---
 src/com/massivecraft/factions/Perm.java                | 1 -
 src/com/massivecraft/factions/cmd/CmdFactionsJoin.java | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/plugin.yml b/plugin.yml
index dbc93c40..b97145ec 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -38,7 +38,6 @@ permissions:
   factions.invite.add: {description: invite player, default: false}
   factions.invite.remove: {description: revoke an invite, default: false}
   factions.join: {description: join faction, default: false}
-  factions.join.any: {description: join closed faction, default: false}
   factions.join.others: {description: have another player join faction, default: false}
   factions.kick: {description: kick player from faction, default: false}
   factions.leave: {description: leave your faction, default: false}
@@ -117,7 +116,6 @@ permissions:
       factions.invite.add: true
       factions.invite.remove: true
       factions.join: true
-      factions.join.any: true
       factions.join.others: true
       factions.kick: true
       factions.leader: true
@@ -180,7 +178,6 @@ permissions:
     children:
       factions.kit.rank1: true
       factions.powerboost: true
-      factions.join.any: true
       factions.join.others: true
       factions.leader.any: true
       factions.officer.any: true
diff --git a/src/com/massivecraft/factions/Perm.java b/src/com/massivecraft/factions/Perm.java
index 3f8c12e0..4a48fd44 100644
--- a/src/com/massivecraft/factions/Perm.java
+++ b/src/com/massivecraft/factions/Perm.java
@@ -38,7 +38,6 @@ public enum Perm
 	INVITE_ADD,
 	INVITE_REMOVE,
 	JOIN,
-	JOIN_ANY,
 	JOIN_OTHERS,
 	KICK,
 	LEAVE,
diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java
index 6d0eed90..761e52fa 100644
--- a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java
+++ b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java
@@ -98,7 +98,7 @@ public class CmdFactionsJoin extends FactionsCommand
 			return;
 		}
 
-		if( ! (faction.getFlag(MFlag.getFlagOpen()) || faction.isInvited(mplayer) || msender.isUsingAdminMode() || Perm.JOIN_ANY.has(sender, false)))
+		if( ! (faction.getFlag(MFlag.getFlagOpen()) || faction.isInvited(mplayer) || msender.isUsingAdminMode()))
 		{
 			msg("<i>This faction requires invitation.");
 			if (samePlayer)