add some more patches back

2023-06-08 10:48:28 -07:00 · 2023-06-08 10:48:28 -07:00 · b4ae928db9
commit b4ae928db9
parent 870dafe358
317 changed files with 16 additions and 48 deletions
--- a/patches/server/0690-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0690-Manually-inline-methods-in-BlockPosition.patch
@ -1,63 +0,0 @@
-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 441ea6b9fd55a5288f264472d7297728d0546d6b..83cab746d1d6fe25c043c8aee28c39412b90c127 100644
--- a/src/main/java/net/minecraft/core/BlockPos.java
-+++ b/src/main/java/net/minecraft/core/BlockPos.java
-@@ -515,9 +515,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;
-         }
- 
-@@ -581,19 +581,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 e87ef99260bff134529e00b9a75381cecaec01a4..74a3f2ba6aaec39ba4721fb546bfccb325c86343 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(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 - protected
-+    protected int y; // Paper - protected
-+    protected int z; // Paper - protected
- 
-     public static Codec<Vec3i> offsetCodec(int maxAbsValue) {
-         return ExtraCodecs.validate(CODEC, (vec) -> {