Update to Minecraft 1.12.2

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2017-09-18 20:00:00 +10:00
parent 65ab757f26
commit 5e3ba4ff73
23 changed files with 120 additions and 148 deletions

View File

@@ -12,7 +12,7 @@
public class BlockSoil extends Block {
public static final BlockStateInteger MOISTURE = BlockStateInteger.of("moisture", 0, 7);
@@ -35,6 +40,12 @@
@@ -36,6 +41,12 @@
if (i > 0) {
world.setTypeAndData(blockposition, iblockdata.set(BlockSoil.MOISTURE, Integer.valueOf(i - 1)), 2);
} else if (!this.c(world, blockposition)) {
@@ -22,10 +22,10 @@
+ return;
+ }
+ // CraftBukkit end
this.b(world, blockposition);
b(world, blockposition);
}
} else if (i < 7) {
@@ -44,11 +55,29 @@
@@ -45,11 +56,29 @@
}
public void fallOn(World world, BlockPosition blockposition, Entity entity, float f) {
@@ -48,11 +48,11 @@
+ return;
+ }
+ // CraftBukkit end
this.b(world, blockposition);
b(world, blockposition);
}
- super.fallOn(world, blockposition, entity, f);
+ // super.fallOn(world, blockposition, entity, f); // CraftBukkit - moved up
}
private void b(World world, BlockPosition blockposition) {
protected static void b(World world, BlockPosition blockposition) {