Update CraftBukkit to 1.6.1
This commit is contained in:
committed by
Wesley Wolfe
parent
f887b76a25
commit
6c09066e22
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user