core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix timings diff

This commit is contained in:
Nassim Jahnke 2022-07-27 21:22:02 +02:00
parent faafca851c
commit afb9e818fc
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
patches/server/0012-Timings-v2.patch
View File

@ -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 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 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/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; @@ -140,7 +140,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -1445,20 +1445,17 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..8221ec36a6453aea8a2249fde93ebc8f
super.tick(); super.tick();
this.updatingUsingItem(); this.updatingUsingItem();
this.updateSwimAmount(); 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 - SpigotTimings.timerEntityBaseTick.stopTiming(); // Spigot
- this.aiStep(); this.aiStep();
- SpigotTimings.timerEntityTickRest.startTiming(); // Spigot - SpigotTimings.timerEntityTickRest.startTiming(); // Spigot
- } }
-
double d0 = this.getX() - this.xo; double d0 = this.getX() - this.xo;
double d1 = this.getZ() - this.zo; @@ -2921,8 +2918,6 @@ public abstract class LivingEntity extends Entity {
float f = (float) (d0 * d0 + d1 * d1);
@@ -2921,8 +2914,6 @@ public abstract class LivingEntity extends Entity {
if (this.isSleeping()) { if (this.isSleeping()) {
this.setXRot(0.0F); this.setXRot(0.0F);
} }
@ -1467,7 +1464,7 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..8221ec36a6453aea8a2249fde93ebc8f
} }
public void detectEquipmentUpdates() { 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.setDeltaMovement(d4, d5, d6);
this.level.getProfiler().push("ai"); this.level.getProfiler().push("ai");
@ -1475,7 +1472,7 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..8221ec36a6453aea8a2249fde93ebc8f
if (this.isImmobile()) { if (this.isImmobile()) {
this.jumping = false; this.jumping = false;
this.xxa = 0.0F; 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.serverAiStep();
this.level.getProfiler().pop(); this.level.getProfiler().pop();
} }
@ -1483,7 +1480,7 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..8221ec36a6453aea8a2249fde93ebc8f
this.level.getProfiler().pop(); this.level.getProfiler().pop();
this.level.getProfiler().push("jump"); 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(); this.updateFallFlying();
AABB axisalignedbb = this.getBoundingBox(); AABB axisalignedbb = this.getBoundingBox();
@ -1495,7 +1492,7 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..8221ec36a6453aea8a2249fde93ebc8f
this.level.getProfiler().pop(); this.level.getProfiler().pop();
this.level.getProfiler().push("freezing"); this.level.getProfiler().push("freezing");
boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES); 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()); this.checkAutoSpinAttack(axisalignedbb, this.getBoundingBox());
} }