summaryrefslogtreecommitdiffstats
path: root/nms-patches/ItemWaterLily.patch
blob: 380e4b3cfe8a67f0be750d9b7b6fae495bc75796 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
--- /home/matt/mc-dev-private//net/minecraft/server/ItemWaterLily.java	2015-02-26 22:40:22.851608137 +0000
+++ src/main/java/net/minecraft/server/ItemWaterLily.java	2015-02-26 22:40:22.851608137 +0000
@@ -27,7 +27,15 @@
                 IBlockData iblockdata = world.getType(blockposition);
 
                 if (iblockdata.getBlock().getMaterial() == Material.WATER && ((Integer) iblockdata.get(BlockFluids.LEVEL)).intValue() == 0 && world.isEmpty(blockposition1)) {
+                    // CraftBukkit start - special case for handling block placement with water lilies
+                    org.bukkit.block.BlockState blockstate = org.bukkit.craftbukkit.block.CraftBlockState.getBlockState(world, blockposition1.getX(), blockposition1.getY(), blockposition1.getZ());
                     world.setTypeUpdate(blockposition1, Blocks.WATERLILY.getBlockData());
+                    org.bukkit.event.block.BlockPlaceEvent placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPlaceEvent(world, entityhuman, blockstate, blockposition.getX(), blockposition.getY(), blockposition.getZ());
+                    if (placeEvent != null && (placeEvent.isCancelled() || !placeEvent.canBuild())) {
+                        blockstate.update(true, false);
+                        return itemstack;
+                    }
+                    // CraftBukkit end
                     if (!entityhuman.abilities.canInstantlyBuild) {
                         --itemstack.count;
                     }