keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Reorganized SpecialArmor code to work properly.

Browse source
This commit is contained in:
LexManos 2012-01-28 07:09:55 +00:00
parent 92b2a3666e
commit 7a6193e8f5
2 changed files with 33 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch
View file

@ -93,35 +93,36 @@
public boolean canHarvestBlock(Block block) public boolean canHarvestBlock(Block block)
{ {
return inventory.canHarvestBlock(block); return inventory.canHarvestBlock(block);
@@ -764,6 +820,27 @@ @@ -768,8 +824,26 @@
{
protected void damageEntity(DamageSource damagesource, int i) i = 1 + i >> 1;
{ }
+ boolean doRegularComputation = true; - i = applyArmorCalculations(damagesource, i);
- i = applyPotionDamageCalculations(damagesource, i);
+
+ boolean doRegularComputation = true;
+ int initialDamage = i; + int initialDamage = i;
+ +
+ for (ItemStack stack : inventory.armorInventory) + for (ItemStack stack : inventory.armorInventory)
+ { + {
+ if (stack != null && stack.getItem() instanceof ISpecialArmor) + if (stack != null && stack.getItem() instanceof ISpecialArmor)
+ { + {
+ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); + ISpecialArmor armor = (ISpecialArmor)stack.getItem();
+
+ ArmorProperties props = armor.getProperties(this, initialDamage, i); + ArmorProperties props = armor.getProperties(this, initialDamage, i);
+ i = i - props.damageRemove; + i = i - props.damageRemove;
+ doRegularComputation = doRegularComputation && props.allowRegularComputation; + doRegularComputation = doRegularComputation && props.allowRegularComputation;
+ } + }
+ } + }
+ +
+ if (!doRegularComputation) + if (doRegularComputation)
+ { + {
+ super.damageEntity(damagesource, i); + i = applyArmorCalculations(damagesource, i);
+ return; + i = applyPotionDamageCalculations(damagesource, i);
+ } + }
+ addExhaustion(damagesource.getHungerDamage());
if (!damagesource.isUnblockable() && isBlocking()) health -= i;
{ }
i = 1 + i >> 1; @@ -815,7 +889,9 @@
@@ -815,7 +892,9 @@
public void destroyCurrentEquippedItem() public void destroyCurrentEquippedItem()
{ {
@ -131,7 +132,7 @@
} }
public double getYOffset() public double getYOffset()
@@ -947,6 +1026,11 @@ @@ -947,6 +1023,11 @@
public EnumStatus sleepInBedAt(int i, int j, int k) public EnumStatus sleepInBedAt(int i, int j, int k)
{ {

30
forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch
View file

@ -103,10 +103,13 @@
public boolean canHarvestBlock(Block block) public boolean canHarvestBlock(Block block)
{ {
return inventory.canHarvestBlock(block); return inventory.canHarvestBlock(block);
@@ -707,6 +766,26 @@ @@ -711,8 +770,26 @@
{
protected void damageEntity(DamageSource damagesource, int i) i = 1 + i >> 1;
{ }
- i = applyArmorCalculations(damagesource, i);
- i = applyPotionDamageCalculations(damagesource, i);
+
+ boolean doRegularComputation = true; + boolean doRegularComputation = true;
+ int initialDamage = i; + int initialDamage = i;
+ +
@ -114,23 +117,22 @@
+ { + {
+ if (stack != null && stack.getItem() instanceof ISpecialArmor) + if (stack != null && stack.getItem() instanceof ISpecialArmor)
+ { + {
+ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); + ISpecialArmor armor = (ISpecialArmor)stack.getItem();
+ ArmorProperties props = armor.getProperties(this, initialDamage, i); + ArmorProperties props = armor.getProperties(this, initialDamage, i);
+ i = i - props.damageRemove; + i = i - props.damageRemove;
+ doRegularComputation = doRegularComputation && props.allowRegularComputation; + doRegularComputation = doRegularComputation && props.allowRegularComputation;
+ } + }
+ } + }
+ +
+ if (!doRegularComputation) + if (doRegularComputation)
+ { + {
+ super.damageEntity(damagesource, i); + i = applyArmorCalculations(damagesource, i);
+ return; + i = applyPotionDamageCalculations(damagesource, i);
+ } + }
+ addExhaustion(damagesource.getHungerDamage());
if (!damagesource.isUnblockable() && isBlocking()) health -= i;
{ }
i = 1 + i >> 1; @@ -758,7 +835,9 @@
@@ -758,7 +837,9 @@
public void destroyCurrentEquippedItem() public void destroyCurrentEquippedItem()
{ {
@ -140,7 +142,7 @@
} }
public double getYOffset() public double getYOffset()
@@ -884,6 +965,11 @@ @@ -884,6 +963,11 @@
public EnumStatus sleepInBedAt(int i, int j, int k) public EnumStatus sleepInBedAt(int i, int j, int k)
{ {