From 8dca7e2a9b14c0a107a69431d76e12ae30c5303e Mon Sep 17 00:00:00 2001 From: Xefir Date: Thu, 10 May 2012 10:07:35 +0200 Subject: [PATCH] Code cleaning --- .../bukkit/simplyperms/SimplyPrevents.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/net/crystalyx/bukkit/simplyperms/SimplyPrevents.java b/src/net/crystalyx/bukkit/simplyperms/SimplyPrevents.java index b8f3573..73523cf 100755 --- a/src/net/crystalyx/bukkit/simplyperms/SimplyPrevents.java +++ b/src/net/crystalyx/bukkit/simplyperms/SimplyPrevents.java @@ -76,11 +76,6 @@ public abstract class SimplyPrevents implements Listener { } } - private void deny(Cancellable event, Player player, String node) { - event.setCancelled(true); - sendMessage(player, node); - } - protected boolean prevent(Cancellable event, Player player, String node) { if (node.contains(",")) { for (String subNode : node.split(",")) { @@ -91,7 +86,8 @@ public abstract class SimplyPrevents implements Listener { } else if (node.contains(".")) { if (player.isPermissionSet("permissions.allow." + node)) { if (!player.hasPermission("permissions.allow." + node)) { - deny(event, player, node); + event.setCancelled(true); + sendMessage(player, node); return true; } } else if (prevent(event, player, node.substring(0, node.indexOf('.')))) { @@ -99,12 +95,14 @@ public abstract class SimplyPrevents implements Listener { } } else if (player.isPermissionSet("permissions.allow." + node)) { if (!player.hasPermission("permissions.allow." + node)) { - deny(event, player, node); + event.setCancelled(true); + sendMessage(player, node); return true; } } else if (player.isPermissionSet("permissions.allow.*") && !player.hasPermission("permissions.allow.*")) { - deny(event, player, node); + event.setCancelled(true); + sendMessage(player, node); return true; } return false;