mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
55 lines
1.9 KiB
Diff
55 lines
1.9 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 3abec6de94f0ef1d788320e33653c598887f17ca..d0a8092bf57a29ab7c00ec0ddf52a9fdb2a33267 100644
|
|
--- a/src/main/java/net/minecraft/core/Direction.java
|
|
+++ b/src/main/java/net/minecraft/core/Direction.java
|
|
@@ -52,6 +52,11 @@ public enum Direction implements StringRepresentable {
|
|
})).toArray((i) -> {
|
|
return new Direction[i];
|
|
});
|
|
+ // Paper start
|
|
+ private final int adjX;
|
|
+ private final int adjY;
|
|
+ private final int adjZ;
|
|
+ // Paper end
|
|
|
|
private Direction(int id, int idOpposite, int idHorizontal, String name, Direction.AxisDirection direction, Direction.Axis axis, Vec3i vector) {
|
|
this.data3d = id;
|
|
@@ -61,6 +66,11 @@ public enum Direction implements StringRepresentable {
|
|
this.axis = axis;
|
|
this.axisDirection = direction;
|
|
this.normal = vector;
|
|
+ // Paper start
|
|
+ this.adjX = vector.getX();
|
|
+ this.adjY = vector.getY();
|
|
+ this.adjZ = vector.getZ();
|
|
+ // Paper end
|
|
}
|
|
|
|
public static Direction[] orderedByNearest(Entity entity) {
|
|
@@ -348,15 +358,15 @@ public enum Direction implements StringRepresentable {
|
|
}
|
|
|
|
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
|
|
}
|
|
|
|
public Vector3f step() {
|