star/KSpigot
1
0
Fork 0
Code Pull Requests Packages Activity

Fixed safe runnable problem

Browse Source
This commit is contained in:
bluefireoly
2020-09-14 17:31:44 +02:00
parent 94244ea9e6
commit ebe2185607
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/kotlin/net/axay/kspigot/runnables/KSpigotRunnables.kt
View File

@@ -7,16 +7,25 @@ import org.bukkit.scheduler.BukkitRunnable
class KRunnableHolder { class KRunnableHolder {
private val runnableEndCallbacks = HashMap<BukkitRunnable, () -> Unit>() /**
* [BukkitRunnable] for tracking the responsible runnable.
* [Pair] of callback for the endCallback code and [Boolean]
* for holding the information if the endCallback is safe
* or not.
*/
private val runnableEndCallbacks = HashMap<BukkitRunnable, Pair<() -> Unit, Boolean>>()
fun shutdown() { fun shutdown() {
runnableEndCallbacks.values.forEach { it.invoke() } runnableEndCallbacks.values.forEach { if (it.second) it.first.invoke() }
runnableEndCallbacks.clear() runnableEndCallbacks.clear()
} }
fun add(runnable: BukkitRunnable, callback: () -> Unit) { runnableEndCallbacks[runnable] = callback } fun add(runnable: BukkitRunnable, callback: () -> Unit, safe: Boolean)
fun remove(runnable: BukkitRunnable) = runnableEndCallbacks.remove(runnable) = runnableEndCallbacks.put(runnable, Pair(callback, safe))
fun activate(runnable: BukkitRunnable) = runnableEndCallbacks.remove(runnable)?.invoke() fun remove(runnable: BukkitRunnable)
= runnableEndCallbacks.remove(runnable)
fun activate(runnable: BukkitRunnable)
= runnableEndCallbacks.remove(runnable)?.first?.invoke()
} }
@@ -85,7 +94,7 @@ fun KSpigot.task(
} }
if (endCallback != null) kRunnableHolder.add(bukkitRunnable, endCallback) if (endCallback != null) kRunnableHolder.add(bukkitRunnable, endCallback, safe)
if (sync) if (sync)
bukkitRunnable.runTaskTimer(this, delay, period ?: 20) bukkitRunnable.runTaskTimer(this, delay, period ?: 20)