aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0985-Rewrite-chunk-system.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2024-04-26 16:17:13 -0700
committerJake Potrebic <[email protected]>2024-04-26 16:17:14 -0700
commit464cc81633f36fd5e73c95593e4460b1249e6bc1 (patch)
treeb6651b29d871e1079107dd8af1fb35e1c3c141f9 /patches/server/0985-Rewrite-chunk-system.patch
parent4c53acedce9bcd8dd2bb6f0e114215c3090f9e29 (diff)
downloadPaper-464cc81633f36fd5e73c95593e4460b1249e6bc1.tar.gz
Paper-464cc81633f36fd5e73c95593e4460b1249e6bc1.zip
fix custom potion mixes
Diffstat (limited to 'patches/server/0985-Rewrite-chunk-system.patch')
-rw-r--r--patches/server/0985-Rewrite-chunk-system.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0985-Rewrite-chunk-system.patch b/patches/server/0985-Rewrite-chunk-system.patch
index 0c0adbc485..97b19847e2 100644
--- a/patches/server/0985-Rewrite-chunk-system.patch
+++ b/patches/server/0985-Rewrite-chunk-system.patch
@@ -15684,7 +15684,7 @@ index c33f85b570f159ab465b5a10a8044a81f2797f43..244a19ecd0234fa1d7a6ecfea2075159
DedicatedServer dedicatedserver1 = new DedicatedServer(optionset, worldLoader.get(), thread, convertable_conversionsession, resourcepackrepository, worldstem, dedicatedserversettings, DataFixers.getDataFixer(), services, LoggerChunkProgressListener::createFromGameruleRadius);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 881679270a344f1a4d70c3c47871a495af202109..40708dfd84dc21bc5e047d9fb3b092cb854a8041 100644
+index 138ca522b2df3ccf49fcbd81446a73705141aa5f..7d33a4638660aaa55b2ef114efd6d618312b61c9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -318,7 +318,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -21612,7 +21612,7 @@ index 7dae8d91b74cc7df0745f0c121e3bea09b8d0b6d..1e2530c9e5212b6d2bdbc94817beddb4
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5467a5985eaf159e2a4f19dd5723d05d8f2d598e..66fa93a44a348f9cd300ec0c4a2d09a7a2bf47e1 100644
+index 68e13fa7021b0f9b889ff0b94623a31644c0616e..a17582292c2cdbc2b692071919500853cf9a7990 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1407,7 +1407,6 @@ public final class CraftServer implements Server {