upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-14 01:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix killing blow causing combat tracker to lose data (MC-121048) (#4452)

Browse Source
This commit is contained in:
Ben Staddon authored and LexManos committed 2017-10-31 10:59:04 -07:00
1 parent 0bf82697bb
commit f8e375279d
1 file changed
+10
Download Patch File Download Diff File Expand all files Collapse all files
patches/minecraft/net/minecraft/entity/EntityLivingBase.java.patch
+10
View File
@@ -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_)