Pass all tests

stargate-rewritten · Feb 21, 2024 · dfec2e1 · dfec2e1
1 parent 69426c7
commit dfec2e1
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 19 deletions.
diff --git a/src/main/java/org/sgrewritten/stargate/thread/task/StargateAsyncTask.java b/src/main/java/org/sgrewritten/stargate/thread/task/StargateAsyncTask.java
@@ -33,7 +33,7 @@ public void runDelayed(long delay) {
 
     @Override
     public void runTaskTimer(long period, long delay) {
-        super.setRepeatable();
+        super.setRepeatable(true);
         if (USING_FOLIA) {
             super.registerFoliaTask(Bukkit.getServer().getAsyncScheduler().runAtFixedRate(plugin, super::runTask, delay, period, TimeUnit.MILLISECONDS));
         } else {

diff --git a/src/main/java/org/sgrewritten/stargate/thread/task/StargateEntityTask.java b/src/main/java/org/sgrewritten/stargate/thread/task/StargateEntityTask.java
@@ -33,7 +33,7 @@ public void runDelayed(long delay) {
 
     @Override
     public void runTaskTimer(long period, long delay) {
-        super.setRepeatable();
+        super.setRepeatable(true);
         if (USING_FOLIA) {
             entity.getScheduler().runAtFixedRate(plugin, super::runTask, null, delay, period);
         } else {

diff --git a/src/main/java/org/sgrewritten/stargate/thread/task/StargateGlobalTask.java b/src/main/java/org/sgrewritten/stargate/thread/task/StargateGlobalTask.java
@@ -28,11 +28,11 @@ public void runDelayed(long delay) {
 
     @Override
     public void runNow() {
+        super.setRepeatable(false);
         if (bungee && !BungeeHelper.canSendBungeeMessages()) {
             runTaskTimer(20, 20, () -> {
                 if (BungeeHelper.canSendBungeeMessages()) {
                     this.runNow();
-                    this.cancel();
                 }
             });
             return;
@@ -45,11 +45,11 @@ public void runNow() {
     }
 
     public void runTaskTimer(long period, long delay, Runnable runnable) {
-        super.setRepeatable();
+        super.setRepeatable(true);
         if (USING_FOLIA) {
             super.registerFoliaTask(Bukkit.getServer().getGlobalRegionScheduler().runAtFixedRate(plugin, ignored -> runnable.run(), delay, period));
         } else {
-            super.registerBukkitTask(new StargateBukkitRunnable(this::runTask)).runTaskTimer(plugin, delay, period);
+            super.registerBukkitTask(new StargateBukkitRunnable(runnable)).runTaskTimer(plugin, delay, period);
         }
     }
 

diff --git a/src/main/java/org/sgrewritten/stargate/thread/task/StargateQueuedAsyncTask.java b/src/main/java/org/sgrewritten/stargate/thread/task/StargateQueuedAsyncTask.java
@@ -36,7 +36,7 @@ public void runNow() {
 
     @Override
     public void runTaskTimer(long period, long delay) {
-        super.setRepeatable();
+        super.setRepeatable(true);
         StargateQueuedAsyncTask task = this;
         new StargateAsyncTask() {
             @Override

diff --git a/src/main/java/org/sgrewritten/stargate/thread/task/StargateRegionTask.java b/src/main/java/org/sgrewritten/stargate/thread/task/StargateRegionTask.java
@@ -47,7 +47,7 @@ public void runDelayed(long delay) {
 
     @Override
     public void runTaskTimer(long period, long delay) {
-        super.setRepeatable();
+        super.setRepeatable(true);
         if (USING_FOLIA) {
             ScheduledTask theTask = Bukkit.getServer().getRegionScheduler().runAtFixedRate(plugin, location, super::runTask, delay, period);
             super.registerFoliaTask(theTask);

diff --git a/src/main/java/org/sgrewritten/stargate/thread/task/StargateTask.java b/src/main/java/org/sgrewritten/stargate/thread/task/StargateTask.java
@@ -9,7 +9,7 @@
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-public abstract class StargateTask implements Runnable{
+public abstract class StargateTask implements Runnable {
     protected static final boolean USING_FOLIA = NonLegacyClass.REGIONIZED_SERVER.isImplemented();
     private static final int MAXIMUM_SHUTDOWN_CYCLES = 10;
     private boolean taskIsRegistered = false;
@@ -33,7 +33,7 @@ public void cancel() {
     }
 
     protected void registerTask() {
-        if(taskIsRegistered){
+        if (taskIsRegistered) {
             return;
         }
         taskIsRegistered = true;
@@ -51,9 +51,7 @@ protected void registerFoliaTask(ScheduledTask scheduledTask) {
 
     protected BukkitRunnable registerBukkitTask(BukkitRunnable scheduledBukkitTask) {
         this.scheduledBukkitTask = scheduledBukkitTask;
-        if (cancelled) {
-            cancelIfTaskHasBeenScheduled(true);
-        } else {
+        if (!cancelled) {
             registerTask();
         }
         return scheduledBukkitTask;
@@ -91,7 +89,11 @@ public static void forceRunAllTasks() {
      * Run the task if not already been running (should be threadsafe)
      */
     protected void runTask() {
-        if ((running && ! repeatable)|| cancelled) {
+        if (cancelled) {
+            cancelIfTaskHasBeenScheduled(true);
+            return;
+        }
+        if (running && !repeatable) {
             return;
         }
         running = true;
@@ -111,7 +113,7 @@ protected void runTask(ScheduledTask scheduledTask) {
         this.runTask();
     }
 
-    protected void setRepeatable(){
-        this.repeatable = true;
+    protected void setRepeatable(boolean repeatable) {
+        this.repeatable = repeatable;
     }
 }
diff --git a/src/main/java/org/sgrewritten/stargate/util/BungeeHelper.java b/src/main/java/org/sgrewritten/stargate/util/BungeeHelper.java
@@ -145,6 +145,6 @@ public static String generateLegacyTeleportMessage(String player, Portal portal)
 
 
     public static boolean canSendBungeeMessages() {
-        return (Bukkit.getServer().getOnlinePlayers().isEmpty() || !Stargate.knowsServerName());
+        return (!Bukkit.getServer().getOnlinePlayers().isEmpty() && Stargate.knowsServerName());
     }
 }
diff --git a/src/test/java/org/sgrewritten/stargate/thread/task/StargateGlobalTaskTest.java b/src/test/java/org/sgrewritten/stargate/thread/task/StargateGlobalTaskTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.sgrewritten.stargate.Stargate;
 
 class StargateGlobalTaskTest {
 
@@ -33,12 +34,13 @@ void run_noDuplicates() {
     @Test
     void run_bungee_noDuplicates() {
         TestRunnable runnable = new TestRunnable(true, true);
-        runnable.run();
-        serverMock.getScheduler().performTicks(1000);
+        runnable.runNow();
+        serverMock.getScheduler().performTicks(30);
         Assertions.assertFalse(runnable.hasRunBefore);
         // Necessary to add a player here to avoid recursion loop
         serverMock.addPlayer();
-        MockBukkit.unmock();
+        Stargate.setKnowsServerName(true);
+        serverMock.getScheduler().performTicks(30);
         Assertions.assertTrue(runnable.hasRunBefore);
     }