geforkt von Mirrors/Paper
64 Zeilen
2.4 KiB
Diff
64 Zeilen
2.4 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Spottedleaf <spottedleaf@spottedleaf.dev>
|
||
|
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 b70aa66732fb5e957aed0901f4c76358b2c56f8e..0cc0242d981586413bcc349df6e6fd3bc09710f1 100644
|
||
|
--- a/src/main/java/net/minecraft/core/BlockPos.java
|
||
|
+++ b/src/main/java/net/minecraft/core/BlockPos.java
|
||
|
@@ -478,9 +478,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 - force inline
|
||
|
+ this.y = y; // Paper - force inline
|
||
|
+ this.z = z; // Paper - force inline
|
||
|
return this;
|
||
|
}
|
||
|
|
||
|
@@ -544,19 +544,19 @@ public class BlockPos extends Vec3i {
|
||
|
// Paper start - comment out useless overrides @Override - TODO figure out why this is suddenly important to keep
|
||
|
@Override
|
||
|
public BlockPos.MutableBlockPos setX(int i) {
|
||
|
- super.setX(i);
|
||
|
+ this.x = i; // Paper
|
||
|
return this;
|
||
|
}
|
||
|
|
||
|
@Override
|
||
|
public BlockPos.MutableBlockPos setY(int i) {
|
||
|
- super.setY(i);
|
||
|
+ this.y = i; // Paper
|
||
|
return this;
|
||
|
}
|
||
|
|
||
|
@Override
|
||
|
public BlockPos.MutableBlockPos setZ(int i) {
|
||
|
- super.setZ(i);
|
||
|
+ this.z = i; // Paper
|
||
|
return this;
|
||
|
}
|
||
|
// Paper end
|
||
|
diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java
|
||
|
index dc7598a011c2b290a42df35593de0b6689c99c57..a90085cfb2e3944c40bf15812320ff5e2690d3b1 100644
|
||
|
--- a/src/main/java/net/minecraft/core/Vec3i.java
|
||
|
+++ b/src/main/java/net/minecraft/core/Vec3i.java
|
||
|
@@ -17,9 +17,9 @@ public class Vec3i implements Comparable<Vec3i> {
|
||
|
return IntStream.of(vec3i.getX(), vec3i.getY(), vec3i.getZ());
|
||
|
});
|
||
|
public static final Vec3i ZERO = new Vec3i(0, 0, 0);
|
||
|
- private int x;
|
||
|
- private int y;
|
||
|
- private int z;
|
||
|
+ protected int x; // Paper - protected
|
||
|
+ protected int y; // Paper - protected
|
||
|
+ protected int z; // Paper - protected
|
||
|
|
||
|
// Paper start
|
||
|
public boolean isValidLocation(net.minecraft.world.level.LevelHeightAccessor levelHeightAccessor) {
|