From a0f7a2878da974f344beedfbab4899f1ff212816 Mon Sep 17 00:00:00 2001 From: Aleksey Date: Sun, 27 Dec 2020 16:04:36 +0300 Subject: [PATCH] Update ItemUtil.java --- src/main/java/ru/betterend/util/ItemUtil.java | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/ru/betterend/util/ItemUtil.java b/src/main/java/ru/betterend/util/ItemUtil.java index 8d8f6835..fe5de8f3 100644 --- a/src/main/java/ru/betterend/util/ItemUtil.java +++ b/src/main/java/ru/betterend/util/ItemUtil.java @@ -29,19 +29,26 @@ public class ItemUtil { @Nullable public static ItemStack fromStackString(String stackString) { - if (stackString == null || stackString.equals("")) return null; - String[] parts = stackString.split(":"); - if (parts.length < 2) return null; - if (parts.length == 2) { - Identifier itemId = new Identifier(stackString); + if (stackString == null || stackString.equals("")) { + return null; + } + try { + String[] parts = stackString.split(":"); + if (parts.length < 2) return null; + if (parts.length == 2) { + Identifier itemId = new Identifier(stackString); + Item item = Registry.ITEM.getOrEmpty(itemId).orElse(null); + if (item == null) return null; + return new ItemStack(item); + } + Identifier itemId = new Identifier(parts[0], parts[1]); Item item = Registry.ITEM.getOrEmpty(itemId).orElse(null); if (item == null) return null; - return new ItemStack(item); + return new ItemStack(item, Integer.valueOf(parts[2])); + } catch (Exception ex) { + BetterEnd.LOGGER.catching(ex); } - Identifier itemId = new Identifier(parts[0], parts[1]); - Item item = Registry.ITEM.getOrEmpty(itemId).orElse(null); - if (item == null) return null; - return new ItemStack(item, Integer.valueOf(parts[2])); + return null; } @Nullable