From e960e99e54122351129c931a118fd2ac8477c29a Mon Sep 17 00:00:00 2001
From: sya-ri <sya79lua@gmail.com>
Date: Wed, 7 Apr 2021 05:23:12 +0900
Subject: [PATCH] =?UTF-8?q?api(item):=20Attribute=20=E3=81=AE=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=E3=81=8C=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0=E3=81=AB?=
 =?UTF-8?q?=E5=8F=8D=E6=98=A0=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=83=90?=
 =?UTF-8?q?=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3=20#61?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  8 +++----
 api/build.gradle.kts                          |  2 +-
 .../github/syari/spigot/api/item/extension.kt | 24 +++++++++++++++----
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 8f7bb6b3..d1fcf1b4 100644
--- 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
index 8b35b336..8fed5af7 100644
--- 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
index ea024f22..89793a77 100644
--- 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
 }
 
 /**