From 6148eff48436db9fa28e2aa2638c6f8da234d472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 13 Feb 2022 23:38:42 +0100 Subject: [PATCH] Return empty stack if data is invalid, instead of returning default one. --- .../java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java | 4 ++-- .../cil/oc2/common/item/FlashMemoryWithExternalDataItem.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java b/src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java index a53bd7cc..16bb7cbb 100644 --- a/src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java +++ b/src/main/java/li/cil/oc2/common/item/AbstractBlockDeviceItem.java @@ -55,12 +55,12 @@ public abstract class AbstractBlockDeviceItem extends ModItem { public ItemStack withData(final ItemStack stack, final BlockDeviceData data) { if (stack.isEmpty() || stack.getItem() != this) { - return stack; + return ItemStack.EMPTY; } final ResourceLocation key = BlockDeviceDataRegistry.getKey(data); if (key == null) { - return stack; + return ItemStack.EMPTY; } ItemStackUtils.getOrCreateModDataTag(stack).putString(DATA_TAG_NAME, key.toString()); diff --git a/src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java b/src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java index e606e704..9a27d0d7 100644 --- a/src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java +++ b/src/main/java/li/cil/oc2/common/item/FlashMemoryWithExternalDataItem.java @@ -53,12 +53,12 @@ public final class FlashMemoryWithExternalDataItem extends ModItem { public ItemStack withFirmware(final ItemStack stack, final Firmware firmware) { if (stack.isEmpty() || stack.getItem() != this) { - return stack; + return ItemStack.EMPTY; } final ResourceLocation key = FirmwareRegistry.getKey(firmware); if (key == null) { - return stack; + return ItemStack.EMPTY; } ItemStackUtils.getOrCreateModDataTag(stack).putString(FIRMWARE_TAG_NAME, key.toString());