Merge pull request #86 from seeseemelk/bugfix/zero-delay-timer

Fix zero delay timers not being run
MockBukkit · Jun 30, 2020 · c90cede · c90cede
2 parents 5c06c12 + 7b52212
commit c90cede
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/be/seeseemelk/mockbukkit/scheduler/BukkitSchedulerMock.java b/src/main/java/be/seeseemelk/mockbukkit/scheduler/BukkitSchedulerMock.java
@@ -143,6 +143,7 @@ public BukkitTask runTask(Plugin plugin, BukkitRunnable task)
 	@Override
 	public BukkitTask runTaskLater(Plugin plugin, Runnable task, long delay)
 	{
+		delay = Math.max(delay, 1);
 		ScheduledTask scheduledTask = new ScheduledTask(id++, plugin, true, currentTick + delay, task);
 		tasks.add(scheduledTask);
 		return scheduledTask;
@@ -151,6 +152,7 @@ public BukkitTask runTaskLater(Plugin plugin, Runnable task, long delay)
 	@Override
 	public BukkitTask runTaskTimer(Plugin plugin, Runnable task, long delay, long period)
 	{
+		delay = Math.max(delay, 1);
 		RepeatingTask repeatingTask = new RepeatingTask(id++, plugin, true, currentTick + delay, period, task);
 		tasks.add(repeatingTask);
 		return repeatingTask;

diff --git a/src/test/java/be/seeseemelk/mockbukkit/scheduler/BukkitSchedulerMockTest.java b/src/test/java/be/seeseemelk/mockbukkit/scheduler/BukkitSchedulerMockTest.java
@@ -100,6 +100,17 @@ public void runTaskTimer_SelfCancelling()
 		assertEquals(2, count.get());
 	}
 
+	@Test
+	public void runTaskTimer_ZeroDelay_DoesntExecuteTaskImmediately()
+	{
+		AtomicInteger count = new AtomicInteger(0);
+		Runnable callback = () -> count.incrementAndGet();
+		scheduler.runTaskTimer(null, callback, 0, 2L);
+		assertEquals(0, count.get());
+		scheduler.performTicks(1L);
+		assertEquals(1, count.get());
+	}
+
 	@Test
 	public void runTaskAsynchronously_TaskExecutedOnSeperateThread() throws InterruptedException, BrokenBarrierException, TimeoutException
 	{