Updated to 6.3.1

eco-api/src/main/java/com/willfp/eco/core/fast/FastItemStack.java

@@ -1,6 +1,7 @@
 package com.willfp.eco.core.fast;
 
 import com.willfp.eco.core.Eco;
+import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -8,6 +9,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * FastItemStack contains methods to modify and read items faster than in default bukkit.
@@ -58,7 +60,7 @@ public interface FastItemStack {
      * @param itemStack The ItemStack.
      * @return The FastItemStack.
      */
-    static FastItemStack wrap(@NotNull final ItemStack itemStack) {
-        return Eco.getHandler().createFastItemStack(itemStack);
+    static FastItemStack wrap(final ItemStack itemStack) {
+        return Eco.getHandler().createFastItemStack(Objects.requireNonNullElseGet(itemStack, () -> new ItemStack(Material.AIR)));
     }
 }

eco-core/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
             }
         }
     }

eco-core/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
             }
         }
     }

gradle.properties

@@ -1,2 +1,2 @@
-version = 6.3.0
+version = 6.3.1
 plugin-name = eco