glerp

2011-10-09 21:57:43 +02:00
parent 3cdd5764d3
commit a5c8e2de49
59 changed files with 361 additions and 482 deletions
--- a/src/com/massivecraft/factions/struct/Permission.java
+++ b/src/com/massivecraft/factions/struct/Permission.java
@ -9,52 +9,52 @@ public enum Permission
 	MANAGE_SAFE_ZONE("managesafezone"),
 	MANAGE_WAR_ZONE("managewarzone"),
 	OWNERSHIP_BYPASS("ownershipbypass"),
-	COMMAND_ADMIN("command.admin"),
-	COMMAND_AUTOCLAIM("command.autoclaim"),
-	COMMAND_BALANCE("command.balance"),
-	COMMAND_BALANCE_ANY("command.balance.any"),
-	COMMAND_WITHDRAW("command.withdraw"),
-	COMMAND_PAY("command.pay"),
-	COMMAND_BYPASS("command.bypass"),
-	COMMAND_CHAT("command.chat"),
-	COMMAND_CLAIM("command.claim"),
-	COMMAND_CONFIG("command.config"),
-	COMMAND_CREATE("command.create"),
-	COMMAND_DEINVITE("command.deinvite"),
-	COMMAND_DEPOSIT("command.deposit"),
-	COMMAND_DESCRIPTION("command.description"),
-	COMMAND_DISBAND("command.disband"),
-	COMMAND_DISBAND_ANY("command.disband.any"),
-	COMMAND_HELP("command.help"),
-	COMMAND_HOME("command.home"),
-	COMMAND_INVITE("command.invite"),
-	COMMAND_JOIN("command.join"),
-	COMMAND_KICK("command.kick"),
-	COMMAND_KICK_ANY("command.kick.any"),
-	COMMAND_LEAVE("command.leave"),
-	COMMAND_LIST("command.list"),
-	COMMAND_LOCK("command.lock"),
-	COMMAND_MAP("command.map"),
-	COMMAND_MOD("command.mod"),
-	COMMAND_NO_BOOM("command.noboom"),
-	COMMAND_OPEN("command.open"),
-	COMMAND_OWNER("command.owner"),
-	COMMAND_OWNERLIST("command.ownerlist"),
-	COMMAND_SET_PEACEFUL("command.setpeaceful"),
-	COMMAND_SET_PERMANENT("command.setpermanent"),
-	COMMAND_POWER("command.power"),
-	COMMAND_POWER_ANY("command.power.any"),
-	COMMAND_RELATION("command.relation"),
-	COMMAND_RELOAD("command.reload"),
-	COMMAND_SAVE("command.save"),
-	COMMAND_SETHOME("command.sethome"),
-	COMMAND_SETHOME_ANY("command.sethome.any"),
-	COMMAND_SHOW("command.show"),
-	COMMAND_TAG("command.tag"),
-	COMMAND_TITLE("command.title"),
-	COMMAND_UNCLAIM("command.unclaim"),
-	COMMAND_UNCLAIM_ALL("command.unclaimall"),
-	COMMAND_VERSION("command.version"),
+	ADMIN("admin"),
+	AUTOCLAIM("autoclaim"),
+	BALANCE("balance"),
+	BALANCE_ANY("balance.any"),
+	WITHDRAW("withdraw"),
+	PAY("pay"),
+	BYPASS("bypass"),
+	CHAT("chat"),
+	CLAIM("claim"),
+	CONFIG("config"),
+	CREATE("create"),
+	DEINVITE("deinvite"),
+	DEPOSIT("deposit"),
+	DESCRIPTION("description"),
+	DISBAND("disband"),
+	DISBAND_ANY("disband.any"),
+	HELP("help"),
+	HOME("home"),
+	INVITE("invite"),
+	JOIN("join"),
+	KICK("kick"),
+	KICK_ANY("kick.any"),
+	LEAVE("leave"),
+	LIST("list"),
+	LOCK("lock"),
+	MAP("map"),
+	MOD("mod"),
+	NO_BOOM("noboom"),
+	OPEN("open"),
+	OWNER("owner"),
+	OWNERLIST("ownerlist"),
+	SET_PEACEFUL("setpeaceful"),
+	SET_PERMANENT("setpermanent"),
+	POWER("power"),
+	POWER_ANY("power.any"),
+	RELATION("relation"),
+	RELOAD("reload"),
+	SAVE("save"),
+	SETHOME("sethome"),
+	SETHOME_ANY("sethome.any"),
+	SHOW("show"),
+	TAG("tag"),
+	TITLE("title"),
+	UNCLAIM("unclaim"),
+	UNCLAIM_ALL("unclaimall"),
+	VERSION("version"),
 	;
 	
 	public final String node;
@ -73,27 +73,4 @@ public enum Permission
 	{
 		return has(sender, false);
 	}
-	
-	/*public boolean has(CommandSender sender)
-	{
-		//return CreativeGates.p.perm.has(sender, this.node);
-	}
-	
-	public static boolean isCommandDisabled(CommandSender sender, String command)
-	{
-		return (hasPerm(sender, "factions.commandDisable."+command) && !hasPerm(sender, "factions.commandDisable.none"));
-	}
-	
-	private static boolean hasPerm(CommandSender sender, String permNode)
-	{
-		if (Factions.Permissions == null || ! (sender instanceof Player))
-		{
-			return sender.isOp() || sender.hasPermission(permNode);
-		}
-		
-		Player player = (Player)sender;
-		return Factions.Permissions.has(player, permNode); 
-	}*/
-	
-	
 }