Replaced calls to check() with superperms calls. GH: closes #4

ks07 · Sep 13, 2011 · 2225882 · 2225882
1 parent c944d3e
commit 2225882
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/de/johannes13/minecraft/bukkit/chat/plugin/ChatPlugin.java b/src/de/johannes13/minecraft/bukkit/chat/plugin/ChatPlugin.java
@@ -73,7 +73,7 @@ void pluginAddPlayer(Player p) {
 		PlayerMetadata meta = new PlayerMetadata(p);
 		int priority = -1;
 		for (ChannelMetadata ch : cmeta.values()) {
-			if (check(p, "chatplugin.autojoin." + ch.name) && check(p, "chatplugin.join." + ch.name)) {
+			if (p.hasPermission("chatplugin.autojoin." + ch.name) && p.hasPermission("chatplugin.join." + ch.name)) {
 				ch.players.add(meta);
 				meta.getChannels().add(ch.name);
 				if (ch.priority > priority) {
@@ -85,11 +85,6 @@ void pluginAddPlayer(Player p) {
 		umeta.put(p, meta);
 	}
 
-	public boolean check(Player p, String perm) {
-            // Disable permissions checks for now... Deprecate and use bukkit player perms.
-            return true;
-	}
-
 	@Override
 	public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
 		if (sender instanceof Player) {
@@ -130,7 +125,6 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
                                                     IrcUser user = (IrcUser) res.get(0);
                                                     nick = user.getNick();
                                                     ircd.partIrcUser(user, chanMd);
-                                                    //this.sendIrcPart(user, chanMd);
 						} else {
                                                     Player user = (Player) res.get(0);
                                                     PlayerMetadata userpm = umeta.get(user);
@@ -173,7 +167,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
 					}
 					if (cmeta.containsKey(args[0])) {
 						cm = cmeta.get(args[0]);
-						if (check(p, "chatplugin.join." + cm.name)) {
+						if (p.hasPermission("chatplugin.join." + cm.name)) {
 							pm.setCurrentChannel(cm);
 							if (!pm.getChannels().contains(cm.name)) {
 								pm.getChannels().add(cm.name);