diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemStep.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ItemStep.java | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/src/main/java/net/minecraft/server/ItemStep.java b/src/main/java/net/minecraft/server/ItemStep.java index 4f5a8846..6448f352 100644 --- a/src/main/java/net/minecraft/server/ItemStep.java +++ b/src/main/java/net/minecraft/server/ItemStep.java @@ -2,15 +2,15 @@ package net.minecraft.server; public class ItemStep extends ItemBlock { - private final boolean a; - private final BlockStepAbstract b; + private final boolean b; private final BlockStepAbstract c; + private final BlockStepAbstract d; - public ItemStep(int i, BlockStepAbstract blockstepabstract, BlockStepAbstract blockstepabstract1, boolean flag) { - super(i); - this.b = blockstepabstract; - this.c = blockstepabstract1; - this.a = flag; + public ItemStep(Block block, BlockStepAbstract blockstepabstract, BlockStepAbstract blockstepabstract1, boolean flag) { + super(block); + this.c = blockstepabstract; + this.d = blockstepabstract1; + this.b = flag; this.setMaxDurability(0); this.a(true); } @@ -19,32 +19,33 @@ public class ItemStep extends ItemBlock { return i; } - public String d(ItemStack itemstack) { - return this.b.c(itemstack.getData()); + public String a(ItemStack itemstack) { + return this.c.b(itemstack.getData()); } public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l, float f, float f1, float f2) { final int clickedX = i, clickedY = j, clickedZ = k; // CraftBukkit - if (this.a) { + if (this.b) { return super.interactWith(itemstack, entityhuman, world, i, j, k, l, f, f1, f2); } else if (itemstack.count == 0) { return false; } else if (!entityhuman.a(i, j, k, l, itemstack)) { return false; } else { - int i1 = world.getTypeId(i, j, k); - int j1 = world.getData(i, j, k); - int k1 = j1 & 7; - boolean flag = (j1 & 8) != 0; + Block block = world.getType(i, j, k); + int i1 = world.getData(i, j, k); + int j1 = i1 & 7; + boolean flag = (i1 & 8) != 0; - if ((l == 1 && !flag || l == 0 && flag) && i1 == this.b.id && k1 == itemstack.getData()) { + if ((l == 1 && !flag || l == 0 && flag) && block == this.c && j1 == itemstack.getData()) { // CraftBukkit start - world.setTypeIdAndData -> processBlockPlace() - // if (world.b(this.c.b(world, i, j, k)) && world.setTypeIdAndData(i, j, k, this.c.id, k1, 3)) { - if (world.b(this.c.b(world, i, j, k)) && processBlockPlace(world, entityhuman, null, i, j, k, this.c.id, k1, clickedX, clickedY, clickedZ)) { - // world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.c.stepSound.getPlaceSound(), (this.c.stepSound.getVolume1() + 1.0F) / 2.0F, this.c.stepSound.getVolume2() * 0.8F); + // if (world.b(this.d.a(world, i, j, k)) && world.setTypeAndData(i, j, k, this.d, j1, 3)) { + if (world.b(this.d.a(world, i, j, k)) && processBlockPlace(world, entityhuman, null, i, j, k, this.d, j1, clickedX, clickedY, clickedZ)) { + // world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.d.stepSound.getPlaceSound(), (this.d.stepSound.getVolume1() + 1.0F) / 2.0F, this.d.stepSound.getVolume2() * 0.8F); // CraftBukkit end --itemstack.count; } + return true; } else { return this.a(itemstack, entityhuman, world, i, j, k, l) ? true : super.interactWith(itemstack, entityhuman, world, i, j, k, l, f, f1, f2); @@ -53,7 +54,6 @@ public class ItemStep extends ItemBlock { } private boolean a(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l) { - final int clickedX = i, clickedY = j, clickedZ = k; // CraftBukkit if (l == 0) { --j; } @@ -78,16 +78,13 @@ public class ItemStep extends ItemBlock { ++i; } - int i1 = world.getTypeId(i, j, k); - int j1 = world.getData(i, j, k); - int k1 = j1 & 7; + Block block = world.getType(i, j, k); + int i1 = world.getData(i, j, k); + int j1 = i1 & 7; - if (i1 == this.b.id && k1 == itemstack.getData()) { - // CraftBukkit start - world.setTypeIdAndData -> processBlockPlace() - // if (world.b(this.c.b(world, i, j, k)) && world.setTypeIdAndData(i, j, k, this.c.id, k1, 3)) { - if (world.b(this.c.b(world, i, j, k)) && processBlockPlace(world, entityhuman, null, i, j, k, this.c.id, k1, clickedX, clickedY, clickedZ)) { - // world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F, this.c.stepSound.getPlaceSound(), (this.c.stepSound.getVolume1() + 1.0F) / 2.0F, this.c.stepSound.getVolume2() * 0.8F); - // CraftBukkit end + if (block == this.c && j1 == itemstack.getData()) { + if (world.b(this.d.a(world, i, j, k)) && world.setTypeAndData(i, j, k, this.d, j1, 3)) { + world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.d.stepSound.getPlaceSound(), (this.d.stepSound.getVolume1() + 1.0F) / 2.0F, this.d.stepSound.getVolume2() * 0.8F); --itemstack.count; } |