Merge pull request #10 from Glomzzz/main

feat: VanillaAttributeUpdateEvent
Skillw · Jun 13, 2024 · 10254ab · 10254ab
2 parents 77eae41 + 550f1c6
commit 10254ab
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/src/main/kotlin/com/skillw/attsystem/api/event/VanillaAttributeUpdateEvent.kt b/src/main/kotlin/com/skillw/attsystem/api/event/VanillaAttributeUpdateEvent.kt
@@ -0,0 +1,21 @@
+package com.skillw.attsystem.api.event
+
+import com.skillw.pouvoir.util.attribute.BukkitAttribute
+import org.bukkit.entity.Entity
+import taboolib.platform.type.BukkitProxyEvent
+
+/**
+ * 原版属性更新后
+ *
+ * @property entity 实体
+ * @property attr 属性
+ * @property value 属性值
+ */
+class VanillaAttributeUpdateEvent (
+    val entity: Entity,
+    val attr: BukkitAttribute,
+    val value: Double,
+) : BukkitProxyEvent() {
+    override val allowCancelled = false
+
+}
diff --git a/...ain/kotlin/com/skillw/attsystem/internal/feature/realizer/vanilla/MaxHealthTaskBuilder.kt b/...ain/kotlin/com/skillw/attsystem/internal/feature/realizer/vanilla/MaxHealthTaskBuilder.kt
@@ -1,5 +1,6 @@
 package com.skillw.attsystem.internal.feature.realizer.vanilla
 
+import com.skillw.attsystem.api.event.VanillaAttributeUpdateEvent
 import com.skillw.attsystem.internal.manager.ASConfig
 import com.skillw.pouvoir.util.attribute.BukkitAttribute
 import com.skillw.pouvoir.util.attribute.clear
@@ -45,6 +46,7 @@ internal object MaxHealthTaskBuilder : VanillaAttTaskBuilder("max-health", Bukki
                     if (!isEnableVanilla()) clear()
                     else removeModifier(modifier)
                     addModifier(modifier)
+                    VanillaAttributeUpdateEvent(entity, BukkitAttribute.MAX_HEALTH, if(isEnableVanilla()) value + 20 else value).call()
                 }
             }
         } else {
@@ -57,6 +59,7 @@ internal object MaxHealthTaskBuilder : VanillaAttTaskBuilder("max-health", Bukki
                     getAttribute(BukkitAttribute.MAX_HEALTH)?.apply {
                         clear()
                     }
+                    VanillaAttributeUpdateEvent(entity, BukkitAttribute.MAX_HEALTH, value).call()
                     maxHealth = value
                 }
             }

diff --git a/...in/kotlin/com/skillw/attsystem/internal/feature/realizer/vanilla/VanillaAttTaskBuilder.kt b/...in/kotlin/com/skillw/attsystem/internal/feature/realizer/vanilla/VanillaAttTaskBuilder.kt
@@ -2,6 +2,7 @@ package com.skillw.attsystem.internal.feature.realizer.vanilla
 
 import com.skillw.attsystem.AttributeSystem
 import com.skillw.attsystem.AttributeSystem.realizerManager
+import com.skillw.attsystem.api.event.VanillaAttributeUpdateEvent
 import com.skillw.pouvoir.api.feature.realizer.BaseRealizer
 import com.skillw.pouvoir.api.feature.realizer.BaseRealizerManager
 import com.skillw.pouvoir.api.feature.realizer.component.*
@@ -55,6 +56,7 @@ internal open class VanillaAttTaskBuilder(key: String, val attribute: BukkitAttr
                 if (!isEnableVanilla()) clear()
                 else removeModifier(modifier)
                 addModifier(modifier)
+                VanillaAttributeUpdateEvent(entity,this@VanillaAttTaskBuilder.attribute, if(isEnableVanilla()) value + 20 else value).call()
             }
         }
     }