Entonez/KCauldronX
1
0
Fork 0
forked from xjboss/KCauldronX
Code Releases Activity

修复mod的防护类功能失效并且导致护甲直接失效的bug

Browse Source
This commit is contained in:
聪聪 2017-08-10 13:27:43 +08:00
parent 75ee4d8b54
commit 060d7a1bc2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/net/minecraft/entity/EntityLivingBase.java.patch
View File

@ -420,10 +420,10 @@
- p_70665_2_ = Math.max(p_70665_2_ - this.getAbsorptionAmount(), 0.0F); - p_70665_2_ = Math.max(p_70665_2_ - this.getAbsorptionAmount(), 0.0F);
- this.setAbsorptionAmount(this.getAbsorptionAmount() - (f1 - p_70665_2_)); - this.setAbsorptionAmount(this.getAbsorptionAmount() - (f1 - p_70665_2_));
+ final boolean human = this instanceof EntityPlayer; + final boolean human = this instanceof EntityPlayer;
+ float originalDamage = f;
+ // Cauldron start - apply forge damage hook + // Cauldron start - apply forge damage hook
+ f = ForgeHooks.onLivingHurt(this, damagesource, f); + f = ForgeHooks.onLivingHurt(this, damagesource, f);
+ if (f < 0) return true; + if (f < 0) return true;
+ float originalDamage = f;
+ // Cauldron end + // Cauldron end
+ Function<Double, Double> hardHat = new Function<Double, Double>() { + Function<Double, Double> hardHat = new Function<Double, Double>() {
+ @Override + @Override