From eb15df7b3805ad69c18c21a1de75ca26de005ece Mon Sep 17 00:00:00 2001 From: Thorinwasher Date: Sun, 18 Feb 2024 19:49:46 +0100 Subject: [PATCH] Fix a bug with inter server networks not working Is should not have inverted a boolean :( --- .../sgrewritten/stargate/thread/task/StargateGlobalTask.java | 2 +- .../stargate/thread/task/StargateGlobalTaskTest.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/sgrewritten/stargate/thread/task/StargateGlobalTask.java b/src/main/java/org/sgrewritten/stargate/thread/task/StargateGlobalTask.java index c3f947f7..f6fceabe 100644 --- a/src/main/java/org/sgrewritten/stargate/thread/task/StargateGlobalTask.java +++ b/src/main/java/org/sgrewritten/stargate/thread/task/StargateGlobalTask.java @@ -13,7 +13,7 @@ public StargateGlobalTask(Runnable runnable){ public void run(boolean bungee) { // if no players are online, then no bungee messages can be sent (wait 10 second until a player joins) - if(bungee && !Bukkit.getServer().getOnlinePlayers().isEmpty()){ + if(bungee && Bukkit.getServer().getOnlinePlayers().isEmpty()){ runDelayed(200, () -> run(true)); return; } diff --git a/src/test/java/org/sgrewritten/stargate/thread/task/StargateGlobalTaskTest.java b/src/test/java/org/sgrewritten/stargate/thread/task/StargateGlobalTaskTest.java index 009e9498..d75fbf05 100644 --- a/src/test/java/org/sgrewritten/stargate/thread/task/StargateGlobalTaskTest.java +++ b/src/test/java/org/sgrewritten/stargate/thread/task/StargateGlobalTaskTest.java @@ -38,10 +38,11 @@ void run_bungee_noDuplicates() { StargateGlobalTask task = new StargateGlobalTask(runnable); task.run(true); serverMock.getScheduler().performTicks(1000); + Assertions.assertFalse(runnable.hasRunBefore); + // Necessary to add a player here to avoid recursion loop serverMock.addPlayer(); - serverMock.getScheduler().performTicks(201); + MockBukkit.unmock(); Assertions.assertTrue(runnable.hasRunBefore); - StargateTask.forceRunAllTasks(); } @Test