diff options
Diffstat (limited to 'nms-patches/ItemWaterLily.patch')
| -rw-r--r-- | nms-patches/ItemWaterLily.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nms-patches/ItemWaterLily.patch b/nms-patches/ItemWaterLily.patch index d4e7af04..18718a90 100644 --- a/nms-patches/ItemWaterLily.patch +++ b/nms-patches/ItemWaterLily.patch @@ -1,16 +1,16 @@ --- a/net/minecraft/server/ItemWaterLily.java +++ b/net/minecraft/server/ItemWaterLily.java -@@ -27,7 +27,15 @@ +@@ -23,7 +23,15 @@ IBlockData iblockdata = world.getType(blockposition); - if (iblockdata.getBlock().getMaterial() == Material.WATER && ((Integer) iblockdata.get(BlockFluids.LEVEL)).intValue() == 0 && world.isEmpty(blockposition1)) { + if (iblockdata.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()); + world.setTypeAndData(blockposition1, Blocks.WATERLILY.getBlockData(), 11); + 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; ++ return new InteractionResultWrapper(EnumInteractionResult.PASS, itemstack); + } + // CraftBukkit end if (!entityhuman.abilities.canInstantlyBuild) { |