aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0548-Inline-shift-direction-fields.patch
blob: f0c71d61f20aa1876cf8225bdbe4fd1cb83c1aa0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
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() {