ef0e5a642d
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9ae3f10f SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API 48c0c547 PR-786: Add methods to get sounds from entities CraftBukkit Changes: 5cc9c022a SPIGOT-7152: Handle hand item changing during air interact event 4ffa1acf6 SPIGOT-7154: Players get kicked when interacting with a conversation 4daa21123 SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API e5d6a9bbf PR-1100: Add methods to get sounds from entities b7e9f1c8b SPIGOT-7146: Reduce use of Material switch in ItemMeta Spigot Changes: 4c157bb4 Rebuild patches
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 e68cd32a7db88f29d3224b0908119232ab3cf71a..153451ecd5b3c8e8ecb2d5ec91ccd582d4300899 100644
|
|
--- a/src/main/java/net/minecraft/core/BlockPos.java
|
|
+++ b/src/main/java/net/minecraft/core/BlockPos.java
|
|
@@ -484,9 +484,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;
|
|
}
|
|
|
|
@@ -550,19 +550,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 73b3c5f5c037fbe3f588f8f4b0113bef283632a4..c06c7da7de84bc764ea7b9612b3dc2303b49b22e 100644
|
|
--- a/src/main/java/net/minecraft/core/Vec3i.java
|
|
+++ b/src/main/java/net/minecraft/core/Vec3i.java
|
|
@@ -19,9 +19,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
|
|
|
|
private static Function<Vec3i, DataResult<Vec3i>> checkOffsetAxes(int maxAbsValue) {
|
|
return (vec) -> {
|