Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.3.1

Browse Source
This commit is contained in:
feildmaster
2012-07-29 02:33:13 -05:00
committed by Travis Watkins
parent 08e2923bd4
commit a43d621c01
240 changed files with 10763 additions and 9150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/net/minecraft/server/ItemBlock.java
View File

@@ -9,14 +9,14 @@ public class ItemBlock extends Item {
public ItemBlock(int i) {
super(i);
this.id = i + 256;
this.d(Block.byId[i + 256].a(2));
this.c(Block.byId[i + 256].a(2));
}
public int a() {
public int f() {
return this.id;
}
public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l) {
public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l, float f, float f1, float f2) {
int clickedX = i, clickedY = j, clickedZ = k; // CraftBukkit
int i1 = world.getTypeId(i, j, k);
@@ -50,14 +50,23 @@ public class ItemBlock extends Item {
if (itemstack.count == 0) {
return false;
} else if (!entityhuman.d(i, j, k)) {
} else if (!entityhuman.e(i, j, k)) {
return false;
} else if (j == 255 && Block.byId[this.id].material.isBuildable()) {
return false;
// CraftBukkit start
}
// CraftBukkit start
int id = (l == -1 && itemstack.getItem() instanceof ItemStep) ? Block.DOUBLE_STEP.id : this.id;
if (id != this.id || world.mayPlace(this.id, i, j, k, false, l)) {
int id = this.id;
if (l == -1 && itemstack.getItem() instanceof ItemStep) {
if (this.id == Block.STEP.id) {
id = Block.DOUBLE_STEP.id;
} else if (this.id == Block.WOOD_STEP.id) {
id = Block.WOOD_DOUBLE_STEP.id;
}
}
if (id != this.id || world.mayPlace(this.id, i, j, k, false, l, entityhuman)) {
Block block = Block.byId[id];
CraftBlockState replacedBlockState = CraftBlockState.getBlockState(world, i, j, k);
@@ -73,10 +82,9 @@ public class ItemBlock extends Item {
if (event.isCancelled() || !event.canBuild()) {
return true;
}
if (world.setTypeIdAndData(i, j, k, id, data)) {
if (world.getTypeId(i, j, k) == id && Block.byId[id] != null) {
Block.byId[id].postPlace(world, i, j, k, l);
Block.byId[id].postPlace(world, i, j, k, l, f, f1, f2);
Block.byId[id].postPlace(world, i, j, k, entityhuman);
// CraftBukkit end
}
@@ -91,11 +99,11 @@ public class ItemBlock extends Item {
}
}
public String a(ItemStack itemstack) {
return Block.byId[this.id].q();
public String c(ItemStack itemstack) {
return Block.byId[this.id].a();
}
public String getName() {
return Block.byId[this.id].q();
return Block.byId[this.id].a();
}
}