From 6c09066e224ac85b8a6464eaf8f53edfeb4beda4 Mon Sep 17 00:00:00 2001 From: Nate Mortensen Date: Mon, 1 Jul 2013 06:03:00 -0500 Subject: Update CraftBukkit to 1.6.1 --- src/main/java/net/minecraft/server/BlockMushroom.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/main/java/net/minecraft/server/BlockMushroom.java') diff --git a/src/main/java/net/minecraft/server/BlockMushroom.java b/src/main/java/net/minecraft/server/BlockMushroom.java index 872ad003..796527da 100644 --- a/src/main/java/net/minecraft/server/BlockMushroom.java +++ b/src/main/java/net/minecraft/server/BlockMushroom.java @@ -14,11 +14,8 @@ import org.bukkit.event.world.StructureGrowEvent; public class BlockMushroom extends BlockFlower { - private final String a; - - protected BlockMushroom(int i, String s) { + protected BlockMushroom(int i) { super(i); - this.a = s; float f = 0.2F; this.a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 2.0F, 0.5F + f); @@ -68,7 +65,7 @@ public class BlockMushroom extends BlockFlower { // CraftBukkit start org.bukkit.World bworld = world.getWorld(); BlockState blockState = bworld.getBlockAt(i1, j1, k1).getState(); - blockState.setTypeId(this.id); + blockState.setTypeId(this.id); // nms: this.id, 0, 2 BlockSpreadEvent event = new BlockSpreadEvent(blockState.getBlock(), bworld.getBlockAt(sourceX, sourceY, sourceZ), blockState); world.getServer().getPluginManager().callEvent(event); @@ -85,15 +82,15 @@ public class BlockMushroom extends BlockFlower { return super.canPlace(world, i, j, k) && this.f(world, i, j, k); } - protected boolean f_(int i) { - return Block.s[i]; + protected boolean g_(int i) { + return Block.t[i]; } public boolean f(World world, int i, int j, int k) { if (j >= 0 && j < 256) { int l = world.getTypeId(i, j - 1, k); - return l == Block.MYCEL.id || world.m(i, j, k) < 13 && this.f_(l); + return l == Block.MYCEL.id || world.m(i, j, k) < 13 && this.g_(l); } else { return false; } -- cgit v1.2.3