From 8c528a86a8545982fbe4eb60a871f399da0628b1 Mon Sep 17 00:00:00 2001
From: ajgeiss0702 <ajgeiss72@gmail.com>
Date: Sat, 7 Aug 2021 13:50:25 -0700
Subject: [PATCH] Workaround for ultraperms api returning null

---
 .../queue/logic/permissions/PermissionGetter.java    |  4 ++--
 .../hooks/{BuiltIn.java => BuiltInHook.java}         |  4 ++--
 .../permissions/hooks/UltraPermissionsHook.java      | 12 +++++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)
 rename premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/{BuiltIn.java => BuiltInHook.java} (88%)

diff --git a/premium/src/main/java/us/ajg0702/queue/logic/permissions/PermissionGetter.java b/premium/src/main/java/us/ajg0702/queue/logic/permissions/PermissionGetter.java
index 49dfb56..cd46361 100644
--- a/premium/src/main/java/us/ajg0702/queue/logic/permissions/PermissionGetter.java
+++ b/premium/src/main/java/us/ajg0702/queue/logic/permissions/PermissionGetter.java
@@ -2,7 +2,7 @@ package us.ajg0702.queue.logic.permissions;
 
 import us.ajg0702.queue.api.players.AdaptedPlayer;
 import us.ajg0702.queue.common.QueueMain;
-import us.ajg0702.queue.logic.permissions.hooks.BuiltIn;
+import us.ajg0702.queue.logic.permissions.hooks.BuiltInHook;
 import us.ajg0702.queue.logic.permissions.hooks.LuckPermsHook;
 import us.ajg0702.queue.logic.permissions.hooks.UltraPermissionsHook;
 
@@ -15,7 +15,7 @@ public class PermissionGetter {
     private final QueueMain main;
     public PermissionGetter(QueueMain main) {
         hooks = Arrays.asList(
-                new BuiltIn(main),
+                new BuiltInHook(main),
                 new LuckPermsHook(main),
                 new UltraPermissionsHook(main)
         );
diff --git a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/BuiltIn.java b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/BuiltInHook.java
similarity index 88%
rename from premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/BuiltIn.java
rename to premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/BuiltInHook.java
index 289d046..80ad546 100644
--- a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/BuiltIn.java
+++ b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/BuiltInHook.java
@@ -7,10 +7,10 @@ import us.ajg0702.queue.logic.permissions.PermissionHook;
 import java.util.ArrayList;
 import java.util.List;
 
-public class BuiltIn implements PermissionHook {
+public class BuiltInHook implements PermissionHook {
 
     private final QueueMain main;
-    public BuiltIn(QueueMain main) {
+    public BuiltInHook(QueueMain main) {
         this.main = main;
     }
 
diff --git a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/UltraPermissionsHook.java b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/UltraPermissionsHook.java
index 259bfa8..837dd7e 100644
--- a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/UltraPermissionsHook.java
+++ b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/UltraPermissionsHook.java
@@ -11,7 +11,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-@SuppressWarnings("SimplifyOptionalCallChains")
 public class UltraPermissionsHook implements PermissionHook {
 
     private final QueueMain main;
@@ -26,14 +25,21 @@ public class UltraPermissionsHook implements PermissionHook {
 
     @Override
     public boolean canUse() {
-        return main.getPlatformMethods().hasPlugin("UltraPermissions");
+        if(!main.getPlatformMethods().hasPlugin("UltraPermissions") ) return false;
+        if(UltraPermissions.getAPI() == null) {
+            main.getLogger().warn("UltraPermissions getApi() method returned null! Unable to hook into it.");
+            return false;
+        }
+        return true;
     }
 
     @Override
     public List<String> getPermissions(AdaptedPlayer player) {
         UltraPermissionsAPI ultraPermissionsAPI = UltraPermissions.getAPI();
 
-        Optional<User> userOptional =  ultraPermissionsAPI.getUsers().uuid(player.getUniqueId());
+        Optional<User> userOptional =  ultraPermissionsAPI
+                .getUsers()
+                .uuid(player.getUniqueId());
         if(!userOptional.isPresent()) return new ArrayList<>();
         User user = userOptional.get();