From 010fe4662af7af74e0954d6dc2308151eb88fbed Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 28 Feb 2016 23:18:55 -0800 Subject: [PATCH] Fix #1081 FillBucketHook does not check bucket type --- src/main/java/forestry/plugins/PluginFluids.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/forestry/plugins/PluginFluids.java b/src/main/java/forestry/plugins/PluginFluids.java index 1955d0c9f..3f8546fdc 100644 --- a/src/main/java/forestry/plugins/PluginFluids.java +++ b/src/main/java/forestry/plugins/PluginFluids.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -175,6 +176,11 @@ public class PluginFluids extends ForestryPlugin { public static class FillBucketHook { @SubscribeEvent public void fillBucket(FillBucketEvent event) { + ItemStack bucket = event.current; + if (bucket == null || bucket.getItem() != Items.bucket) { + return; + } + MovingObjectPosition movingObjectPosition = event.target; int x = movingObjectPosition.blockX; int y = movingObjectPosition.blockY;