diff --git a/src/main/kotlin/net/axay/kspigot/runnables/ChainableRunnables.kt b/src/main/kotlin/net/axay/kspigot/runnables/ChainableRunnables.kt index 28d7c163..4c6ff4a8 100644 --- a/src/main/kotlin/net/axay/kspigot/runnables/ChainableRunnables.kt +++ b/src/main/kotlin/net/axay/kspigot/runnables/ChainableRunnables.kt @@ -43,7 +43,7 @@ abstract class ChainedRunnablePart( ) protected fun start(data: T) { - bukkitRun(sync) { + taskRun(sync) { val result = invoke(data) next?.start(result) } @@ -55,7 +55,7 @@ abstract class ChainedRunnablePart( exceptionSync: Boolean, exceptionHandler: ((E) -> Unit)?, ) { - bukkitRun(sync) { + taskRun(sync) { val result = try { invoke(data) } catch (e: Exception) { @@ -64,11 +64,11 @@ abstract class ChainedRunnablePart( if (sync == exceptionSync) { exceptionHandler?.invoke(e as E) } else if (exceptionHandler != null) { - bukkitRun(exceptionSync) { + taskRun(exceptionSync) { exceptionHandler.invoke(e as E) } } - return@bukkitRun + return@taskRun } else throw e } next?.startCatching(result, exceptionClass, exceptionSync, exceptionHandler) diff --git a/src/main/kotlin/net/axay/kspigot/runnables/KSpigotRunnables.kt b/src/main/kotlin/net/axay/kspigot/runnables/KSpigotRunnables.kt index 005e3a97..ddd87bd0 100644 --- a/src/main/kotlin/net/axay/kspigot/runnables/KSpigotRunnables.kt +++ b/src/main/kotlin/net/axay/kspigot/runnables/KSpigotRunnables.kt @@ -109,7 +109,7 @@ fun task( * Executes the given [runnable] with the given [delay]. * Either sync or async (specified by the [sync] parameter). */ -fun bukkitRunLater(delay: Long, sync: Boolean = true, runnable: () -> Unit) { +fun taskRunLater(delay: Long, sync: Boolean = true, runnable: () -> Unit) { if (sync) Bukkit.getScheduler().runTaskLater(KSpigotMainInstance, runnable, delay) else @@ -120,7 +120,7 @@ fun bukkitRunLater(delay: Long, sync: Boolean = true, runnable: () -> Unit) { * Executes the given [runnable] either * sync or async (specified by the [sync] parameter). */ -fun bukkitRun(sync: Boolean = true, runnable: () -> Unit) { +fun taskRun(sync: Boolean = true, runnable: () -> Unit) { if (sync) { sync(runnable) } else {