mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 04:32:15 +00:00
-Add NBT-sensitive getMaxDamage() for ItemStack. Signed-off-by: King Lemming <[email protected]>
62 lines
1.5 KiB
Diff
62 lines
1.5 KiB
Diff
--- ../src_base/minecraft/net/minecraft/item/ItemStack.java
|
|
+++ ../src_work/minecraft/net/minecraft/item/ItemStack.java
|
|
@@ -249,7 +249,7 @@
|
|
*/
|
|
public boolean isItemDamaged()
|
|
{
|
|
- return this.isItemStackDamageable() && this.itemDamage > 0;
|
|
+ return this.isItemStackDamageable() && this.getItem().isItemStackDamaged(this);
|
|
}
|
|
|
|
/**
|
|
@@ -257,7 +257,7 @@
|
|
*/
|
|
public int getItemDamageForDisplay()
|
|
{
|
|
- return this.itemDamage;
|
|
+ return this.getItem().getItemDamageFromStackForDisplay(this);
|
|
}
|
|
|
|
/**
|
|
@@ -265,7 +265,7 @@
|
|
*/
|
|
public int getItemDamage()
|
|
{
|
|
- return this.itemDamage;
|
|
+ return this.getItem().getItemDamageFromStack(this);
|
|
}
|
|
|
|
/**
|
|
@@ -273,12 +273,7 @@
|
|
*/
|
|
public void setItemDamage(int par1)
|
|
{
|
|
- this.itemDamage = par1;
|
|
-
|
|
- if (this.itemDamage < 0)
|
|
- {
|
|
- this.itemDamage = 0;
|
|
- }
|
|
+ this.getItem().setItemDamageForStack(this, par1);
|
|
}
|
|
|
|
/**
|
|
@@ -286,7 +281,7 @@
|
|
*/
|
|
public int getMaxDamage()
|
|
{
|
|
- return Item.itemsList[this.itemID].getMaxDamage();
|
|
+ return this.getItem().getItemMaxDamageFromStack(this);
|
|
}
|
|
|
|
public boolean func_96631_a(int par1, Random par2Random)
|
|
@@ -382,7 +377,7 @@
|
|
*/
|
|
public int getDamageVsEntity(Entity par1Entity)
|
|
{
|
|
- return Item.itemsList[this.itemID].getDamageVsEntity(par1Entity);
|
|
+ return Item.itemsList[this.itemID].getDamageVsEntity(par1Entity, this);
|
|
}
|
|
|
|
/**
|