mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-18 12:48:53 +01:00
c5a10665b8
Spigot still maintains some partial implementation of "tick skipping", a practice in which the MinecraftServer.currentTick field is updated not by an increment of one per actual tick, but instead set to System.currentTimeMillis() / 50. This behaviour means that the tracked tick may "skip" a tick value in case a previous tick took more than the expected 50ms. To compensate for this in important paths, spigot/craftbukkit implements "wall-time". Instead of incrementing/decrementing ticks on block entities/entities by one for each call to their tick() method, they instead increment/decrement important values, like an ItemEntity's age or pickupDelay, by the difference of `currentTick - lastTick`, where `lastTick` is the value of `currentTick` during the last tick() call. These "fixes" however do not play nicely with minecraft's simulation distance as entities/block entities implementing the above behaviour would "catch up" their values when moving from a non-ticking chunk to a ticking one as their `lastTick` value remains stuck on the last tick in a ticking chunk and hence lead to a large "catch up" once ticked again. Paper completely removes the "tick skipping" behaviour (See patch "Further-improve-server-tick-loop"), making the above precautions completely unnecessary, which also rids paper of the previous described incompatibility with non-ticking chunks.
56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Andrew Steinborn <git@steinborn.me>
|
|
Date: Mon, 18 Jan 2021 20:45:25 -0500
|
|
Subject: [PATCH] Inline shift direction fields
|
|
|
|
Removes a layer of indirection for EnumDirection.getAdjacent(X|Y|Z)(), which is in the
|
|
critical section for much of the server, including the lighting engine.
|
|
|
|
diff --git a/src/main/java/net/minecraft/core/Direction.java b/src/main/java/net/minecraft/core/Direction.java
|
|
index c47e6acbd36737aa7af13b452f51b3f017d324f4..03c45ee77276462818a6f774b5945b25924aa3f0 100644
|
|
--- a/src/main/java/net/minecraft/core/Direction.java
|
|
+++ b/src/main/java/net/minecraft/core/Direction.java
|
|
@@ -55,6 +55,12 @@ public enum Direction implements StringRepresentable {
|
|
.sorted(Comparator.comparingInt(direction -> direction.data2d))
|
|
.toArray(Direction[]::new);
|
|
|
|
+ // Paper start - Perf: Inline shift direction fields
|
|
+ private final int adjX;
|
|
+ private final int adjY;
|
|
+ private final int adjZ;
|
|
+ // Paper end - Perf: Inline shift direction fields
|
|
+
|
|
private Direction(
|
|
final int id,
|
|
final int idOpposite,
|
|
@@ -71,6 +77,11 @@ public enum Direction implements StringRepresentable {
|
|
this.axis = axis;
|
|
this.axisDirection = direction;
|
|
this.normal = vector;
|
|
+ // Paper start - Perf: Inline shift direction fields
|
|
+ this.adjX = vector.getX();
|
|
+ this.adjY = vector.getY();
|
|
+ this.adjZ = vector.getZ();
|
|
+ // Paper end - Perf: Inline shift direction fields
|
|
}
|
|
|
|
public static Direction[] orderedByNearest(Entity entity) {
|
|
@@ -234,15 +245,15 @@ public enum Direction implements StringRepresentable {
|
|
}
|
|
|
|
public int getStepX() {
|
|
- return this.normal.getX();
|
|
+ return this.adjX; // Paper - Perf: Inline shift direction fields
|
|
}
|
|
|
|
public int getStepY() {
|
|
- return this.normal.getY();
|
|
+ return this.adjY; // Paper - Perf: Inline shift direction fields
|
|
}
|
|
|
|
public int getStepZ() {
|
|
- return this.normal.getZ();
|
|
+ return this.adjZ; // Paper - Perf: Inline shift direction fields
|
|
}
|
|
|
|
public Vector3f step() {
|