From 9f65e5a9ab0eedb9ba206d2e7276502185ef940f Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Wed, 13 Jun 2012 12:31:20 -0400
Subject: [PATCH] PermissionsHandler was a stupid idea.

---
 .../skills/acrobatics/AcrobaticsManager.java  | 12 +++----
 .../AcrobaticsPermissionsHandler.java         | 35 -------------------
 .../skills/acrobatics/RollEventHandler.java   |  3 +-
 3 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsPermissionsHandler.java

diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
index 96ef6a3c7..1455305e9 100644
--- a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
@@ -5,19 +5,19 @@ import org.bukkit.event.entity.EntityDamageEvent;
 
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 
 public class AcrobaticsManager {
     private Player player;
     private PlayerProfile profile;
     private int skillLevel;
-    private AcrobaticsPermissionsHandler permHandler;
+    private Permissions permissionInstance = Permissions.getInstance();
 
     public AcrobaticsManager (Player player) {
         this.player = player;
         this.profile = Users.getProfile(player);
         this.skillLevel = profile.getSkillLevel(SkillType.ACROBATICS);
-        this.permHandler = new AcrobaticsPermissionsHandler(player);
     }
 
     /**
@@ -26,7 +26,7 @@ public class AcrobaticsManager {
      * @param event The event to check
      */
     public void rollCheck(EntityDamageEvent event) {
-        if (!permHandler.hasRollPermissions()) {
+        if (!permissionInstance.roll(player)) {
             return;
         }
 
@@ -48,7 +48,7 @@ public class AcrobaticsManager {
      * @param event The event to check
      */
     public void dodgeCheck(EntityDamageEvent event) {
-        if (!permHandler.canDodge()) {
+        if (!permissionInstance.dodge(player)) {
             return;
         }
 
@@ -72,8 +72,4 @@ public class AcrobaticsManager {
     protected int getSkillLevel() {
         return skillLevel;
     }
-
-    protected AcrobaticsPermissionsHandler getPermissionsHandler() {
-        return permHandler;
-    }
 }
diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsPermissionsHandler.java b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsPermissionsHandler.java
deleted file mode 100644
index 15b830e84..000000000
--- a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsPermissionsHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.gmail.nossr50.skills.acrobatics;
-
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.util.Permissions;
-
-public class AcrobaticsPermissionsHandler {
-    private Permissions permInstance = Permissions.getInstance();
-
-    private boolean canDodge;
-    private boolean canGracefulRoll;
-    private boolean canRoll;
-
-    protected AcrobaticsPermissionsHandler (Player player) {
-        this.canDodge = permInstance.dodge(player);
-        this.canGracefulRoll = permInstance.gracefulRoll(player);
-        this.canRoll = permInstance.roll(player);
-    }
-
-    protected boolean canDodge() {
-        return canDodge;
-    }
-
-    protected boolean canGracefulRoll() {
-        return canGracefulRoll;
-    }
-
-    protected boolean canRoll() {
-        return canRoll;
-    }
-
-    protected boolean hasRollPermissions() {
-        return (canRoll || canGracefulRoll);
-    }
-}
diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java b/src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java
index 239da6ab1..8e03c7049 100644
--- a/src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java
@@ -5,6 +5,7 @@ import org.bukkit.event.entity.EntityDamageEvent;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Skills;
 
 public class RollEventHandler extends AcrobaticsEventHandler {
@@ -68,7 +69,7 @@ public class RollEventHandler extends AcrobaticsEventHandler {
      * Check if this is a graceful roll.
      */
     private void isGracefulRoll() {
-        if (manager.getPermissionsHandler().canGracefulRoll()) {
+        if (Permissions.getInstance().gracefulRoll(player)) {
             this.isGraceful = player.isSneaking();
         }
         else {