# 修复

修复Scale在设置为1.0时 无法成功应用上的BUG

Author: CooStack

src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/style/ParticleGroupStyle.kt

@@ -307,10 +307,6 @@ abstract class ParticleGroupStyle(var visibleRange: Double = 32.0, val uuid: UUI
                 particleDefaultLength[uuid] = it.value.length()
             }
         }
-        if (scale == 1.0) {
-            return
-        }
-
         locations.forEach {
             val uuid = it.key.uuid
             val len = particleDefaultLength[uuid]!!
@@ -331,13 +327,11 @@ abstract class ParticleGroupStyle(var visibleRange: Double = 32.0, val uuid: UUI
     }
 
     protected open fun toggleScaleDisplayed() {
-        if (scale == 1.0) {
-            return
-        }
         particleLocations.forEach {
             val uuid = it.key.controlUUID()
             val len = particleDefaultLength[uuid]!!
             val value = it.value
+            if (len in -1e-3 .. 1e-3) return@forEach
             value.multiply(len * scale / value.length())
         }
     }

src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/style/SequencedParticleStyle.kt

@@ -248,6 +248,17 @@ abstract class SequencedParticleStyle(visibleRange: Double = 32.0, uuid: UUID =
         super.toggleScale(locations.toMap())
     }
 
+    override fun scale(new: Double) {
+        if (new < 0.0) {
+            CooParticleAPI.logger.error("scale can not be less than zero")
+            return
+        }
+        scale = new
+        if (displayed) {
+            toggleScaleDisplayed()
+        }
+    }
+
     override fun display(pos: Vec3d, world: World) {
         if (displayed) {
             return
@@ -410,13 +421,11 @@ abstract class SequencedParticleStyle(visibleRange: Double = 32.0, uuid: UUID =
     }
 
     final override fun toggleScaleDisplayed() {
-        if (scale == 1.0) {
-            return
-        }
         sequencedParticles.forEach {
             val uuid = it.first.uuid
             val len = particleDefaultLength[uuid]!!
             val value = it.second
+            if (len in -1e-3..1e-3) return@forEach
             value.multiply(len * scale / value.length())
         }
     }

src/main/kotlin/cn/coostack/cooparticlesapi/utils/helper/GroupScaleHelper.kt

@@ -30,9 +30,6 @@ class GroupScaleHelper(minScale: Double, maxScale: Double, scaleTick: Int) :
     }
 
     override fun scale(scale: Double) {
-        if (scale < minScale || scale >= maxScale) {
-            return
-        }
-        group.scale(scale)
+        group.scale(scale.coerceIn(minScale, maxScale))
     }
 }

src/main/kotlin/cn/coostack/cooparticlesapi/utils/helper/ScaleHelper.kt

@@ -18,6 +18,9 @@ abstract class ScaleHelper(var minScale: Double, var maxScale: Double, var scale
     }
 
     fun recalculateStep(): ScaleHelper {
+        val temp = min(minScale, maxScale)
+        maxScale = max(minScale, maxScale)
+        minScale = temp
         step = abs(maxScale - minScale) / scaleTick
         return this
     }
@@ -42,13 +45,15 @@ abstract class ScaleHelper(var minScale: Double, var maxScale: Double, var scale
         if (getLoadedGroup() == null) {
             return
         }
+        current = 0
         scale(minScale)
     }
 
     fun resetScaleMax() {
         if (getLoadedGroup() == null) {
             return
         }
+        current = scaleTick
         scale(maxScale)
     }
 

src/main/kotlin/cn/coostack/cooparticlesapi/utils/helper/StyleScaleHelper.kt

@@ -27,10 +27,7 @@ class StyleScaleHelper(minScale: Double, maxScale: Double, scaleTick: Int) :
     }
 
     override fun scale(scale: Double) {
-        if (scale < minScale || scale >= maxScale) {
-            return
-        }
-        group.scale(scale)
+        group.scale(scale.coerceIn(minScale,maxScale))
     }
 
 }