mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-19 17:15:23 +01:00
64 lines
2.7 KiB
Diff
64 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Mon, 6 Jul 2020 22:48:48 -0700
|
|
Subject: [PATCH] Manually inline methods in BlockPosition
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
|
|
index 19fdd77d4830b7218b627fdf4ed755d8935c00aa..4144c872fbd89d22827ad1f586e9a8d63a39ed46 100644
|
|
--- a/src/main/java/net/minecraft/core/BlockPos.java
|
|
+++ b/src/main/java/net/minecraft/core/BlockPos.java
|
|
@@ -558,9 +558,9 @@ public class BlockPos extends Vec3i {
|
|
}
|
|
|
|
public BlockPos.MutableBlockPos set(int x, int y, int z) {
|
|
- this.setX(x);
|
|
- this.setY(y);
|
|
- this.setZ(z);
|
|
+ this.x = x; // Paper - Perf: Manually inline methods in BlockPosition
|
|
+ this.y = y; // Paper - Perf: Manually inline methods in BlockPosition
|
|
+ this.z = z; // Paper - Perf: Manually inline methods in BlockPosition
|
|
return this;
|
|
}
|
|
|
|
@@ -625,19 +625,19 @@ public class BlockPos extends Vec3i {
|
|
|
|
@Override
|
|
public BlockPos.MutableBlockPos setX(int i) {
|
|
- super.setX(i);
|
|
+ this.x = i; // Paper - Perf: Manually inline methods in BlockPosition
|
|
return this;
|
|
}
|
|
|
|
@Override
|
|
public BlockPos.MutableBlockPos setY(int i) {
|
|
- super.setY(i);
|
|
+ this.y = i; // Paper - Perf: Manually inline methods in BlockPosition
|
|
return this;
|
|
}
|
|
|
|
@Override
|
|
public BlockPos.MutableBlockPos setZ(int i) {
|
|
- super.setZ(i);
|
|
+ this.z = i; // Paper - Perf: Manually inline methods in BlockPosition
|
|
return this;
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java
|
|
index df4c9b275752ad97a4efe9380ae0d511ee760695..02367ef1371dde94ff6c4cd40bd32e800d6ccaaf 100644
|
|
--- a/src/main/java/net/minecraft/core/Vec3i.java
|
|
+++ b/src/main/java/net/minecraft/core/Vec3i.java
|
|
@@ -16,9 +16,9 @@ public class Vec3i implements Comparable<Vec3i> {
|
|
vec -> IntStream.of(vec.getX(), vec.getY(), vec.getZ())
|
|
);
|
|
public static final Vec3i ZERO = new Vec3i(0, 0, 0);
|
|
- private int x;
|
|
- private int y;
|
|
- private int z;
|
|
+ protected int x; // Paper - Perf: Manually inline methods in BlockPosition; protected
|
|
+ protected int y; // Paper - Perf: Manually inline methods in BlockPosition; protected
|
|
+ protected int z; // Paper - Perf: Manually inline methods in BlockPosition; protected
|
|
|
|
public static Codec<Vec3i> offsetCodec(int maxAbsValue) {
|
|
return CODEC.validate(
|