Merge remote-tracking branch 'origin/1.16' into 1.16

InnovativeOnlineIndustries · Oct 7, 2023 · c14c74f · c14c74f
2 parents 88b1620 + 2c8f934
commit c14c74f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/com/hrznstudio/titanium/block/tile/ActiveTile.java b/src/main/java/com/hrznstudio/titanium/block/tile/ActiveTile.java
@@ -288,11 +288,11 @@ public void handleButtonMessage(int id, PlayerEntity playerEntity, CompoundNBT c
                         if (fluidTankComponent.getName().equalsIgnoreCase(name))
                             playerEntity.inventory.getItemStack().getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY).ifPresent(iFluidHandlerItem -> {
                                 if (fill) {
-                                    int amount = Minecraft.getInstance().player.inventory.getItemStack().getItem() instanceof BucketItem ? FluidAttributes.BUCKET_VOLUME : Integer.MAX_VALUE;
+                                    int amount = playerEntity.inventory.getItemStack().getItem() instanceof BucketItem ? FluidAttributes.BUCKET_VOLUME : Integer.MAX_VALUE;
                                     amount = fluidTankComponent.fill(iFluidHandlerItem.drain(amount, IFluidHandler.FluidAction.SIMULATE), IFluidHandler.FluidAction.EXECUTE);
                                     iFluidHandlerItem.drain(amount, IFluidHandler.FluidAction.EXECUTE);
                                 } else {
-                                    int amount = Minecraft.getInstance().player.inventory.getItemStack().getItem() instanceof BucketItem ? FluidAttributes.BUCKET_VOLUME : Integer.MAX_VALUE;
+                                    int amount = playerEntity.inventory.getItemStack().getItem() instanceof BucketItem ? FluidAttributes.BUCKET_VOLUME : Integer.MAX_VALUE;
                                     amount = iFluidHandlerItem.fill(fluidTankComponent.drain(amount, IFluidHandler.FluidAction.SIMULATE), IFluidHandler.FluidAction.EXECUTE);
                                     fluidTankComponent.drain(amount, IFluidHandler.FluidAction.EXECUTE);
                                 }