From 7294713cbe40aa19d7760502cc645bc32fbe1e57 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Sun, 20 Jun 2021 21:56:39 +0800 Subject: [PATCH] Fix item NPE handling forge caps --- .../izzel/arclight/common/mixin/bukkit/CraftItemStackMixin.java | 1 + build.gradle | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftItemStackMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftItemStackMixin.java index 38797449..611c43f4 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftItemStackMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftItemStackMixin.java @@ -30,6 +30,7 @@ public abstract class CraftItemStackMixin implements CraftItemStackBridge { @Inject(method = "getItemMeta(Lnet/minecraft/item/ItemStack;)Lorg/bukkit/inventory/meta/ItemMeta;", at = @At("RETURN")) private static void arclight$offerCaps(ItemStack item, CallbackInfoReturnable cir) { + if (item == null) return; ItemMeta meta = cir.getReturnValue(); CompoundNBT tag = item.getTag(); if (tag != null) { diff --git a/build.gradle b/build.gradle index 99ba7ca6..0eaf775f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ allprojects { group 'io.izzel.arclight' - version '1.0.19' + version '1.0.20-SNAPSHOT' ext { agpVersion = '1.17'