# 修复

SequencedParticleStyle 使用addMultiple时 会导致index变为0

Author: CooStack

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

@@ -49,6 +49,7 @@ open class ParticleShapeStyle(uuid: UUID) :
             }
         }
     }
+    var spawnAge = 0
 
     /**
      * 设置为true时 会利用scaleHelper 每tick增长一点
@@ -137,6 +138,7 @@ open class ParticleShapeStyle(uuid: UUID) :
     override fun onDisplay() {
         onDisplayInvoke()
         addPreTickAction {
+            spawnAge++
             if (!scalePreTick || scaleHelper == null) {
                 return@addPreTickAction
             }

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

@@ -40,7 +40,7 @@ class SequencedParticleShapeStyle(uuid: UUID) :
      * 符合条件后 animationIndex 会递增
      * 直到到达边界
      */
-    private val animationConditions = ArrayList<Pair<Predicate<SequencedParticleStyle>, Int>>()
+    private val animationConditions = ArrayList<Pair<Predicate<SequencedParticleShapeStyle>, Int>>()
     var animationIndex = 0
         private set
 
@@ -65,6 +65,7 @@ class SequencedParticleShapeStyle(uuid: UUID) :
                 }
             }
         }
+    var spawnAge = 0
 
     /**
      * 设置为true时 会利用scaleHelper 每tick增长一点
@@ -100,7 +101,10 @@ class SequencedParticleShapeStyle(uuid: UUID) :
      * @param predicate 设置添加/删除动画的要求
      * @param add 向下的个数
      */
-    fun appendAnimateCondition(predicate: Predicate<SequencedParticleStyle>, add: Int): SequencedParticleShapeStyle {
+    fun appendAnimateCondition(
+        predicate: Predicate<SequencedParticleShapeStyle>,
+        add: Int
+    ): SequencedParticleShapeStyle {
         animationConditions.add(predicate to add)
         return this
     }
@@ -148,7 +152,7 @@ class SequencedParticleShapeStyle(uuid: UUID) :
     /**
      * 在生成粒子之前执行
      */
-    fun toggleBeforeDisplay(toggleMethod: SequencedParticleShapeStyle.(Map<SortedStyleData, RelativeLocation>) -> Unit): SequencedParticleShapeStyle {
+    fun toggleBeforeDisplay(toggleMethod: SequencedParticleShapeStyle.(SortedMap<SortedStyleData, RelativeLocation>) -> Unit): SequencedParticleShapeStyle {
         beforeDisplayInvoke = toggleMethod
         return this
     }
@@ -176,6 +180,7 @@ class SequencedParticleShapeStyle(uuid: UUID) :
             }
         }
         addPreTickAction {
+            spawnAge++
             if (!scalePreTick || scaleHelper == null) {
                 return@addPreTickAction
             }
@@ -188,9 +193,13 @@ class SequencedParticleShapeStyle(uuid: UUID) :
         }
     }
 
-    private val bufferFrame: SortedMap<SortedStyleData, RelativeLocation> = TreeMap()
+    private var count = -1
     override fun getParticlesCount(): Int {
-        return bufferFrame.size
+        // 调用此方法比初始化count早
+        if (count == -1 || count == 0) {
+            count = getCurrentFramesSequenced().size
+        }
+        return count
     }
 
     override fun getCurrentFramesSequenced(): SortedMap<SortedStyleData, RelativeLocation> {

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

@@ -81,7 +81,7 @@ abstract class SequencedParticleStyle(visibleRange: Double = 32.0, uuid: UUID =
      */
     var particleLinkageDisplayCurrentIndex = 0
         private set(value) {
-            field = value.coerceAtLeast(0)
+            field = value.coerceIn(0, getParticlesCount() - 1)
         }
 
     /**
@@ -127,6 +127,10 @@ abstract class SequencedParticleStyle(visibleRange: Double = 32.0, uuid: UUID =
         if (count <= 0) {
             return
         }
+        if (count == 1) {
+            addSingle()
+            return
+        }
         if (!client) {
             // 处理服务器
             // 发包
@@ -139,7 +143,7 @@ abstract class SequencedParticleStyle(visibleRange: Double = 32.0, uuid: UUID =
                 )
             change({
                 particleLinkageDisplayCurrentIndex =
-                    (particleLinkageDisplayCurrentIndex + count).coerceAtMost(sequencedParticles.size - 1)
+                    (particleLinkageDisplayCurrentIndex + count).coerceAtMost(getParticlesCount() - 1)
             }, args)
             return
         }
@@ -171,6 +175,10 @@ abstract class SequencedParticleStyle(visibleRange: Double = 32.0, uuid: UUID =
         if (count <= 0) {
             return
         }
+        if (count == 1) {
+            removeSingle()
+            return
+        }
 
         if (!client) {
             // 处理服务器

src/main/kotlin/cn/coostack/cooparticlesapi/utils/Math3DUtil.kt

@@ -336,7 +336,8 @@ object Math3DUtil {
         toPoint: RelativeLocation,
         axis: RelativeLocation
     ): List<RelativeLocation> {
-        if (axis.cross(toPoint).length() in -1e-5..1e-5) {
+        // 同向共线
+        if (axis.cross(toPoint).length() in -1e-5..1e-5 && axis.dot(toPoint) > 0) {
             return locList
         }
         // 计算旋转角度