Update CraftBukkit to Minecraft 1.7.2
This commit is contained in:
@@ -2,8 +2,8 @@ package net.minecraft.server;
|
||||
|
||||
public class ItemSnow extends ItemBlockWithAuxData {
|
||||
|
||||
public ItemSnow(int i, Block block) {
|
||||
super(i, block);
|
||||
public ItemSnow(Block block, Block block1) {
|
||||
super(block, block1);
|
||||
}
|
||||
|
||||
public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l, float f, float f1, float f2) {
|
||||
@@ -13,25 +13,23 @@ public class ItemSnow extends ItemBlockWithAuxData {
|
||||
} else if (!entityhuman.a(i, j, k, l, itemstack)) {
|
||||
return false;
|
||||
} else {
|
||||
int i1 = world.getTypeId(i, j, k);
|
||||
Block block = world.getType(i, j, k);
|
||||
|
||||
if (i1 == Block.SNOW.id) {
|
||||
Block block = Block.byId[this.g()];
|
||||
int j1 = world.getData(i, j, k);
|
||||
int k1 = j1 & 7;
|
||||
if (block == Blocks.SNOW) {
|
||||
int i1 = world.getData(i, j, k);
|
||||
int j1 = i1 & 7;
|
||||
|
||||
// CraftBukkit start - Redirect to common handler
|
||||
if (k1 <= 6 && world.b(block.b(world, i, j, k)) && ItemBlock.processBlockPlace(world, entityhuman, itemstack, i, j, k, Block.SNOW.id, k1 + 1 | j1 & -8, clickedX, clickedY, clickedZ)) {
|
||||
if (j1 <= 6 && world.b(this.block.a(world, i, j, k)) && ItemBlock.processBlockPlace(world, entityhuman, itemstack, i, j, k, block, j1 + 1 | i1 & -8, clickedX, clickedY, clickedZ)) {
|
||||
return true;
|
||||
}
|
||||
/*
|
||||
if (k1 <= 6 && world.b(block.b(world, i, j, k)) && world.setData(i, j, k, k1 + 1 | j1 & -8, 2)) {
|
||||
world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), block.stepSound.getPlaceSound(), (block.stepSound.getVolume1() + 1.0F) / 2.0F, block.stepSound.getVolume2() * 0.8F);
|
||||
if (j1 <= 6 && world.b(this.block.a(world, i, j, k)) && world.setData(i, j, k, j1 + 1 | i1 & -8, 2)) {
|
||||
world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.block.stepSound.getPlaceSound(), (this.block.stepSound.getVolume1() + 1.0F) / 2.0F, this.block.stepSound.getVolume2() * 0.8F);
|
||||
--itemstack.count;
|
||||
return true;
|
||||
}
|
||||
*/
|
||||
// CraftBukkit end
|
||||
// CraftBukkit end */
|
||||
}
|
||||
|
||||
return super.interactWith(itemstack, entityhuman, world, i, j, k, l, f, f1, f2);
|
||||
|
||||
Reference in New Issue
Block a user