Updated to K2 Compiler

WillFP · WillFP · commit 8b7b0f7d69dd · 2025-01-20T15:19:03.000Z
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
@@ -6,22 +7,22 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")
     }
 }
 
 plugins {
     java
     id("java-library")
-    id("io.github.goooler.shadow") version "8.1.7"
+    id("com.gradleup.shadow") version "8.3.5"
     id("maven-publish")
 }
 
 allprojects {
     apply(plugin = "kotlin")
     apply(plugin = "java")
     apply(plugin = "maven-publish")
-    apply(plugin = "io.github.goooler.shadow")
+    apply(plugin = "com.gradleup.shadow")
 
     repositories {
         mavenLocal() // TODO: REMOVE
@@ -37,7 +38,7 @@ allprojects {
 
     dependencies {
         compileOnly("org.jetbrains:annotations:23.0.0")
-        compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.20")
+        compileOnly(kotlin("stdlib", version = "2.1.0"))
 
         compileOnly(fileTree("lib") { include("*.jar") })
     }
@@ -68,8 +69,8 @@ allprojects {
         }
 
         withType<KotlinCompile> {
-            kotlinOptions {
-                jvmTarget = "17"
+            compilerOptions {
+                jvmTarget.set(JvmTarget.JVM_17)
             }
         }
 
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/counters/bind/BoundCounters.kt b/core/common/src/main/kotlin/com/willfp/libreforge/counters/bind/BoundCounters.kt
@@ -3,12 +3,13 @@ package com.willfp.libreforge.counters.bind
 import com.willfp.eco.core.map.listMap
 import com.willfp.libreforge.counters.Accumulator
 import com.willfp.libreforge.counters.Counter
+import net.kyori.adventure.chat.ChatType.Bound
 
 internal object BoundCounters {
     private val bindings = listMap<Counter, BoundCounter>()
 
     fun bind(counter: Counter, accumulator: Accumulator) {
-        bindings[counter] += BoundCounter(counter, accumulator)
+        bindings[counter].add(BoundCounter(counter, accumulator))
     }
 
     fun unbind(counter: Counter) {
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/EffectContext.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/EffectContext.kt
@@ -9,6 +9,7 @@ import com.willfp.libreforge.mutators.MutatorList
  * EffectContext exists in order to abstract out some compile logic between
  * element compilation and rich chain compilation.
  */
+@ConsistentCopyVisibility
 data class EffectContext internal constructor(
     val arguments: EffectArgumentList,
     val conditions: ConditionList,
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectAddHolder.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectAddHolder.kt
@@ -42,12 +42,12 @@ object EffectAddHolder : Effect<HolderTemplate>("add_holder") {
         val duration = config.getIntFromExpression("duration", data).coerceAtLeast(1)
         val holder = compileData.toHolder().nest(data.holder)
 
-        holders[dispatcher.uuid] += holder
+        holders[dispatcher.uuid].add(holder)
 
         plugin.scheduler.runLater(duration.toLong()) {
-            holders[dispatcher.uuid] -= holder
+            holders[dispatcher.uuid].remove(holder)
             if (holders[dispatcher.uuid].isEmpty()) {
-                holders -= dispatcher.uuid
+                holders.remove(dispatcher.uuid)
             }
         }
 
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectAddHolderToVictim.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectAddHolderToVictim.kt
@@ -44,12 +44,12 @@ object EffectAddHolderToVictim : Effect<HolderTemplate>("add_holder_to_victim")
         val duration = config.getIntFromExpression("duration", data).coerceAtLeast(1)
         val holder = compileData.toHolder().nest(data.holder)
 
-        holders[player.uniqueId] += holder
+        holders[player.uniqueId].add(holder)
 
         plugin.scheduler.runLater(duration.toLong()) {
-            holders[player.uniqueId] -= holder
+            holders[player.uniqueId].remove(holder)
             if (holders[player.uniqueId].isEmpty()) {
-                holders -= player.uniqueId
+                holders.remove(player.uniqueId)
             }
         }
 
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectFeatherStep.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectFeatherStep.kt
@@ -23,11 +23,11 @@ object EffectFeatherStep : Effect<NoCompileData>("feather_step") {
         holder: ProvidedHolder,
         compileData: NoCompileData
     ) {
-        players[dispatcher.uuid] += identifiers.uuid
+        players[dispatcher.uuid].add(identifiers.uuid)
     }
 
     override fun onDisable(dispatcher: Dispatcher<*>, identifiers: Identifiers, holder: ProvidedHolder) {
-        players[dispatcher.uuid] -= identifiers.uuid
+        players[dispatcher.uuid].remove(identifiers.uuid)
     }
 
     @EventHandler(ignoreCancelled = true)
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectFlight.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectFlight.kt
@@ -25,14 +25,14 @@ object EffectFlight : Effect<NoCompileData>("flight") {
     ) {
         val player = dispatcher.get<Player>() ?: return
 
-        players[player.uniqueId] += identifiers.uuid
+        players[player.uniqueId].add(identifiers.uuid)
         player.allowFlight = players[player.uniqueId].isNotEmpty()
     }
 
     override fun onDisable(dispatcher: Dispatcher<*>, identifiers: Identifiers, holder: ProvidedHolder) {
         val player = dispatcher.get<Player>() ?: return
 
-        players[player.uniqueId] -= identifiers.uuid
+        players[player.uniqueId].remove(identifiers.uuid)
         player.allowFlight = players[player.uniqueId].isNotEmpty()
     }
 }
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectKeepInventory.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectKeepInventory.kt
@@ -21,11 +21,11 @@ object EffectKeepInventory : Effect<NoCompileData>("keep_inventory") {
         holder: ProvidedHolder,
         compileData: NoCompileData
     ) {
-        players[dispatcher.uuid] += identifiers.uuid
+        players[dispatcher.uuid].add(identifiers.uuid)
     }
 
     override fun onDisable(dispatcher: Dispatcher<*>, identifiers: Identifiers, holder: ProvidedHolder) {
-        players[dispatcher.uuid] -= identifiers.uuid
+        players[dispatcher.uuid].remove(identifiers.uuid)
     }
 
     @EventHandler(ignoreCancelled = true)
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectKeepLevel.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectKeepLevel.kt
@@ -21,11 +21,11 @@ object EffectKeepLevel : Effect<NoCompileData>("keep_level") {
         holder: ProvidedHolder,
         compileData: NoCompileData
     ) {
-        players[dispatcher.uuid] += identifiers.uuid
+        players[dispatcher.uuid].add(identifiers.uuid)
     }
 
     override fun onDisable(dispatcher: Dispatcher<*>, identifiers: Identifiers, holder: ProvidedHolder) {
-        players[dispatcher.uuid] -= identifiers.uuid
+        players[dispatcher.uuid].remove(identifiers.uuid)
     }
 
     @EventHandler(ignoreCancelled = true)
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectRapidBows.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectRapidBows.kt
@@ -37,9 +37,9 @@ object EffectRapidBows : Effect<NoCompileData>("rapid_bows") {
         holder: ProvidedHolder,
         compileData: NoCompileData
     ) {
-        modifiers[dispatcher.uuid] += IdentifiedModifier(identifiers.uuid) {
+        modifiers[dispatcher.uuid].add(IdentifiedModifier(identifiers.uuid) {
             config.getDoubleFromExpression("percent_faster", dispatcher.get())
-        }
+        })
     }
 
     override fun onDisable(dispatcher: Dispatcher<*>, identifiers: Identifiers, holder: ProvidedHolder) {
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectReplantCrops.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectReplantCrops.kt
@@ -36,11 +36,11 @@ object EffectReplantCrops : Effect<NoCompileData>("replant_crops") {
         holder: ProvidedHolder,
         compileData: NoCompileData
     ) {
-        players[dispatcher.uuid] += ReplantConfig(
+        players[dispatcher.uuid].add(ReplantConfig(
             identifiers.uuid,
             config.getBool("consume_seeds"),
             config.getBool("only_fully_grown")
-        )
+        ))
     }
 
     override fun onDisable(dispatcher: Dispatcher<*>, identifiers: Identifiers, holder: ProvidedHolder) {
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectTelekinesis.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectTelekinesis.kt
@@ -32,11 +32,11 @@ object EffectTelekinesis : Effect<NoCompileData>("telekinesis") {
         holder: ProvidedHolder,
         compileData: NoCompileData
     ) {
-        players[dispatcher.uuid] += identifiers.uuid
+        players[dispatcher.uuid].add(identifiers.uuid)
     }
 
     override fun onDisable(dispatcher: Dispatcher<*>, identifiers: Identifiers, holder: ProvidedHolder) {
-        players[dispatcher.uuid] -= identifiers.uuid
+        players[dispatcher.uuid].remove(identifiers.uuid)
     }
 
     override fun postRegister() {
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/bossbar/BossBars.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/bossbar/BossBars.kt
@@ -13,7 +13,7 @@ object BossBars {
             return
         }
 
-        registry[bossBar.id] += bossBar
+        registry[bossBar.id].add(bossBar)
         val player = Bukkit.getPlayer(bossBar.uuid) ?: return
         bossBar.bossBar.addViewer(player.asAudience())
     }
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/templates/ChanceMultiplierEffect.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/templates/ChanceMultiplierEffect.kt
@@ -29,9 +29,9 @@ abstract class ChanceMultiplierEffect(id: String) : Effect<NoCompileData>(id) {
         holder: ProvidedHolder,
         compileData: NoCompileData
     ) {
-        modifiers[dispatcher.uuid] += IdentifiedModifier(identifiers.uuid) {
+        modifiers[dispatcher.uuid].add(IdentifiedModifier(identifiers.uuid) {
             config.getDoubleFromExpression("chance", dispatcher.get<Player>()!!)
-        }
+        })
     }
 
     override fun onDisable(dispatcher: Dispatcher<*>, identifiers: Identifiers, holder: ProvidedHolder) {
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/templates/MultiMultiplierEffect.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/templates/MultiMultiplierEffect.kt
@@ -39,14 +39,14 @@ abstract class MultiMultiplierEffect<T : Any>(id: String) : Effect<NoCompileData
             val elements = config.getStrings(key).mapNotNull { getElement(it) }
 
             for (element in elements) {
-                modifiers[dispatcher.uuid][element] += IdentifiedModifier(identifiers.uuid) {
+                modifiers[dispatcher.uuid][element].add(IdentifiedModifier(identifiers.uuid) {
                     config.getDoubleFromExpression("multiplier", dispatcher.get())
-                }
+                })
             }
         } else {
-            globalModifiers[dispatcher.uuid] += IdentifiedModifier(identifiers.uuid) {
+            globalModifiers[dispatcher.uuid].add(IdentifiedModifier(identifiers.uuid) {
                 config.getDoubleFromExpression("multiplier", dispatcher.get())
-            }
+            })
         }
     }
 
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/effects/templates/MultiplierEffect.kt b/core/common/src/main/kotlin/com/willfp/libreforge/effects/templates/MultiplierEffect.kt
@@ -28,9 +28,9 @@ abstract class MultiplierEffect(id: String) : Effect<NoCompileData>(id) {
         holder: ProvidedHolder,
         compileData: NoCompileData
     ) {
-        modifiers[dispatcher.uuid] += IdentifiedModifier(identifiers.uuid) {
+        modifiers[dispatcher.uuid].add(IdentifiedModifier(identifiers.uuid) {
             config.getDoubleFromExpression("multiplier", dispatcher.get<Player>()!!)
-        }
+        })
     }
 
     override fun onDisable(dispatcher: Dispatcher<*>, identifiers: Identifiers, holder: ProvidedHolder) {
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/integrations/vault/impl/EffectGivePermission.kt b/core/common/src/main/kotlin/com/willfp/libreforge/integrations/vault/impl/EffectGivePermission.kt
@@ -38,7 +38,7 @@ class EffectGivePermission(
 
         val permission = config.getString("permission")
 
-        permissions[dispatcher.uuid] += GivenPermission(permission, identifiers.uuid)
+        permissions[dispatcher.uuid].add(GivenPermission(permission, identifiers.uuid))
         handler.playerAdd(player, permission)
     }
 
diff --git a/core/common/src/main/kotlin/com/willfp/libreforge/triggers/DispatchedTriggerFactory.kt b/core/common/src/main/kotlin/com/willfp/libreforge/triggers/DispatchedTriggerFactory.kt
@@ -37,7 +37,7 @@ class DispatchedTriggerFactory(
             return null
         }
 
-        dispatcherTriggers[dispatcher.uuid] += hash
+        dispatcherTriggers[dispatcher.uuid].add(hash)
         return DispatchedTrigger(dispatcher, trigger, data.copy(dispatcher = dispatcher))
     }
 
diff --git a/core/modern/build.gradle.kts b/core/modern/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 dependencies {
     compileOnly(project(":core:common"))
 
@@ -10,8 +12,8 @@ tasks {
     }
 
     compileKotlin {
-        kotlinOptions {
-            jvmTarget = "21"
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_21)
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
`1`	`2`	`import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`2`	`3`
`3`	`4`	`buildscript {`
`@@ -6,22 +7,22 @@ buildscript {`
`6`	`7`	`}`
`7`	`8`
`8`	`9`	`dependencies {`
`9`		`- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")`
	`10`	`+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")`
`10`	`11`	`}`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`plugins {`
`14`	`15`	`java`
`15`	`16`	`id("java-library")`
`16`		`- id("io.github.goooler.shadow") version "8.1.7"`
	`17`	`+ id("com.gradleup.shadow") version "8.3.5"`
`17`	`18`	`id("maven-publish")`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`allprojects {`
`21`	`22`	`apply(plugin = "kotlin")`
`22`	`23`	`apply(plugin = "java")`
`23`	`24`	`apply(plugin = "maven-publish")`
`24`		`- apply(plugin = "io.github.goooler.shadow")`
	`25`	`+ apply(plugin = "com.gradleup.shadow")`
`25`	`26`
`26`	`27`	`repositories {`
`27`	`28`	`mavenLocal() // TODO: REMOVE`
`@@ -37,7 +38,7 @@ allprojects {`
`37`	`38`
`38`	`39`	`dependencies {`
`39`	`40`	`compileOnly("org.jetbrains:annotations:23.0.0")`
`40`		`- compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.20")`
	`41`	`+ compileOnly(kotlin("stdlib", version = "2.1.0"))`
`41`	`42`
`42`	`43`	`compileOnly(fileTree("lib") { include("*.jar") })`
`43`	`44`	`}`
`@@ -68,8 +69,8 @@ allprojects {`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`withType<KotlinCompile> {`
`71`		`- kotlinOptions {`
`72`		`- jvmTarget = "17"`
	`72`	`+ compilerOptions {`
	`73`	`+ jvmTarget.set(JvmTarget.JVM_17)`
`73`	`74`	`}`
`74`	`75`	`}`
`75`	`76`
Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,12 @@ object EffectAddHolder : Effect<HolderTemplate>("add_holder") {`
`42`	`42`	`val duration = config.getIntFromExpression("duration", data).coerceAtLeast(1)`
`43`	`43`	`val holder = compileData.toHolder().nest(data.holder)`
`44`	`44`
`45`		`- holders[dispatcher.uuid] += holder`
	`45`	`+ holders[dispatcher.uuid].add(holder)`
`46`	`46`
`47`	`47`	`plugin.scheduler.runLater(duration.toLong()) {`
`48`		`- holders[dispatcher.uuid] -= holder`
	`48`	`+ holders[dispatcher.uuid].remove(holder)`
`49`	`49`	`if (holders[dispatcher.uuid].isEmpty()) {`
`50`		`- holders -= dispatcher.uuid`
	`50`	`+ holders.remove(dispatcher.uuid)`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,12 @@ object EffectAddHolderToVictim : Effect<HolderTemplate>("add_holder_to_victim")`
`44`	`44`	`val duration = config.getIntFromExpression("duration", data).coerceAtLeast(1)`
`45`	`45`	`val holder = compileData.toHolder().nest(data.holder)`
`46`	`46`
`47`		`- holders[player.uniqueId] += holder`
	`47`	`+ holders[player.uniqueId].add(holder)`
`48`	`48`
`49`	`49`	`plugin.scheduler.runLater(duration.toLong()) {`
`50`		`- holders[player.uniqueId] -= holder`
	`50`	`+ holders[player.uniqueId].remove(holder)`
`51`	`51`	`if (holders[player.uniqueId].isEmpty()) {`
`52`		`- holders -= player.uniqueId`
	`52`	`+ holders.remove(player.uniqueId)`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,11 @@ object EffectFeatherStep : Effect<NoCompileData>("feather_step") {`
`23`	`23`	`holder: ProvidedHolder,`
`24`	`24`	`compileData: NoCompileData`
`25`	`25`	`) {`
`26`		`- players[dispatcher.uuid] += identifiers.uuid`
	`26`	`+ players[dispatcher.uuid].add(identifiers.uuid)`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`override fun onDisable(dispatcher: Dispatcher<*>, identifiers: Identifiers, holder: ProvidedHolder) {`
`30`		`- players[dispatcher.uuid] -= identifiers.uuid`
	`30`	`+ players[dispatcher.uuid].remove(identifiers.uuid)`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@EventHandler(ignoreCancelled = true)`
Original file line number	Diff line number	Diff line change
`@@ -25,14 +25,14 @@ object EffectFlight : Effect<NoCompileData>("flight") {`
`25`	`25`	`) {`
`26`	`26`	`val player = dispatcher.get<Player>() ?: return`
`27`	`27`
`28`		`- players[player.uniqueId] += identifiers.uuid`
	`28`	`+ players[player.uniqueId].add(identifiers.uuid)`
`29`	`29`	`player.allowFlight = players[player.uniqueId].isNotEmpty()`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`override fun onDisable(dispatcher: Dispatcher<*>, identifiers: Identifiers, holder: ProvidedHolder) {`
`33`	`33`	`val player = dispatcher.get<Player>() ?: return`
`34`	`34`
`35`		`- players[player.uniqueId] -= identifiers.uuid`
	`35`	`+ players[player.uniqueId].remove(identifiers.uuid)`
`36`	`36`	`player.allowFlight = players[player.uniqueId].isNotEmpty()`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ object EffectKeepInventory : Effect<NoCompileData>("keep_inventory") {`
`21`	`21`	`holder: ProvidedHolder,`
`22`	`22`	`compileData: NoCompileData`
`23`	`23`	`) {`
`24`		`- players[dispatcher.uuid] += identifiers.uuid`
	`24`	`+ players[dispatcher.uuid].add(identifiers.uuid)`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`override fun onDisable(dispatcher: Dispatcher<*>, identifiers: Identifiers, holder: ProvidedHolder) {`
`28`		`- players[dispatcher.uuid] -= identifiers.uuid`
	`28`	`+ players[dispatcher.uuid].remove(identifiers.uuid)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@EventHandler(ignoreCancelled = true)`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ object EffectKeepLevel : Effect<NoCompileData>("keep_level") {`
`21`	`21`	`holder: ProvidedHolder,`
`22`	`22`	`compileData: NoCompileData`
`23`	`23`	`) {`
`24`		`- players[dispatcher.uuid] += identifiers.uuid`
	`24`	`+ players[dispatcher.uuid].add(identifiers.uuid)`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`override fun onDisable(dispatcher: Dispatcher<*>, identifiers: Identifiers, holder: ProvidedHolder) {`
`28`		`- players[dispatcher.uuid] -= identifiers.uuid`
	`28`	`+ players[dispatcher.uuid].remove(identifiers.uuid)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@EventHandler(ignoreCancelled = true)`
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,11 @@ object EffectTelekinesis : Effect<NoCompileData>("telekinesis") {`
`32`	`32`	`holder: ProvidedHolder,`
`33`	`33`	`compileData: NoCompileData`
`34`	`34`	`) {`
`35`		`- players[dispatcher.uuid] += identifiers.uuid`
	`35`	`+ players[dispatcher.uuid].add(identifiers.uuid)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`override fun onDisable(dispatcher: Dispatcher<*>, identifiers: Identifiers, holder: ProvidedHolder) {`
`39`		`- players[dispatcher.uuid] -= identifiers.uuid`
	`39`	`+ players[dispatcher.uuid].remove(identifiers.uuid)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`override fun postRegister() {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ object BossBars {`
`13`	`13`	`return`
`14`	`14`	`}`
`15`	`15`
`16`		`- registry[bossBar.id] += bossBar`
	`16`	`+ registry[bossBar.id].add(bossBar)`
`17`	`17`	`val player = Bukkit.getPlayer(bossBar.uuid) ?: return`
`18`	`18`	`bossBar.bossBar.addViewer(player.asAudience())`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,14 +39,14 @@ abstract class MultiMultiplierEffect<T : Any>(id: String) : Effect<NoCompileData`
`39`	`39`	`val elements = config.getStrings(key).mapNotNull { getElement(it) }`
`40`	`40`
`41`	`41`	`for (element in elements) {`
`42`		`- modifiers[dispatcher.uuid][element] += IdentifiedModifier(identifiers.uuid) {`
	`42`	`+ modifiers[dispatcher.uuid][element].add(IdentifiedModifier(identifiers.uuid) {`
`43`	`43`	`config.getDoubleFromExpression("multiplier", dispatcher.get())`
`44`		`- }`
	`44`	`+ })`
`45`	`45`	`}`
`46`	`46`	`} else {`
`47`		`- globalModifiers[dispatcher.uuid] += IdentifiedModifier(identifiers.uuid) {`
	`47`	`+ globalModifiers[dispatcher.uuid].add(IdentifiedModifier(identifiers.uuid) {`
`48`	`48`	`config.getDoubleFromExpression("multiplier", dispatcher.get())`
`49`		`- }`
	`49`	`+ })`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`