From 3af14dee6ef1f2a19a6d2d80bd69b33c07ce3b8a Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Sun, 22 Nov 2020 10:29:14 +0800 Subject: [PATCH] Fix NPE with legacy plugin --- .../arclight/common/mixin/bukkit/CraftLegacyLegacyMixin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftLegacyLegacyMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftLegacyLegacyMixin.java index 72c9460e..d490a30d 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftLegacyLegacyMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftLegacyLegacyMixin.java @@ -21,7 +21,7 @@ public class CraftLegacyLegacyMixin { } else { try { Material material = Material.valueOf(name); - if (((MaterialBridge) (Object) material).bridge$getType() == MaterialPropertySpec.MaterialType.FORGE) { + if (material != null && ((MaterialBridge) (Object) material).bridge$getType() == MaterialPropertySpec.MaterialType.FORGE) { return material; } else { return Material.valueOf("LEGACY_" + name); @@ -43,7 +43,7 @@ public class CraftLegacyLegacyMixin { } else { try { Material material = Material.getMaterial(name); - if (((MaterialBridge) (Object) material).bridge$getType() == MaterialPropertySpec.MaterialType.FORGE) { + if (material != null && ((MaterialBridge) (Object) material).bridge$getType() == MaterialPropertySpec.MaterialType.FORGE) { return material; } else { return Material.getMaterial("LEGACY_" + name);