Fix on join and source queue triggers

AlexProgrammerDE · Nov 13, 2022 · 48764be · 48764be
1 parent 1cf8f6c
commit 48764be
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/shared/src/main/java/net/pistonmaster/pistonqueue/shared/QueueListenerShared.java b/shared/src/main/java/net/pistonmaster/pistonqueue/shared/QueueListenerShared.java
@@ -81,7 +81,11 @@ protected void onKick(PQKickedFromServerEvent event) {
     protected void onPreConnect(PQServerPreConnectEvent event) {
         PlayerWrapper player = event.getPlayer();
 
-        if (player.getCurrentServer().isPresent() && (!Config.ENABLE_SOURCE_SERVER || !isSourceToTarget(event))) {
+        if (Config.ENABLE_SOURCE_SERVER && !isSourceToTarget(event)) {
+            return;
+        }
+
+        if (!Config.ENABLE_SOURCE_SERVER && player.getCurrentServer().isPresent()) {
             return;
         }