mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (CraftBukkit) (#8680)

Browse source 
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:
2ed3e3e6e SPIGOT-7210: Fix structures in custom worlds
585ab5ba1 SPIGOT-7207: WorldCreator creates world as super flat even when normal is specified
This commit is contained in:
Jake Potrebic 2022-12-15 17:16:34 -08:00 • committed by GitHub
parent 28c7d40326
commit 262c08f64f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 109 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/server/0135-Use-TerminalConsoleAppender-for-console-improvements.patch
View file

@ -112,7 +112,7 @@ index 0000000000000000000000000000000000000000..685deaa0e5d1ddc13e3a7c0471b1cfcf
+
+}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index cdfbee9657c7a1664eb8e2f88bfa4f702fb46d4a..ece65ae90a71517a374a3ebbe0cb0ba514b44e2f 100644
index ddc446e54b69c79fa0153478bb859bf981e9da5c..fc040a4424144ecae03a039899f53227777cce05 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -168,7 +168,7 @@ import com.mojang.datafixers.util.Pair;
@ -236,7 +236,7 @@ index 67e13b8510eeecf16caae9fbbbeb463b794c460d..07be6f1e87b62772728abd2e48af91f1
this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0f2967f133fa5a3477179252286cbe8c9badb8ad..565f9d18b529974c53e6aa8cefa5fc01ad7ad0fd 100644
index 5e4bd49319c20461d5828489d0379601e0398005..bc2bbddde33738db0e46f0dbe39fe62c6d34126b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -48,7 +48,6 @@ import java.util.logging.Level;
@ -247,7 +247,7 @@ index 0f2967f133fa5a3477179252286cbe8c9badb8ad..565f9d18b529974c53e6aa8cefa5fc01
import net.minecraft.advancements.Advancement;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
@@ -1300,9 +1299,13 @@ public final class CraftServer implements Server {
@@ -1303,9 +1302,13 @@ public final class CraftServer implements Server {
return this.logger;
}
@ -262,7 +262,7 @@ index 0f2967f133fa5a3477179252286cbe8c9badb8ad..565f9d18b529974c53e6aa8cefa5fc01
@Override
public PluginCommand getPluginCommand(String name) {
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index a8971e81ff8bb9041f0ec22f0c178148c64f503f..be564acab5459313bd7c76c0f128f7e4b620fcdc 100644
index 1cbea000018436fcbc343e7512a0700c776d6441..75f5a3eb8730af1fea5bedbe168dcffacdbc85ad 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -12,7 +12,7 @@ import java.util.logging.Level;