Merge pull request #5 from ajgeiss0702/dev

2.2.7

api/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
     implementation("net.kyori:adventure-text-serializer-plain:4.9.3")
     compileOnly("com.google.guava:guava:30.1.1-jre")
 
-    compileOnly("us.ajg0702:ajUtils:1.1.20")
+    compileOnly("us.ajg0702:ajUtils:1.1.22")
 }
 
 publishing {

build.gradle.kts

@@ -12,7 +12,7 @@ repositories {
 }
 
 allprojects {
-    version = "2.2.6"
+    version = "2.2.7"
     group = "us.ajg0702"
 
     plugins.apply("java")

common/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
     compileOnly("net.kyori:adventure-text-serializer-plain:4.9.3")
 
     compileOnly("com.google.guava:guava:30.1.1-jre")
-    compileOnly("us.ajg0702:ajUtils:1.1.20")
+    compileOnly("us.ajg0702:ajUtils:1.1.22")
 
     compileOnly("org.slf4j:slf4j-log4j12:1.7.29")
 

free/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
     compileOnly("com.google.guava:guava:30.1.1-jre")
     compileOnly("org.spongepowered:configurate-yaml:4.0.0")
 
-    implementation("us.ajg0702:ajUtils:1.1.20")
+    implementation("us.ajg0702:ajUtils:1.1.22")
 
     implementation(project(":platforms:velocity"))
     implementation(project(":platforms:bungeecord"))

platforms/bungeecord/build.gradle.kts

@@ -16,7 +16,7 @@ repositories {
 dependencies {
     compileOnly("net.kyori:adventure-api:4.9.3")
     compileOnly("com.google.guava:guava:30.1.1-jre")
-    compileOnly("us.ajg0702:ajUtils:1.1.20")
+    compileOnly("us.ajg0702:ajUtils:1.1.22")
 
     compileOnly("net.md-5:bungeecord-api:1.16-R0.4")
 

platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java

@@ -124,25 +124,32 @@ public class BungeeQueue extends Plugin implements Listener, Implementation {
 
     @EventHandler
     public void onServerSwitch(ServerSwitchEvent e) {
-        main.getEventHandler().onPlayerJoinServer(new BungeePlayer(e.getPlayer()));
+        ProxyServer.getInstance().getScheduler().runAsync(this, () ->
+                main.getEventHandler().onPlayerJoinServer(new BungeePlayer(e.getPlayer()))
+        );
+
     }
 
     @EventHandler
     public void onLeave(PlayerDisconnectEvent e) {
-        main.getEventHandler().onPlayerLeave(new BungeePlayer(e.getPlayer()));
+        ProxyServer.getInstance().getScheduler().runAsync(this, () ->
+            main.getEventHandler().onPlayerLeave(new BungeePlayer(e.getPlayer()))
+        );
     }
 
     @EventHandler
     public void onKick(ServerKickEvent e) {
         if(!e.getPlayer().isConnected()) return;
         if(e.getPlayer().getServer() == null) return; // if the player is kicked on initial join, we dont care
-        Component reason = BungeeComponentSerializer.get().deserialize(e.getKickReasonComponent());
-        main.getEventHandler().onServerKick(
-                new BungeePlayer(e.getPlayer()),
-                new BungeeServer(e.getKickedFrom()),
-                reason,
-                false
-        );
+        ProxyServer.getInstance().getScheduler().runAsync(this, () -> {
+            Component reason = BungeeComponentSerializer.get().deserialize(e.getKickReasonComponent());
+            main.getEventHandler().onServerKick(
+                    new BungeePlayer(e.getPlayer()),
+                    new BungeeServer(e.getKickedFrom()),
+                    reason,
+                    false
+            );
+        });
     }
 
     @Override

platforms/velocity/build.gradle.kts

@@ -16,7 +16,7 @@ repositories {
 dependencies {
     compileOnly("net.kyori:adventure-api:4.9.3")
     compileOnly("com.google.guava:guava:30.1.1-jre")
-    compileOnly("us.ajg0702:ajUtils:1.1.20")
+    compileOnly("us.ajg0702:ajUtils:1.1.22")
 
     compileOnly("com.velocitypowered:velocity-api:3.0.0")
     annotationProcessor("com.velocitypowered:velocity-api:3.0.0")

premium/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
 
     compileOnly("me.TechsCode:FakeUltraPerms:1.0.2")
 
-    compileOnly("us.ajg0702:ajUtils:1.1.20")
+    compileOnly("us.ajg0702:ajUtils:1.1.22")
 
     compileOnly("net.kyori:adventure-api:4.9.3")
 

premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java

@@ -37,7 +37,12 @@ public class LuckPermsHook implements PermissionHook {
 
         User user = api.getUserManager().getUser(player.getUniqueId());
 
-        assert user != null;
+        if(user == null) {
+            main.getLogger().warn("LuckPerms doesnt seem to have data loaded for "+player.getName()+"! " +
+                    "Because of this I can't load priority permissions. Acting like "+player.getName()+" doesnt have any.");
+            return Collections.emptyList();
+        }
+
         SortedSet<Node> nodes = user.resolveDistinctInheritedNodes(QueryOptions.nonContextual());
 
         List<String> perms = new ArrayList<>();

spigot/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
 
     compileOnly("org.spongepowered:configurate-yaml:4.0.0")
 
-    compileOnly("us.ajg0702:ajUtils:1.1.20")
+    compileOnly("us.ajg0702:ajUtils:1.1.22")
 
     compileOnly(group = "org.spigotmc", name = "spigot", version = "1.16.5-R0.1-SNAPSHOT")
     compileOnly("me.clip:placeholderapi:2.10.4")