diff --git a/src/main/kotlin/net/axay/kspigot/game/GamePhases.kt b/src/main/kotlin/net/axay/kspigot/game/GamePhases.kt index 273ba316..26067de7 100644 --- a/src/main/kotlin/net/axay/kspigot/game/GamePhases.kt +++ b/src/main/kotlin/net/axay/kspigot/game/GamePhases.kt @@ -52,7 +52,7 @@ class GamePhase( ) { if (counterMessage != null) { - val currentCounter = it.counterDown + val currentCounter = it.counterDownToOne if (currentCounter?.isCounterValue == true) broadcast(counterMessage.invoke(currentCounter)) } diff --git a/src/main/kotlin/net/axay/kspigot/runnables/KSpigotRunnables.kt b/src/main/kotlin/net/axay/kspigot/runnables/KSpigotRunnables.kt index 80518fad..8acf40ae 100644 --- a/src/main/kotlin/net/axay/kspigot/runnables/KSpigotRunnables.kt +++ b/src/main/kotlin/net/axay/kspigot/runnables/KSpigotRunnables.kt @@ -22,7 +22,8 @@ class KRunnableHolder { abstract class KSpigotRunnable( var counterUp: Long? = null, - var counterDown: Long? = null + var counterDownToOne: Long? = null, + var counterDownToZero: Long? = null, ) : BukkitRunnable() /** @@ -58,7 +59,8 @@ fun KSpigot.task( var ranOut = false if (howOften != null) { - counterDown = howOften - curCounter + counterDownToOne = howOften - curCounter + counterDownToZero = counterDownToOne?.minus(1) curCounter++ if (curCounter >= howOften)