Paper/patches/server/0497-Inline-shift-direction-fields.patch

57 lines
2.1 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
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
2024-04-24 15:46:45 +02:00
index c47e6acbd36737aa7af13b452f51b3f017d324f4..03c45ee77276462818a6f774b5945b25924aa3f0 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/core/Direction.java
+++ b/src/main/java/net/minecraft/core/Direction.java
2024-04-24 15:46:45 +02:00
@@ -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
2021-06-11 14:02:28 +02:00
+ private final int adjX;
+ private final int adjY;
+ private final int adjZ;
+ // Paper end - Perf: Inline shift direction fields
+
2024-04-24 15:46:45 +02:00
private Direction(
final int id,
final int idOpposite,
@@ -71,6 +77,11 @@ public enum Direction implements StringRepresentable {
2021-06-15 04:59:31 +02:00
this.axis = axis;
this.axisDirection = direction;
this.normal = vector;
+ // Paper start - Perf: Inline shift direction fields
2021-06-15 04:59:31 +02:00
+ this.adjX = vector.getX();
+ this.adjY = vector.getY();
+ this.adjZ = vector.getZ();
+ // Paper end - Perf: Inline shift direction fields
2021-06-11 14:02:28 +02:00
}
public static Direction[] orderedByNearest(Entity entity) {
2024-04-24 15:46:45 +02:00
@@ -234,15 +245,15 @@ public enum Direction implements StringRepresentable {
2021-06-11 14:02:28 +02:00
}
public int getStepX() {
- return this.normal.getX();
+ return this.adjX; // Paper - Perf: Inline shift direction fields
2021-06-11 14:02:28 +02:00
}
public int getStepY() {
- return this.normal.getY();
+ return this.adjY; // Paper - Perf: Inline shift direction fields
2021-06-11 14:02:28 +02:00
}
public int getStepZ() {
- return this.normal.getZ();
+ return this.adjZ; // Paper - Perf: Inline shift direction fields
2021-06-11 14:02:28 +02:00
}
2021-06-15 04:59:31 +02:00
public Vector3f step() {