From bd8e01c67541b9704819ba28a66c25b68416cb5f Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 3 Dec 2021 00:26:54 +0000
Subject: [PATCH] Updated Upstream (CraftBukkit)

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

CraftBukkit Changes:
03b725233 SPIGOT-6823: Fix loading custom world in combination with superflat
359d0533a #970: Correct typo in README.md
110492932 Fix per-world worldborder command
---
 .../Use-TerminalConsoleAppender-for-console-improvements.patch  | 2 +-
 work/CraftBukkit                                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch
index 396d79d1c9..2db47f39b5 100644
--- a/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -142,8 +142,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         this.options = options;
          this.datapackconfiguration = datapackconfiguration;
+         this.registryreadops = RegistryReadOps.createAndLoad(NbtOps.INSTANCE, datapackresources.getResourceManager(), iregistrycustom_dimension);
          this.vanillaCommandDispatcher = datapackresources.commands; // CraftBukkit
 +        // Paper start - Handled by TerminalConsoleAppender
          // Try to see if we're actually running in a terminal, disable jline if not
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 581df1846f..03b7252338 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 581df1846f2b3e09b20e71fd44851f3e68f1f7db
+Subproject commit 03b7252338767638cc23bed19f57bcaefd461a6e