From 060d7a1bc2e8b7f8c74b9f2b6ad67620f2cf524e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=81=AA=E8=81=AA?= <178666380@qq.com> Date: Thu, 10 Aug 2017 13:27:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmod=E7=9A=84=E9=98=B2?= =?UTF-8?q?=E6=8A=A4=E7=B1=BB=E5=8A=9F=E8=83=BD=E5=A4=B1=E6=95=88=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E5=AF=BC=E8=87=B4=E6=8A=A4=E7=94=B2=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- patches/net/minecraft/entity/EntityLivingBase.java.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/net/minecraft/entity/EntityLivingBase.java.patch b/patches/net/minecraft/entity/EntityLivingBase.java.patch index 10b5923..846aea5 100644 --- a/patches/net/minecraft/entity/EntityLivingBase.java.patch +++ b/patches/net/minecraft/entity/EntityLivingBase.java.patch @@ -420,10 +420,10 @@ - p_70665_2_ = Math.max(p_70665_2_ - this.getAbsorptionAmount(), 0.0F); - this.setAbsorptionAmount(this.getAbsorptionAmount() - (f1 - p_70665_2_)); + final boolean human = this instanceof EntityPlayer; -+ float originalDamage = f; + // Cauldron start - apply forge damage hook + f = ForgeHooks.onLivingHurt(this, damagesource, f); + if (f < 0) return true; ++ float originalDamage = f; + // Cauldron end + Function hardHat = new Function() { + @Override