From f8e375279dffc5214e678b81dc0192c55818dc91 Mon Sep 17 00:00:00 2001 From: Ben Staddon Date: Tue, 31 Oct 2017 17:59:04 +0000 Subject: [PATCH] Fix killing blow causing combat tracker to lose data (MC-121048) (#4452) --- .../net/minecraft/entity/EntityLivingBase.java.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch b/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch index 26b82f6f3..7d5caa9c7 100644 --- a/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch +++ b/patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch @@ -186,6 +186,16 @@ p_70665_2_ = this.func_70655_b(p_70665_1_, p_70665_2_); p_70665_2_ = this.func_70672_c(p_70665_1_, p_70665_2_); float f = p_70665_2_; +@@ -1389,8 +1406,8 @@ + if (p_70665_2_ != 0.0F) + { + float f1 = this.func_110143_aJ(); +- this.func_70606_j(f1 - p_70665_2_); + this.func_110142_aN().func_94547_a(p_70665_1_, f1, p_70665_2_); ++ this.func_70606_j(f1 - p_70665_2_); // Forge: moved to fix MC-121048 + this.func_110149_m(this.func_110139_bj() - p_70665_2_); + } + } @@ -1447,6 +1464,11 @@ public void func_184609_a(EnumHand p_184609_1_)