Improper variable merging - 1.16/1.15 Particle#func_187110_a about forgeflower HOT 1 CLOSED

diff -r -u joined.decomp/net/minecraft/client/particle/Particle.java joined.decomp.test/net/minecraft/client/particle/Particle.java
--- joined.decomp/net/minecraft/client/particle/Particle.java	2020-06-15 22:21:20.000000000 -0700
+++ joined.decomp.test/net/minecraft/client/particle/Particle.java	2020-06-15 22:20:16.000000000 -0700
@@ -156,6 +156,7 @@
       if (!this.field_228343_B_) {
          double d0 = p_187110_1_;
          double d1 = p_187110_3_;
+         double d2 = p_187110_5_;
          if (this.field_190017_n && (p_187110_1_ != 0.0D || p_187110_3_ != 0.0D || p_187110_5_ != 0.0D)) {
             Vector3d vector3d = Entity.func_223307_a((Entity)null, new Vector3d(p_187110_1_, p_187110_3_, p_187110_5_), this.func_187116_l(), this.field_187122_b, ISelectionContext.func_216377_a(), new ReuseableStream<>(Stream.empty()));
             p_187110_1_ = vector3d.field_72450_a;
@@ -168,16 +169,16 @@
             this.func_187118_j();
          }
 
-         if (Math.abs(p_187110_3_) >= (double)1.0E-5F && Math.abs(p_187110_3_) < (double)1.0E-5F) {
+         if (Math.abs(d1) >= (double)1.0E-5F && Math.abs(p_187110_3_) < (double)1.0E-5F) {
             this.field_228343_B_ = true;
          }
 
-         this.field_187132_l = p_187110_3_ != p_187110_3_ && d1 < 0.0D;
+         this.field_187132_l = d1 != p_187110_3_ && d1 < 0.0D;
          if (d0 != p_187110_1_) {
             this.field_187129_i = 0.0D;
          }
 
-         if (p_187110_5_ != p_187110_5_) {
+         if (d2 != p_187110_5_) {
             this.field_187131_k = 0.0D;
          }
 
diff -r -u joined.decomp/net/minecraft/profiler/FilledProfileResult.java joined.decomp.test/net/minecraft/profiler/FilledProfileResult.java
--- joined.decomp/net/minecraft/profiler/FilledProfileResult.java	2020-06-15 22:20:28.000000000 -0700
+++ joined.decomp.test/net/minecraft/profiler/FilledProfileResult.java	2020-06-15 22:19:18.000000000 -0700
@@ -65,6 +65,7 @@
    }
 
    public List<DataPoint> func_219917_a(String p_219917_1_) {
+      String s = p_219917_1_;
       IProfilerSection iprofilersection = this.func_230104_c_("root");
       long i = iprofilersection.func_230037_a_();
       IProfilerSection iprofilersection1 = this.func_230104_c_(p_219917_1_);
@@ -77,9 +78,9 @@
 
       long l = 0L;
 
-      for(String s : this.field_230093_e_.keySet()) {
-         if (func_230097_a_(p_219917_1_, s)) {
-            l += this.func_230104_c_(s).func_230037_a_();
+      for(String s1 : this.field_230093_e_.keySet()) {
+         if (func_230097_a_(p_219917_1_, s1)) {
+            l += this.func_230104_c_(s1).func_230037_a_();
          }
       }
 
@@ -92,14 +93,14 @@
          i = l;
       }
 
-      for(String s1 : this.field_230093_e_.keySet()) {
-         if (func_230097_a_(p_219917_1_, s1)) {
-            IProfilerSection iprofilersection2 = this.func_230104_c_(s1);
+      for(String s2 : this.field_230093_e_.keySet()) {
+         if (func_230097_a_(p_219917_1_, s2)) {
+            IProfilerSection iprofilersection2 = this.func_230104_c_(s2);
             long i1 = iprofilersection2.func_230037_a_();
             double d0 = (double)i1 * 100.0D / (double)l;
             double d1 = (double)i1 * 100.0D / (double)i;
-            String s2 = s1.substring(p_219917_1_.length());
-            list.add(new DataPoint(s2, d0, d1, iprofilersection2.func_230038_b_()));
+            String s3 = s2.substring(p_219917_1_.length());
+            list.add(new DataPoint(s3, d0, d1, iprofilersection2.func_230038_b_()));
          }
       }
 
@@ -108,7 +109,7 @@
       }
 
       Collections.sort(list);
-      list.add(0, new DataPoint(p_219917_1_, 100.0D, (double)l * 100.0D / (double)i, k));
+      list.add(0, new DataPoint(s, 100.0D, (double)l * 100.0D / (double)i, k));
       return list;
    }