2015-05-25 12:37:24 +02:00
|
|
|
--- a/net/minecraft/server/ItemWaterLily.java
|
|
|
|
|
+++ b/net/minecraft/server/ItemWaterLily.java
|
2016-11-17 02:41:03 +01:00
|
|
|
@@ -24,7 +24,15 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
IBlockData iblockdata = world.getType(blockposition);
|
|
|
|
|
|
2016-02-29 22:32:46 +01:00
|
|
|
if (iblockdata.getMaterial() == Material.WATER && ((Integer) iblockdata.get(BlockFluids.LEVEL)).intValue() == 0 && world.isEmpty(blockposition1)) {
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // 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());
|
2016-02-29 22:32:46 +01:00
|
|
|
world.setTypeAndData(blockposition1, Blocks.WATERLILY.getBlockData(), 11);
|
2016-03-01 22:37:08 +01:00
|
|
|
+ org.bukkit.event.block.BlockPlaceEvent placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPlaceEvent(world, entityhuman, enumhand, blockstate, blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
2014-11-25 22:32:16 +01:00
|
|
|
+ if (placeEvent != null && (placeEvent.isCancelled() || !placeEvent.canBuild())) {
|
|
|
|
|
+ blockstate.update(true, false);
|
2016-02-29 22:32:46 +01:00
|
|
|
+ return new InteractionResultWrapper(EnumInteractionResult.PASS, itemstack);
|
2014-11-25 22:32:16 +01:00
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
if (!entityhuman.abilities.canInstantlyBuild) {
|
2016-11-17 02:41:03 +01:00
|
|
|
itemstack.subtract(1);
|
2014-11-25 22:32:16 +01:00
|
|
|
}
|
