From afb9e818fcdfc8017e511a4da3cb9cccb509d4f9 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Wed, 27 Jul 2022 21:22:02 +0200
Subject: [PATCH] Fix timings diff

---
 patches/server/0012-Timings-v2.patch | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/patches/server/0012-Timings-v2.patch b/patches/server/0012-Timings-v2.patch
index 39fccf532a..17a8c3bd97 100644
--- a/patches/server/0012-Timings-v2.patch
+++ b/patches/server/0012-Timings-v2.patch
@@ -1425,7 +1425,7 @@ index cdf8020194f2ec1fe7b65b22c8e1f5b1c23eaefa..2db27f5e3e3c1bb0502c055f78c4a81e
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c4f91b80add5d79d999aa49c5da6dab094a24694..8221ec36a6453aea8a2249fde93ebc8fbd9d7e22 100644
+index c4f91b80add5d79d999aa49c5da6dab094a24694..e2d93d7a9c421f896e98e6dd6b318f9a30cab3b4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -140,7 +140,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -1445,20 +1445,17 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..8221ec36a6453aea8a2249fde93ebc8f
          super.tick();
          this.updatingUsingItem();
          this.updateSwimAmount();
-@@ -2836,12 +2835,6 @@ public abstract class LivingEntity extends Entity {
-             }
+@@ -2837,9 +2836,7 @@ public abstract class LivingEntity extends Entity {
          }
  
--        if (!this.isRemoved()) {
+         if (!this.isRemoved()) {
 -            SpigotTimings.timerEntityBaseTick.stopTiming(); // Spigot
--            this.aiStep();
+             this.aiStep();
 -            SpigotTimings.timerEntityTickRest.startTiming(); // Spigot
--        }
--
+         }
+ 
          double d0 = this.getX() - this.xo;
-         double d1 = this.getZ() - this.zo;
-         float f = (float) (d0 * d0 + d1 * d1);
-@@ -2921,8 +2914,6 @@ public abstract class LivingEntity extends Entity {
+@@ -2921,8 +2918,6 @@ public abstract class LivingEntity extends Entity {
          if (this.isSleeping()) {
              this.setXRot(0.0F);
          }
@@ -1467,7 +1464,7 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..8221ec36a6453aea8a2249fde93ebc8f
      }
  
      public void detectEquipmentUpdates() {
-@@ -3104,7 +3095,6 @@ public abstract class LivingEntity extends Entity {
+@@ -3104,7 +3099,6 @@ public abstract class LivingEntity extends Entity {
  
          this.setDeltaMovement(d4, d5, d6);
          this.level.getProfiler().push("ai");
@@ -1475,7 +1472,7 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..8221ec36a6453aea8a2249fde93ebc8f
          if (this.isImmobile()) {
              this.jumping = false;
              this.xxa = 0.0F;
-@@ -3114,7 +3104,6 @@ public abstract class LivingEntity extends Entity {
+@@ -3114,7 +3108,6 @@ public abstract class LivingEntity extends Entity {
              this.serverAiStep();
              this.level.getProfiler().pop();
          }
@@ -1483,7 +1480,7 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..8221ec36a6453aea8a2249fde93ebc8f
  
          this.level.getProfiler().pop();
          this.level.getProfiler().push("jump");
-@@ -3149,9 +3138,9 @@ public abstract class LivingEntity extends Entity {
+@@ -3149,9 +3142,9 @@ public abstract class LivingEntity extends Entity {
          this.updateFallFlying();
          AABB axisalignedbb = this.getBoundingBox();
  
@@ -1495,7 +1492,7 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..8221ec36a6453aea8a2249fde93ebc8f
          this.level.getProfiler().pop();
          this.level.getProfiler().push("freezing");
          boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES);
-@@ -3180,9 +3169,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3180,9 +3173,7 @@ public abstract class LivingEntity extends Entity {
              this.checkAutoSpinAttack(axisalignedbb, this.getBoundingBox());
          }