Whelp, not setting the permission sure leads to an NPE!

Phoenix616 · May 2, 2016 · 77a6dce · 77a6dce
1 parent 4040202
commit 77a6dce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/bungee/src/main/java/de/themoep/resourcepacksplugin/bungee/BungeeResourcepacks.java b/bungee/src/main/java/de/themoep/resourcepacksplugin/bungee/BungeeResourcepacks.java
@@ -452,12 +452,7 @@ public boolean checkPermission(ResourcepacksPlayer player, String perm) {
     public boolean checkPermission(UUID playerId, String perm) {
         ProxiedPlayer proxiedPlayer = getProxy().getPlayer(playerId);
         if(proxiedPlayer != null) {
-            try {
-                return proxiedPlayer.hasPermission(perm);
-            } catch(NullPointerException e) {
-                // Catch an error some BungeePerms version apparently has
-                return false;
-            }
+            return proxiedPlayer.hasPermission(perm);
         }
         return false;
 

diff --git a/core/src/main/java/de/themoep/resourcepacksplugin/core/ResourcePack.java b/core/src/main/java/de/themoep/resourcepacksplugin/core/ResourcePack.java
@@ -81,6 +81,7 @@ public ResourcePack(String name, String url, String hash, int format, boolean re
         }
         this.format = format;
         this.restricted = restricted;
+        this.permission = permission;
     }
 
     /**