From 3c3fcc0ffd040bfbb8146ab756fb5cab75b5f3c6 Mon Sep 17 00:00:00 2001 From: CreativeMD Date: Fri, 24 Feb 2017 00:35:44 +0100 Subject: [PATCH] Add implementation for Living Attack event on client-side for players (#3667) * Fixed unused import --- .../client/entity/EntityOtherPlayerMP.java.patch | 10 ++++++++++ .../client/entity/EntityPlayerSP.java.patch | 16 ++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.java.patch diff --git a/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.java.patch b/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.java.patch new file mode 100644 index 0000000000..0447131640 --- /dev/null +++ b/patches/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.java.patch @@ -0,0 +1,10 @@ +--- ../src-base/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.java ++++ ../src-work/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.java +@@ -43,6 +43,7 @@ + + public boolean func_70097_a(DamageSource p_70097_1_, float p_70097_2_) + { ++ net.minecraftforge.common.ForgeHooks.onLivingAttack(this, p_70097_1_, p_70097_2_); + return true; + } + diff --git a/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch b/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch index 7cd835a0c7..417659bf39 100644 --- a/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch +++ b/patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch @@ -1,6 +1,14 @@ --- ../src-base/minecraft/net/minecraft/client/entity/EntityPlayerSP.java +++ ../src-work/minecraft/net/minecraft/client/entity/EntityPlayerSP.java -@@ -428,6 +428,15 @@ +@@ -125,6 +125,7 @@ + + public boolean func_70097_a(DamageSource p_70097_1_, float p_70097_2_) + { ++ net.minecraftforge.common.ForgeHooks.onLivingAttack(this, p_70097_1_, p_70097_2_); + return false; + } + +@@ -428,6 +429,15 @@ } } @@ -16,7 +24,7 @@ protected boolean func_145771_j(double p_145771_1_, double p_145771_3_, double p_145771_5_) { if (this.field_70145_X) -@@ -440,30 +449,34 @@ +@@ -440,30 +450,34 @@ double d0 = p_145771_1_ - (double)blockpos.func_177958_n(); double d1 = p_145771_5_ - (double)blockpos.func_177952_p(); @@ -56,7 +64,7 @@ { d2 = 1.0D - d1; i = 5; -@@ -498,7 +511,8 @@ +@@ -498,7 +512,8 @@ private boolean func_175162_d(BlockPos p_175162_1_) { @@ -66,7 +74,7 @@ } public void func_70031_b(boolean p_70031_1_) -@@ -543,7 +557,13 @@ +@@ -543,7 +558,13 @@ public void func_184185_a(SoundEvent p_184185_1_, float p_184185_2_, float p_184185_3_) {