api(item): Attribute の変更がアイテムに反映されないバグを修正 #61

sya-ri · Apr 6, 2021 · e960e99 · e960e99
1 parent 6f36efc
commit e960e99
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -265,7 +265,7 @@ repositories {
 }
 
 dependencies {
-    api('com.github.sya-ri:EasySpigotAPI:2.3.0') {
+    api('com.github.sya-ri:EasySpigotAPI:2.3.1') {
         exclude group: 'org.spigotmc', module: 'spigot-api'
     }
 }
@@ -279,7 +279,7 @@ repositories {
 }
 
 dependencies {
-    api("com.github.sya-ri:EasySpigotAPI:2.3.0") {
+    api("com.github.sya-ri:EasySpigotAPI:2.3.1") {
         exclude(group = "org.spigotmc", module = "spigot-api")
     }
 }
@@ -305,7 +305,7 @@ configurations {
 }
 
 dependencies {
-    shadowApi('com.github.sya-ri:EasySpigotAPI:2.3.0') {
+    shadowApi('com.github.sya-ri:EasySpigotAPI:2.3.1') {
         exclude group: 'org.spigotmc', module: 'spigot-api'
     }
 }
@@ -330,7 +330,7 @@ repositories {
 }
 
 dependencies {
-    shadowApi("com.github.sya-ri:EasySpigotAPI:2.3.0") {
+    shadowApi("com.github.sya-ri:EasySpigotAPI:2.3.1") {
         exclude(group = "org.spigotmc", module = "spigot-api")
     }
 }

diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 }
 
 group = "com.github.sya-ri.spigot.api"
-version = "2.3.0"
+version = "2.3.1"
 
 bukkit {
     name = "EasySpigotAPI"

diff --git a/api/src/main/kotlin/com/github/syari/spigot/api/item/extension.kt b/api/src/main/kotlin/com/github/syari/spigot/api/item/extension.kt
@@ -289,7 +289,11 @@ fun ItemStack.getAttributeModifiers(attribute: Attribute): Collection<AttributeM
  */
 @UnsupportedMinecraftVersion(8, 9, 10, 11, 12)
 fun ItemStack.addAttributeModifier(attribute: Attribute, modifier: AttributeModifier): Boolean {
-    return itemMeta?.addAttributeModifier(attribute, modifier) ?: false
+    var result = false
+    editItemMeta {
+        result = addAttributeModifier(attribute, modifier)
+    }
+    return result
 }
 
 /**
@@ -301,7 +305,11 @@ fun ItemStack.addAttributeModifier(attribute: Attribute, modifier: AttributeModi
  */
 @UnsupportedMinecraftVersion(8, 9, 10, 11, 12)
 fun ItemStack.removeAttributeModifier(attribute: Attribute): Boolean {
-    return itemMeta?.removeAttributeModifier(attribute) ?: false
+    var result = false
+    editItemMeta {
+        result = removeAttributeModifier(attribute)
+    }
+    return result
 }
 
 /**
@@ -313,7 +321,11 @@ fun ItemStack.removeAttributeModifier(attribute: Attribute): Boolean {
  */
 @UnsupportedMinecraftVersion(8, 9, 10, 11, 12)
 fun ItemStack.removeAttributeModifier(slot: EquipmentSlot): Boolean {
-    return itemMeta?.removeAttributeModifier(slot) ?: false
+    var result = false
+    editItemMeta {
+        result = removeAttributeModifier(slot)
+    }
+    return result
 }
 
 /**
@@ -325,7 +337,11 @@ fun ItemStack.removeAttributeModifier(slot: EquipmentSlot): Boolean {
  */
 @UnsupportedMinecraftVersion(8, 9, 10, 11, 12)
 fun ItemStack.removeAttributeModifier(attribute: Attribute, modifier: AttributeModifier): Boolean {
-    return itemMeta?.removeAttributeModifier(attribute, modifier) ?: false
+    var result = false
+    editItemMeta {
+        result = removeAttributeModifier(attribute, modifier)
+    }
+    return result
 }
 
 /**