Added support for newer versions of Permissions, in theory.

EngineHub · Apr 3, 2011 · fd2de1d · fd2de1d
1 parent ac920fd
commit fd2de1d
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/src/com/sk89q/bukkit/migration/NijiPermissionsResolver.java b/src/com/sk89q/bukkit/migration/NijiPermissionsResolver.java
@@ -55,31 +55,44 @@ public boolean hasPermission(String name, String permission) {
         try {
             Player player = server.getPlayer(name);
             if (player == null) return false;
-            return api.Security.permission(player, permission);
+            try {
+                return api.getHandler().has(player, permission);
+            } catch (Throwable t) {
+                return api.Security.permission(player, permission);
+            }
         } catch (Throwable t) {
             t.printStackTrace();
             return false;
         }
     }
 
-    @SuppressWarnings("static-access")
+    @SuppressWarnings({ "static-access", "deprecation" })
     public boolean inGroup(String name, String group) {
         try {
             Player player = server.getPlayer(name);
             if (player == null) return false;
-            return api.Security.inGroup(name, group);
+            try {
+                return api.getHandler().inGroup(player.getWorld().getName(), name, group);
+            } catch (Throwable t) {
+                return api.Security.inGroup(name, group);
+            }
         } catch (Throwable t) {
             t.printStackTrace();
             return false;
         }
     }
 
-    @SuppressWarnings("static-access")
+    @SuppressWarnings({ "static-access", "deprecation" })
     public String[] getGroups(String name) {
         try {
             Player player = server.getPlayer(name);
             if (player == null) return new String[0];
-            String group = api.Security.getGroup(player.getName());
+            String group;
+            try {
+                group = api.getHandler().getGroup(player.getWorld().getName(), player.getName());
+            } catch (Throwable t) {
+                group = api.Security.getGroup(player.getName());
+            }
             if (group == null) {
                 return new String[0];
             } else {