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

Fix Entityies not taking damage correctly. Closes #1511

Browse source
This commit is contained in:
Lex Manos 2014-11-28 07:43:10 -08:00
parent a059a9a7fb
commit 17e5480b6e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,7 @@
public boolean func_70097_a(DamageSource p_70097_1_, float p_70097_2_) public boolean func_70097_a(DamageSource p_70097_1_, float p_70097_2_)
{ {
+ if (net.minecraftforge.common.ForgeHooks.onLivingAttack(this, p_70097_1_, p_70097_2_)) return false; + if (!net.minecraftforge.common.ForgeHooks.onLivingAttack(this, p_70097_1_, p_70097_2_)) return false;
if (this.func_180431_b(p_70097_1_)) if (this.func_180431_b(p_70097_1_))
{ {
return false; return false;

2
src/main/java/net/minecraftforge/common/ForgeHooks.java
View file

@ -326,7 +326,7 @@ public class ForgeHooks
public static boolean onLivingAttack(EntityLivingBase entity, DamageSource src, float amount) public static boolean onLivingAttack(EntityLivingBase entity, DamageSource src, float amount)
{ {
return MinecraftForge.EVENT_BUS.post(new LivingAttackEvent(entity, src, amount)); return !MinecraftForge.EVENT_BUS.post(new LivingAttackEvent(entity, src, amount));
} }
public static float onLivingHurt(EntityLivingBase entity, DamageSource src, float amount) public static float onLivingHurt(EntityLivingBase entity, DamageSource src, float amount)