Remove join any perm
This commit is contained in:
		@@ -38,7 +38,6 @@ permissions:
 | 
				
			|||||||
  factions.invite.add: {description: invite player, default: false}
 | 
					  factions.invite.add: {description: invite player, default: false}
 | 
				
			||||||
  factions.invite.remove: {description: revoke an invite, default: false}
 | 
					  factions.invite.remove: {description: revoke an invite, default: false}
 | 
				
			||||||
  factions.join: {description: join faction, 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.join.others: {description: have another player join faction, default: false}
 | 
				
			||||||
  factions.kick: {description: kick player from faction, default: false}
 | 
					  factions.kick: {description: kick player from faction, default: false}
 | 
				
			||||||
  factions.leave: {description: leave your faction, default: false}
 | 
					  factions.leave: {description: leave your faction, default: false}
 | 
				
			||||||
@@ -117,7 +116,6 @@ permissions:
 | 
				
			|||||||
      factions.invite.add: true
 | 
					      factions.invite.add: true
 | 
				
			||||||
      factions.invite.remove: true
 | 
					      factions.invite.remove: true
 | 
				
			||||||
      factions.join: true
 | 
					      factions.join: true
 | 
				
			||||||
      factions.join.any: true
 | 
					 | 
				
			||||||
      factions.join.others: true
 | 
					      factions.join.others: true
 | 
				
			||||||
      factions.kick: true
 | 
					      factions.kick: true
 | 
				
			||||||
      factions.leader: true
 | 
					      factions.leader: true
 | 
				
			||||||
@@ -180,7 +178,6 @@ permissions:
 | 
				
			|||||||
    children:
 | 
					    children:
 | 
				
			||||||
      factions.kit.rank1: true
 | 
					      factions.kit.rank1: true
 | 
				
			||||||
      factions.powerboost: true
 | 
					      factions.powerboost: true
 | 
				
			||||||
      factions.join.any: true
 | 
					 | 
				
			||||||
      factions.join.others: true
 | 
					      factions.join.others: true
 | 
				
			||||||
      factions.leader.any: true
 | 
					      factions.leader.any: true
 | 
				
			||||||
      factions.officer.any: true
 | 
					      factions.officer.any: true
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -38,7 +38,6 @@ public enum Perm
 | 
				
			|||||||
	INVITE_ADD,
 | 
						INVITE_ADD,
 | 
				
			||||||
	INVITE_REMOVE,
 | 
						INVITE_REMOVE,
 | 
				
			||||||
	JOIN,
 | 
						JOIN,
 | 
				
			||||||
	JOIN_ANY,
 | 
					 | 
				
			||||||
	JOIN_OTHERS,
 | 
						JOIN_OTHERS,
 | 
				
			||||||
	KICK,
 | 
						KICK,
 | 
				
			||||||
	LEAVE,
 | 
						LEAVE,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -98,7 +98,7 @@ public class CmdFactionsJoin extends FactionsCommand
 | 
				
			|||||||
			return;
 | 
								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.");
 | 
								msg("<i>This faction requires invitation.");
 | 
				
			||||||
			if (samePlayer)
 | 
								if (samePlayer)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user