Update CraftBukkit to Minecraft 1.7.5

This commit is contained in:
Nate Mortensen
2014-03-20 22:26:30 -06:00
committed by EvilSeph
parent afb3511a4a
commit 385ace970e
206 changed files with 2670 additions and 2679 deletions

View File

@@ -78,7 +78,7 @@ public final class ItemStack {
boolean flag = this.getItem().interactWith(this, entityhuman, world, i, j, k, l, f, f1, f2);
if (flag) {
entityhuman.a(StatisticList.E[Item.b(this.item)], 1);
entityhuman.a(StatisticList.USE_ITEM_COUNT[Item.b(this.item)], 1);
}
return flag;
@@ -204,15 +204,15 @@ public final class ItemStack {
public void damage(int i, EntityLiving entityliving) {
if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
if (this.g()) {
if (this.isDamaged(i, entityliving.aI())) {
if (this.isDamaged(i, entityliving.aH())) {
entityliving.a(this);
--this.count;
if (entityliving instanceof EntityHuman) {
EntityHuman entityhuman = (EntityHuman) entityliving;
entityhuman.a(StatisticList.F[Item.b(this.item)], 1);
entityhuman.a(StatisticList.BREAK_ITEM_COUNT[Item.b(this.item)], 1);
if (this.count == 0 && this.getItem() instanceof ItemBow) {
entityhuman.bE();
entityhuman.bF();
}
}
@@ -236,7 +236,7 @@ public final class ItemStack {
boolean flag = this.item.a(this, entityliving, (EntityLiving) entityhuman);
if (flag) {
entityhuman.a(StatisticList.E[Item.b(this.item)], 1);
entityhuman.a(StatisticList.USE_ITEM_COUNT[Item.b(this.item)], 1);
}
}
@@ -244,7 +244,7 @@ public final class ItemStack {
boolean flag = this.item.a(this, world, block, i, j, k, entityhuman);
if (flag) {
entityhuman.a(StatisticList.E[Item.b(this.item)], 1);
entityhuman.a(StatisticList.USE_ITEM_COUNT[Item.b(this.item)], 1);
}
}
@@ -303,7 +303,7 @@ public final class ItemStack {
}
public void a(World world, EntityHuman entityhuman, int i) {
entityhuman.a(StatisticList.D[Item.b(this.item)], i);
entityhuman.a(StatisticList.CRAFT_BLOCK_COUNT[Item.b(this.item)], i);
this.item.d(this, world, entityhuman);
}
@@ -480,8 +480,8 @@ public final class ItemStack {
NBTTagCompound nbttagcompound = new NBTTagCompound();
this.save(nbttagcompound);
ichatbasecomponent.b().a(new ChatHoverable(EnumHoverAction.SHOW_ITEM, new ChatComponentText(nbttagcompound.toString())));
ichatbasecomponent.b().setColor(this.w().e);
ichatbasecomponent.getChatModifier().a(new ChatHoverable(EnumHoverAction.SHOW_ITEM, new ChatComponentText(nbttagcompound.toString())));
ichatbasecomponent.getChatModifier().setColor(this.w().e);
}
return ichatbasecomponent;