Fixed some array casting issues.

discord-jda · Nov 7, 2016 · 73a8613 · 73a8613
1 parent 1514aa3
commit 73a8613
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/main/java/net/dv8tion/jda/core/Permission.java b/src/main/java/net/dv8tion/jda/core/Permission.java
@@ -15,6 +15,8 @@
  */
 package net.dv8tion.jda.core;
 
+import org.apache.http.util.Args;
+
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -171,6 +173,8 @@ public static long getRaw(Permission... permissions)
 
     public static long getRaw(Collection<Permission> permissions)
     {
+        Args.notNull(permissions, "Permission Collection");
+
         return getRaw(permissions.toArray(new Permission[permissions.size()]));
     }
 }
diff --git a/src/main/java/net/dv8tion/jda/core/entities/impl/MemberImpl.java b/src/main/java/net/dv8tion/jda/core/entities/impl/MemberImpl.java
@@ -21,6 +21,7 @@
 import net.dv8tion.jda.core.Permission;
 import net.dv8tion.jda.core.entities.*;
 import net.dv8tion.jda.core.utils.PermissionUtil;
+import org.apache.http.util.Args;
 
 import java.awt.*;
 import java.time.OffsetDateTime;
@@ -145,7 +146,9 @@ public boolean hasPermission(Permission... permissions)
     @Override
     public boolean hasPermission(Collection<Permission> permissions)
     {
-        return hasPermission((Permission[]) permissions.toArray());
+        Args.notNull(permissions, "Permission Collection");
+
+        return hasPermission(permissions.toArray(new Permission[permissions.size()]));
     }
 
     @Override
@@ -157,7 +160,9 @@ public boolean hasPermission(Channel channel, Permission... permissions)
     @Override
     public boolean hasPermission(Channel channel, Collection<Permission> permissions)
     {
-        return hasPermission(channel, (Permission[]) permissions.toArray());
+        Args.notNull(permissions, "Permission Collection");
+
+        return hasPermission(channel, permissions.toArray(new Permission[permissions.size()]));
     }
 
     public MemberImpl setNickname(String nickname)

diff --git a/src/main/java/net/dv8tion/jda/core/entities/impl/RoleImpl.java b/src/main/java/net/dv8tion/jda/core/entities/impl/RoleImpl.java
@@ -29,6 +29,7 @@
 import net.dv8tion.jda.core.requests.RestAction;
 import net.dv8tion.jda.core.requests.Route;
 import net.dv8tion.jda.core.utils.PermissionUtil;
+import org.apache.http.util.Args;
 
 import java.awt.*;
 import java.time.OffsetDateTime;
@@ -145,19 +146,24 @@ public boolean hasPermission(Permission... permissions)
     @Override
     public boolean hasPermission(Collection<Permission> permissions)
     {
-        return hasPermission((Permission[]) permissions.toArray());
+        Args.notNull(permissions, "Permission Collection");
+
+        return hasPermission(permissions.toArray(new Permission[permissions.size()]));
     }
 
+    //TODO: Implement this >.>
     @Override
-    public boolean hasPermission(Channel chanel, Permission... permissions)
+    public boolean hasPermission(Channel channel, Permission... permissions)
     {
         return false;
     }
 
     @Override
     public boolean hasPermission(Channel channel, Collection<Permission> permissions)
     {
-        return hasPermission(channel, (Permission[]) permissions.toArray());
+        Args.notNull(permissions, "Permission Collection");
+
+        return hasPermission(channel, permissions.toArray(new Permission[permissions.size()]));
     }
 
     @Override