R3944Realms/ExDeorum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed barrel bottle extraction not draining liquid

Browse Source 
Fixed an issue where taking filling a water bottle from a barrel would fill the bottle but not drain the barrel. This is due to mismatched NBT values when extracting. This change moves the drain operation before the NBT operations and only modifies the item NBT if fluid NBT is present.
This commit is contained in:
Jeremy 2026-01-08 13:57:31 -05:00
parent 906cf0f658
commit 3d14eeaf89
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/thedarkcolour/exdeorum/blockentity/BarrelBlockEntity.java
View File

@ -335,13 +335,15 @@ public class BarrelBlockEntity extends ETankBlockEntity {
if (!player.getAbilities().instabuild) {
playerItem.shrink(1);
}
tank.drain(fluid, IFluidHandler.FluidAction.EXECUTE);
var bottle = PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER);
var nbt = bottle.getOrCreateTag();
nbt.merge(fluid.getOrCreateTag());
if (fluid.hasTag()) {
var nbt = bottle.getOrCreateTag();
nbt.merge(fluid.getTag());
}
if (!player.addItem(bottle)) {
player.drop(bottle, false);
}
tank.drain(fluid, IFluidHandler.FluidAction.EXECUTE);
level.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_EMPTY, SoundSource.NEUTRAL, 1.0F, 1.0F);
}