From 02f23b8990f18579447ff6cece0ddb3cb821609d Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Thu, 24 Mar 2022 09:19:36 -0700 Subject: [PATCH 1/5] update ajUtils --- api/build.gradle.kts | 2 +- common/build.gradle.kts | 2 +- free/build.gradle.kts | 2 +- platforms/bungeecord/build.gradle.kts | 2 +- platforms/velocity/build.gradle.kts | 2 +- premium/build.gradle.kts | 2 +- spigot/build.gradle.kts | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 8e788e4..a6ce712 100644 --- a/api/build.gradle.kts +++ b/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 { diff --git a/common/build.gradle.kts b/common/build.gradle.kts index f7391ea..4cfdce4 100644 --- a/common/build.gradle.kts +++ b/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") diff --git a/free/build.gradle.kts b/free/build.gradle.kts index ed42785..2cb06f7 100644 --- a/free/build.gradle.kts +++ b/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")) diff --git a/platforms/bungeecord/build.gradle.kts b/platforms/bungeecord/build.gradle.kts index 83df0e3..3827d38 100644 --- a/platforms/bungeecord/build.gradle.kts +++ b/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") diff --git a/platforms/velocity/build.gradle.kts b/platforms/velocity/build.gradle.kts index daeae7b..9909cca 100644 --- a/platforms/velocity/build.gradle.kts +++ b/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") diff --git a/premium/build.gradle.kts b/premium/build.gradle.kts index 203b280..2019d31 100644 --- a/premium/build.gradle.kts +++ b/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") diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts index 3e3c779..e5916bd 100644 --- a/spigot/build.gradle.kts +++ b/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") From 44e996ba6f99d5d5c60e0186bf1d366bf44833fc Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Fri, 15 Apr 2022 08:22:41 -0700 Subject: [PATCH 2/5] add warning if luckperms user is null --- .../queue/logic/permissions/hooks/LuckPermsHook.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java index ed7401b..d062a20 100644 --- a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java +++ b/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 nodes = user.resolveDistinctInheritedNodes(QueryOptions.nonContextual()); List perms = new ArrayList<>(); From e0fbe81edaadc1782936c3259f7667414288e1b2 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Fri, 15 Apr 2022 08:23:01 -0700 Subject: [PATCH 3/5] space --- .../us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java index d062a20..794465f 100644 --- a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java +++ b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java @@ -38,7 +38,7 @@ public class LuckPermsHook implements PermissionHook { User user = api.getUserManager().getUser(player.getUniqueId()); if(user == null) { - main.getLogger().warn("LuckPerms doesnt seem to have data loaded for "+player.getName()+"!" + + 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(); } From 0c4911eb60a7ff929856eba66074fbfae10243b2 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Thu, 21 Apr 2022 11:16:01 -0700 Subject: [PATCH 4/5] make bungee events non-blocking --- .../platforms/bungeecord/BungeeQueue.java | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java b/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java index e548178..40f1a79 100644 --- a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java +++ b/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 From 886da8daa19eb45da9c56ddd6a5f639b1be7d437 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Sat, 23 Apr 2022 13:00:00 -0700 Subject: [PATCH 5/5] 2.2.7 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0191954..8bfd7ba 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ repositories { } allprojects { - version = "2.2.6" + version = "2.2.7" group = "us.ajg0702" plugins.apply("java")