testserver/patches/server/0610-Inline-shift-direction...

56 lines
2.0 KiB
Diff
Raw Normal View History

2021-06-11 12:02:28 +00: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
2021-06-15 02:59:31 +00:00
index e8e9494f7f337ee91a56fbd299da015dcda4a81b..593d6251c75ec337175d08b85000239ba7da1af2 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/core/Direction.java
+++ b/src/main/java/net/minecraft/core/Direction.java
2021-06-15 02:59:31 +00:00
@@ -62,6 +62,11 @@ public enum Direction implements StringRepresentable {
}, (direction1, direction2) -> {
2021-06-11 12:02:28 +00:00
throw new IllegalArgumentException("Duplicate keys");
}, Long2ObjectOpenHashMap::new));
+ // Paper start
+ private final int adjX;
+ private final int adjY;
+ private final int adjZ;
+ // Paper end
2021-06-15 02:59:31 +00:00
private Direction(int id, int idOpposite, int idHorizontal, String name, Direction.AxisDirection direction, Direction.Axis axis, Vec3i vector) {
this.data3d = id;
@@ -71,6 +76,11 @@ public enum Direction implements StringRepresentable {
this.axis = axis;
this.axisDirection = direction;
this.normal = vector;
2021-06-11 12:02:28 +00:00
+ // Paper start
2021-06-15 02:59:31 +00:00
+ this.adjX = vector.getX();
+ this.adjY = vector.getY();
+ this.adjZ = vector.getZ();
2021-06-11 12:02:28 +00:00
+ // Paper end
}
public static Direction[] orderedByNearest(Entity entity) {
2021-06-15 02:59:31 +00:00
@@ -310,15 +320,15 @@ public enum Direction implements StringRepresentable {
2021-06-11 12:02:28 +00:00
}
public int getStepX() {
- return this.normal.getX();
+ return this.adjX; // Paper
}
public int getStepY() {
- return this.normal.getY();
+ return this.adjY; // Paper
}
public int getStepZ() {
- return this.normal.getZ();
+ return this.adjZ; // Paper
}
2021-06-15 02:59:31 +00:00
public Vector3f step() {