mirror of
https://github.com/barkeser2002/CatServer.git
synced 2026-09-25 01:39:52 +03:00
27 lines
1.5 KiB
Diff
27 lines
1.5 KiB
Diff
--- ../src-base/minecraft/net/minecraft/block/BlockConcretePowder.java
|
|
+++ ../src-work/minecraft/net/minecraft/block/BlockConcretePowder.java
|
|
@@ -27,11 +27,10 @@
|
|
this.setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
|
|
}
|
|
|
|
- public void onEndFalling(World worldIn, BlockPos pos, IBlockState p_176502_3_, IBlockState p_176502_4_)
|
|
+ public void onEndFalling(World worldIn, BlockPos pos, IBlockState blockState, IBlockState blockState1)
|
|
{
|
|
- if (p_176502_4_.getMaterial().isLiquid())
|
|
- {
|
|
- worldIn.setBlockState(pos, Blocks.CONCRETE.getDefaultState().withProperty(BlockColored.COLOR, p_176502_3_.getValue(COLOR)), 3);
|
|
+ if (blockState1.getMaterial().isLiquid() && worldIn.getBlockState(pos).getBlock() != Blocks.CONCRETE) { // CraftBukkit - don't double concrete
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(worldIn, pos, Blocks.CONCRETE.getDefaultState().withProperty(BlockColored.COLOR, blockState.getValue(BlockConcretePowder.COLOR)), null); // CraftBukkit
|
|
}
|
|
}
|
|
|
|
@@ -55,7 +54,7 @@
|
|
|
|
if (flag)
|
|
{
|
|
- worldIn.setBlockState(pos, Blocks.CONCRETE.getDefaultState().withProperty(BlockColored.COLOR, state.getValue(COLOR)), 3);
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(worldIn, pos, Blocks.CONCRETE.getDefaultState().withProperty(BlockColored.COLOR, state.getValue(BlockConcretePowder.COLOR)), null);
|
|
}
|
|
|
|
return flag;
|