Merge branch 'dev' into 'master'

2.0.1

See merge request ajg0702/ajqueue!19

.gitlab-ci.yml

@@ -34,7 +34,7 @@ test:
   dependencies:
     - build
   script:
-    - gradle test
+    - gradle :free:test
 
 deploy to maven repo:
   stage: deploy
@@ -44,6 +44,7 @@ deploy to maven repo:
     - build
   script:
     - gradle :api:publish --stacktrace
+    - gradle :common:publish
 
 upload to updater:
   stage: deploy

build.gradle.kts

@@ -11,7 +11,7 @@ repositories {
 }
 
 allprojects {
-    version = "2.0.0"
+    version = "2.0.1"
     group = "us.ajg0702"
 
     tasks.withType<Test>().configureEach {

common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java

@@ -54,7 +54,12 @@ public class EventHandlerImpl implements EventHandler {
                 }
             }
             if(subchannel.equals("queuename")) {
-                main.getPlatformMethods().sendPluginMessage(recievingPlayer, "queuename", main.getQueueManager().getQueuedName(recievingPlayer));
+                QueueServer server = main.getQueueManager().getSingleServer(recievingPlayer);
+                String name = main.getMessages().getString("placeholders.position.none");
+                if(server != null) {
+                    name = server.getAlias();
+                }
+                main.getPlatformMethods().sendPluginMessage(recievingPlayer, "queuename", name);
             }
             if(subchannel.equals("position")) {
                 QueueServer server = main.getQueueManager().getSingleServer(recievingPlayer);

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)
         );

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;
     }
 

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();