FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-05 19:47:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions5

Fix NPE in WaterPotionStorage#isWaterPotion ()

Browse source 
* Fix NPE in WaterPotionStorage#isWaterPotion

* Make checkstyle happy
This commit is contained in:
Bruno Ploumhans 2024-12-24 14:23:34 +01:00 • committed by GitHub
parent cbf6036a49
commit efa825c9d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 7 deletions
fabric-transfer-api-v1/src
main/java/net/fabricmc/fabric/impl/transfer/fluid
WaterPotionStorage.java
test/java/net/fabricmc/fabric/test/transfer/unittests
FluidItemTests.java

10
fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/WaterPotionStorage.java
View file

@ -16,8 +16,6 @@
package net.fabricmc.fabric.impl.transfer.fluid;
import java.util.Optional;
import org.jetbrains.annotations.Nullable;
import net.minecraft.component.DataComponentTypes;
@ -25,9 +23,7 @@ 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 class WaterPotionStorage implements ExtractionOnlyStorage<FluidVariant>,
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;

8
fabric-transfer-api-v1/src/test/java/net/fabricmc/fabric/test/transfer/unittests/FluidItemTests.java
View file

@ -173,6 +173,14 @@ class FluidItemTests extends AbstractTransferApiTest {
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