adjustable beacon radius

AzisabaNetwork · Sep 27, 2024 · 6293308 · 6293308
1 parent 33c1c39
commit 6293308
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "net.azisaba"
-version = "1.15.2+6.17.1"
+version = "1.15.2+6.17.2"
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(8))

diff --git a/src/main/java/com/github/mori01231/lifecore/block/BeaconCustomBlock.kt b/src/main/java/com/github/mori01231/lifecore/block/BeaconCustomBlock.kt
@@ -17,13 +17,14 @@ class BeaconCustomBlock(
     lore: List<String>? = null,
     private val effect: PotionEffectType,
     private val amplifier: Int,
+    private val radius: Double = 250.0,
     private val destroyWithoutWrench: Boolean,
 ) : CustomBlock(material, displayName, lore) {
     var ticks = 0
 
     override fun tick(manager: CustomBlockManager, pos: WorldLocation, state: CustomBlockState): CustomBlockState? {
         if (ticks++ % 80 == 0) {
-            pos.toBukkitLocation().getNearbyEntitiesByType(Player::class.java, 250.0).forEach { player ->
+            pos.toBukkitLocation().getNearbyEntitiesByType(Player::class.java, radius).forEach { player ->
                 player.addPotionEffect(effect.createEffect(20 * 60, amplifier))
             }
         }

diff --git a/src/main/java/com/github/mori01231/lifecore/block/CustomBlockManager.kt b/src/main/java/com/github/mori01231/lifecore/block/CustomBlockManager.kt
@@ -145,7 +145,8 @@ class CustomBlockManager(val plugin: LifeCore) {
                 val effect = PotionEffectType.getByName(map["effect"]?.toString() ?: return plugin.logger.warning("effect is required @ $blockName"))
                     ?: return plugin.logger.warning("Unknown effect: ${map["effect"]} @ $blockName")
                 val amplifier = map["amplifier"]?.toString()?.toIntOrNull() ?: 0
-                BeaconCustomBlock(blockName, lockFacing, axisShift, backgroundBlock, material, displayName, lore, effect, amplifier, destroyWithoutWrench)
+                val radius = map["radius"]?.toString()?.toDouble() ?: 250.0
+                BeaconCustomBlock(blockName, lockFacing, axisShift, backgroundBlock, material, displayName, lore, effect, amplifier, radius, destroyWithoutWrench)
             } else {
                 error("Unknown block type: $type")
             }