2015-02-26 23:41:06 +01:00
|
|
|
--- /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
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -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;
|
|
|
|
|
}
|
