Merge remote-tracking branch 'origin/master'

Auxilor · Feb 8, 2024 · 5508c89 · 5508c89
2 parents e97b9e0 + a8a91c9
commit 5508c89
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/core/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectAddHolderInRadius.kt b/core/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectAddHolderInRadius.kt
@@ -42,6 +42,8 @@ object EffectAddHolderInRadius : Effect<HolderTemplate>("add_holder_in_radius")
 
     init {
         registerGenericHolderProvider { dispatcher ->
+            if (holders.isEmpty()) return@registerGenericHolderProvider emptyList()
+
             nearbyCache.get(dispatcher.uuid) { _ ->
                 holders.filter { it.canApplyTo(dispatcher) }
                     .map { SimpleProvidedHolder(it.holder) }

diff --git a/core/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectAddPermanentHolderInRadius.kt b/core/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectAddPermanentHolderInRadius.kt
@@ -35,6 +35,8 @@ object EffectAddPermanentHolderInRadius : Effect<HolderTemplate>("add_permanent_
 
     init {
         registerGenericHolderProvider { dispatcher ->
+            if (holders.isEmpty()) return@registerGenericHolderProvider emptyList()
+
             nearbyCache.get(dispatcher.uuid) { _ ->
                 holders.filter { it.canApplyTo(dispatcher) }
                     .map { SimpleProvidedHolder(it.holder) }