Fixed FastItemStack bug

Auxilor · Aug 7, 2021 · e758ceb · e758ceb
1 parent a408e34
commit e758ceb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.../core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/fast/NMSFastItemStack.kt b/.../core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/proxy/v1_16_R3/fast/NMSFastItemStack.kt
@@ -11,7 +11,7 @@ import java.lang.reflect.Field
 import kotlin.experimental.and
 
 class NMSFastItemStack(itemStack: org.bukkit.inventory.ItemStack) : EcoFastItemStack<ItemStack>(
-    getNMSStack(itemStack), itemStack
+    getNMSStack(itemStack)!!, itemStack
 ) {
     private var loreCache: List<String>? = null
     override fun getEnchantmentsOnItem(checkStored: Boolean): Map<Enchantment, Int> {
@@ -116,11 +116,11 @@ class NMSFastItemStack(itemStack: org.bukkit.inventory.ItemStack) : EcoFastItemS
             field = temp
         }
 
-        fun getNMSStack(itemStack: org.bukkit.inventory.ItemStack): ItemStack {
+        fun getNMSStack(itemStack: org.bukkit.inventory.ItemStack): ItemStack? {
             return if (itemStack !is CraftItemStack) {
                 CraftItemStack.asNMSCopy(itemStack)
             } else {
-                field[itemStack] as ItemStack
+                field.get(itemStack) as ItemStack
             }
         }
     }

diff --git a/.../core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/fast/NMSFastItemStack.kt b/.../core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/fast/NMSFastItemStack.kt
@@ -16,7 +16,7 @@ import java.lang.reflect.Field
 import kotlin.experimental.and
 
 class NMSFastItemStack(itemStack: org.bukkit.inventory.ItemStack) : EcoFastItemStack<ItemStack>(
-    getNMSStack(itemStack), itemStack
+    getNMSStack(itemStack)!!, itemStack
 ) {
     private var loreCache: List<String>? = null
 
@@ -136,11 +136,11 @@ class NMSFastItemStack(itemStack: org.bukkit.inventory.ItemStack) : EcoFastItemS
             field = temp
         }
 
-        fun getNMSStack(itemStack: org.bukkit.inventory.ItemStack): ItemStack {
+        fun getNMSStack(itemStack: org.bukkit.inventory.ItemStack): ItemStack? {
             return if (itemStack !is CraftItemStack) {
                 CraftItemStack.asNMSCopy(itemStack)
             } else {
-                field[itemStack] as ItemStack
+                field.get(itemStack) as ItemStack
             }
         }
     }