Fix NPE in WaterPotionStorage#isWaterPotion (#4313)

* Fix NPE in WaterPotionStorage#isWaterPotion * Make checkstyle happy (cherry picked from commit efa825c)
FabricMC · Dec 30, 2024 · cb44d14 · cb44d14
1 parent bd07446
commit cb44d14
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/...sfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/WaterPotionStorage.java b/...sfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/WaterPotionStorage.java
@@ -16,18 +16,14 @@
 
 package net.fabricmc.fabric.impl.transfer.fluid;
 
-import java.util.Optional;
-
 import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.PotionContentsComponent;
 import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-import net.minecraft.potion.Potion;
 import net.minecraft.potion.Potions;
-import net.minecraft.registry.entry.RegistryEntry;
 
 import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext;
 import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants;
@@ -52,9 +48,9 @@ public static WaterPotionStorage find(ContainerItemContext context) {
 
 	private static boolean isWaterPotion(ContainerItemContext context) {
 		ItemVariant variant = context.getItemVariant();
-		Optional<? extends PotionContentsComponent> potionContents = variant.getComponents().get(DataComponentTypes.POTION_CONTENTS);
-		RegistryEntry<Potion> potion = potionContents.map(PotionContentsComponent::potion).orElse(null).orElse(null);
-		return variant.isOf(Items.POTION) && potion == Potions.WATER;
+		PotionContentsComponent potionContents = variant.getComponentMap()
+				.getOrDefault(DataComponentTypes.POTION_CONTENTS, PotionContentsComponent.DEFAULT);
+		return variant.isOf(Items.POTION) && potionContents.potion().orElse(null) == Potions.WATER;
 	}
 
 	private final ContainerItemContext context;

diff --git a/...sfer-api-v1/src/test/java/net/fabricmc/fabric/test/transfer/unittests/FluidItemTests.java b/...sfer-api-v1/src/test/java/net/fabricmc/fabric/test/transfer/unittests/FluidItemTests.java
@@ -173,6 +173,14 @@ public void testWaterPotion() {
 		if (StorageUtil.findStoredResource(luckyStorage) != null) {
 			throw new AssertionError("Found a resource in an unhandled potion.");
 		}
+
+		// Make sure extraction returns nothing for no potion at all
+		testInventory.setStack(0, new ItemStack(Items.POTION));
+		Storage<FluidVariant> defaultStorage = new InventoryContainerItem(testInventory, 0).find(FluidStorage.ITEM);
+
+		if (StorageUtil.findStoredResource(defaultStorage) != null) {
+			throw new AssertionError("Found a resource in empty potion.");
+		}
 	}
 
 	@Test