Refactored another method.

Modified Aliases.
FoxDenStudio · Nov 28, 2015 · dd78828 · dd78828
1 parent b2a6190
commit dd78828
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/net/gravityfox/foxguard/handlers/GlobalHandler.java b/src/main/java/net/gravityfox/foxguard/handlers/GlobalHandler.java
@@ -89,7 +89,7 @@ public boolean modify(String arguments, InternalCommandState state, CommandSourc
     }
 
     @Override
-    public Tristate isAllowed(User user, Flags flag, Event event) {
+    public Tristate handle(User user, Flags flag, Event event) {
         return Tristate.TRUE;
     }
 

diff --git a/src/main/java/net/gravityfox/foxguard/handlers/IHandler.java b/src/main/java/net/gravityfox/foxguard/handlers/IHandler.java
@@ -39,7 +39,7 @@
  */
 public interface IHandler extends IFGObject, Comparable<IHandler> {
 
-    Tristate isAllowed(@Nullable User user, Flags flag, Event event);
+    Tristate handle(@Nullable User user, Flags flag, Event event);
 
     boolean isEnabled();
 

diff --git a/src/main/java/net/gravityfox/foxguard/handlers/PassiveHandler.java b/src/main/java/net/gravityfox/foxguard/handlers/PassiveHandler.java
@@ -71,7 +71,7 @@ public PassiveHandler(String name, int priority, CallbackHashMap<Flags, Tristate
     }
 
     @Override
-    public Tristate isAllowed(@Nullable User user, Flags flag, Event event) {
+    public Tristate handle(@Nullable User user, Flags flag, Event event) {
         if (!isEnabled) return Tristate.UNDEFINED;
         if (user != null) return Tristate.UNDEFINED;
         if (FGHelper.contains(availableFlags, flag)) {

diff --git a/src/main/java/net/gravityfox/foxguard/handlers/PermissionHandler.java b/src/main/java/net/gravityfox/foxguard/handlers/PermissionHandler.java
@@ -50,7 +50,7 @@ public PermissionHandler(String name, int priority) {
     }
 
     @Override
-    public Tristate isAllowed(@Nullable User user, Flags flag, Event event) {
+    public Tristate handle(@Nullable User user, Flags flag, Event event) {
         if (user == null) return Tristate.UNDEFINED;
         if (user.hasPermission("foxguard.flags." + this.name + "." + flag.flagName() + ".allow"))
             return Tristate.TRUE;

diff --git a/src/main/java/net/gravityfox/foxguard/handlers/SimpleHandler.java b/src/main/java/net/gravityfox/foxguard/handlers/SimpleHandler.java
@@ -243,7 +243,7 @@ public boolean modify(String arguments, InternalCommandState state, CommandSourc
     }
 
     @Override
-    public Tristate isAllowed(User user, Flags flag, Event event) {
+    public Tristate handle(User user, Flags flag, Event event) {
         if (!isEnabled) return Tristate.UNDEFINED;
         if (user == null) {
             switch (this.passiveOption) {

diff --git a/src/main/java/net/gravityfox/foxguard/listener/BlockEventListener.java b/src/main/java/net/gravityfox/foxguard/listener/BlockEventListener.java
@@ -88,7 +88,7 @@ public void handle(ChangeBlockEvent event) throws Exception {
             if (handler.getPriority() < currPriority && flagState != Tristate.UNDEFINED) {
                 break;
             }
-            flagState = flagState.and(handler.isAllowed(user, typeFlag, event));
+            flagState = flagState.and(handler.handle(user, typeFlag, event));
             currPriority = handler.getPriority();
         }
         if (flagState == Tristate.FALSE) {

diff --git a/src/main/java/net/gravityfox/foxguard/listener/SpawnEntityEventListener.java b/src/main/java/net/gravityfox/foxguard/listener/SpawnEntityEventListener.java
@@ -86,7 +86,7 @@ public void handle(SpawnEntityEvent event) throws Exception {
             if (handler.getPriority() < currPriority && flagState != Tristate.UNDEFINED) {
                 break;
             }
-            flagState = flagState.and(handler.isAllowed(user, typeFlag, event));
+            flagState = flagState.and(handler.handle(user, typeFlag, event));
             currPriority = handler.getPriority();
         }
         if (flagState == Tristate.FALSE) {

diff --git a/src/main/java/net/gravityfox/foxguard/util/Aliases.java b/src/main/java/net/gravityfox/foxguard/util/Aliases.java
@@ -34,7 +34,7 @@
 public class Aliases {
 
     public static final String[] REGIONS_ALIASES = {"regions", "region", "reg", "r"};
-    public static final String[] HANDLERS_ALIASES = {"handlers", "handler", "flagsets", "flagset", "flags", "flag", "f"};
+    public static final String[] HANDLERS_ALIASES = {"handlers", "handler", "handles", "handle", "hands", "hand", "h", "flagsets", "flagset", "flags", "flag", "f"};
     public static final String[] POSITIONS_ALIASES = {"positions", "position", "points", "point", "locations", "location", "pos", "loc", "locs", "p"};
     public static final String[] OWNER_GROUP_ALIASES = {"owners", "owner", "master", "masters", "creator", "creators",
             "admin", "admins", "administrator", "administrators", "mod", "mods"};