Merge pull request #34 from SLNE-Development/fix/integer-overflow

Fix spawn distance overflow and update version to 3.2.7

Author: twisti-dev

gradle.properties

@@ -1,4 +1,4 @@
 kotlin.code.style=official
 kotlin.stdlib.default.dependency=false
 org.gradle.parallel=true
-version=3.2.6
+version=3.2.7

src/main/kotlin/dev/slne/surf/protect/paper/math/Mth.kt

@@ -48,7 +48,7 @@ object Mth {
     }
 
     @JvmStatic
-    fun calculatePricePerBlock(distance: Float): Double {
+    fun calculatePricePerBlock(distance: Double): Double {
         val raw = PRICE_GRADIENT * distance + PRICE_INTERCEPT
         val rounded = (raw * 100.0).roundToInt() / 100.0
         return max(config.pricing.minPerBlock, rounded)
@@ -105,7 +105,7 @@ object Mth {
     data class EffectiveCostResult(
         val effectiveCost: Double,
         val pricePerBlock: Double,
-        val spawnDistance: Float,
+        val spawnDistance: Double,
         val discountFactor: Double = 1.0
     ) {
         val hasDiscount: Boolean get() = discountFactor < 1.0

src/main/kotlin/dev/slne/surf/protect/paper/message/Messages.kt

@@ -9,8 +9,8 @@ import dev.slne.surf.protect.paper.util.castCoinFormat
 import dev.slne.surf.transaction.api.currency.Currency
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.format.TextDecoration
+import java.util.*
 import kotlin.math.roundToInt
-import java.util.Locale
 
 /**
  * The Messages object serves as a container for various predefined message and text utilities.
@@ -236,7 +236,7 @@ object Messages {
             effectiveCost: Double,
             currency: Currency,
             pricePerBlock: Double,
-            distanceToSpawn: Float,
+            distanceToSpawn: Double,
             discountFactor: Double = 1.0
         ) = buildText {
             val distanceToSpawn = (distanceToSpawn * 100).roundToInt() / 100.0

src/main/kotlin/dev/slne/surf/protect/paper/region/utils.kt

@@ -5,42 +5,46 @@ import dev.slne.surf.protect.paper.config
 import dev.slne.surf.protect.paper.math.Mth
 import dev.slne.surf.protect.paper.util.bukkitWorld
 import org.bukkit.World
-import org.spongepowered.math.vector.Vector2i
+import org.spongepowered.math.vector.Vector2l
 
 private val spawnPositionsByEnvironment = mapOf(
     World.Environment.NETHER to listOf(
-        Vector2i(0, 0),
-        Vector2i(0, -3125),
-        Vector2i(3125, -3125),
-        Vector2i(-3125, -3125),
-        Vector2i(0, 3125),
-        Vector2i(3125, 3125),
-        Vector2i(-3125, 3125),
-        Vector2i(3125, 0),
-        Vector2i(-3125, 0)
+        Vector2l(0, 0),
+        Vector2l(0, -3125),
+        Vector2l(3125, -3125),
+        Vector2l(-3125, -3125),
+        Vector2l(0, 3125),
+        Vector2l(3125, 3125),
+        Vector2l(-3125, 3125),
+        Vector2l(3125, 0),
+        Vector2l(-3125, 0)
     ),
-    World.Environment.THE_END to listOf(Vector2i.ZERO),
+    World.Environment.THE_END to listOf(Vector2l.ZERO),
     World.Environment.NORMAL to listOf(
-        Vector2i(0, 0),
-        Vector2i(0, -25000),
-        Vector2i(25000, -25000),
-        Vector2i(-25000, -25000),
-        Vector2i(0, 25000),
-        Vector2i(25000, 25000),
-        Vector2i(-25000, 25000),
-        Vector2i(25000, 0),
-        Vector2i(-25000, 0)
+        Vector2l(0, 0),
+        Vector2l(0, -25000),
+        Vector2l(25000, -25000),
+        Vector2l(-25000, -25000),
+        Vector2l(0, 25000),
+        Vector2l(25000, 25000),
+        Vector2l(-25000, 25000),
+        Vector2l(25000, 0),
+        Vector2l(-25000, 0)
     )
 )
 
 fun Location.getProtectionPricePerBlock(): PricePerBlockResult {
     val environment = this.bukkitWorld.environment
     val spawns = spawnPositionsByEnvironment[environment] ?: return PricePerBlockResult.EMPTY
-    val pos = Vector2i(blockX, blockZ)
+    val pos = Vector2l(blockX.toLong(), blockZ.toLong())
 
     val nearestSpawn = spawns.minBy { pos.distanceSquared(it) }
     val distance = pos.distance(nearestSpawn)
 
+    if (!distance.isFinite()) {
+        return PricePerBlockResult.EMPTY
+    }
+
     if (distance < config.pricing.spawnProtectionPerBlock) {
         return PricePerBlockResult(Double.MAX_VALUE, distance)
     }
@@ -55,9 +59,9 @@ fun Location.getProtectionPricePerBlock(): PricePerBlockResult {
 
 data class PricePerBlockResult(
     val pricePerBlock: Double,
-    val spawnDistance: Float
+    val spawnDistance: Double
 ) {
     companion object {
-        val EMPTY = PricePerBlockResult(Double.MAX_VALUE, Float.MAX_VALUE)
+        val EMPTY = PricePerBlockResult(Double.MAX_VALUE, Double.MAX_VALUE)
     }
 }