Rebase fixups

2024-10-25 12:24:15 -07:00 · 2024-10-25 12:24:15 -07:00 · b711764991
commit b711764991
parent 62e3bcdc3b
90 changed files with 3448 additions and 10434 deletions
--- a/patches/server/0596-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0596-Manually-inline-methods-in-BlockPosition.patch
@ -5,7 +5,7 @@ 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 eea8bea0f40db8d36c59e628babf788fa920df94..0d51fb4be8b49e3b57c3c55aff6bcf13d5c78ddd 100644
+index 8e00fd1a1fb0d73e800395f4b9fffdbdb6c6b5cb..a1d54d978d34d75475f92dfb806113586e7e449c 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
@@ -576,9 +576,9 @@ public class BlockPos extends Vec3i {