From 8726ad9583aebc325bc5671e4b19db4ab5cefe67 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 12 Sep 2020 15:43:52 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: a0b8b886 Updated Upstream (CraftBukkit/Spigot) (#4318) fb71c71c Restore thread pool names for Bootstrap vs main 5b352d9b [Auto] Updated Upstream (Bukkit/CraftBukkit) --- Paper | 2 +- current-paper | 2 +- patches/server/0001-Tuinity-Server-Changes.patch | 12 ++++++------ patches/server/0002-Rebrand.patch | 4 ++-- patches/server/0003-Purpur-config-files.patch | 10 +++++----- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Paper b/Paper index 7d85344ef..a0b8b886c 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 7d85344efd873c58947be779015124cb18f87f92 +Subproject commit a0b8b886c894e14db15c6ab720d2831f83b2a848 diff --git a/current-paper b/current-paper index 9d692dfc1..0ffe89dba 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.3--5e33549a0469a6a8e7c2423751f46c056f5ac87c +1.16.3--1ecdab9bcef4e16833a40e9637f335822c5d5a20 diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index 8c9ece19b..98a9818a5 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -280,7 +280,7 @@ Simply return. Do not run vanilla update logic when eigencraft is enabled diff --git a/pom.xml b/pom.xml -index 838f199b6..f009b05e4 100644 +index add3a9c1a..5e25ae55e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ @@ -319,7 +319,7 @@ index 838f199b6..f009b05e4 100644 ${project.version} compile -@@ -164,15 +164,15 @@ +@@ -165,15 +165,15 @@ @@ -2984,10 +2984,10 @@ index 95ef96286..73163b417 100644 T t0 = this.h.a(this.a.a(i)); diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 0eabd62ad..c4bbe4463 100644 +index f55dc28f3..8542f2f4d 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -170,6 +170,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -166,6 +166,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer com.destroystokyo.paper.PaperConfig.registerCommands(); com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now // Paper end @@ -4509,7 +4509,7 @@ index fcd3388d8..6016a7bc5 100644 // Paper end - optimised tracker diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b067f3b70..602ed9aaa 100644 +index 05b3a7478..e4aab5348 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -326,19 +326,24 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -4662,7 +4662,7 @@ index 7ea293f38..e698dd226 100644 }); throw CancelledPacketHandleException.INSTANCE; diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 6d192b274..f5de49e3e 100644 +index 300fad4b4..06d284012 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -21,14 +21,29 @@ public class PlayerInteractManager { diff --git a/patches/server/0002-Rebrand.patch b/patches/server/0002-Rebrand.patch index 113abd03b..4eb5fb5de 100644 --- a/patches/server/0002-Rebrand.patch +++ b/patches/server/0002-Rebrand.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand diff --git a/pom.xml b/pom.xml -index f009b05e4..c6bd3d4fd 100644 +index 5e25ae55e..ce4989e93 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ @@ -65,7 +65,7 @@ index f009b05e4..c6bd3d4fd 100644 net.minecrell terminalconsoleappender -@@ -164,15 +178,15 @@ +@@ -165,15 +179,15 @@ diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch index 74927ee5e..858434781 100644 --- a/patches/server/0003-Purpur-config-files.patch +++ b/patches/server/0003-Purpur-config-files.patch @@ -29,10 +29,10 @@ index 8a19c9649..de75e33a6 100644 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 5907caa74..a60634fc4 100644 +index 8542f2f4d..050e0d7ec 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -168,6 +168,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -164,6 +164,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer return false; } com.destroystokyo.paper.PaperConfig.registerCommands(); @@ -49,7 +49,7 @@ index 5907caa74..a60634fc4 100644 // Paper end com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 4834f7569..e9e55c6f1 100644 +index a490662e0..9bb5f1bda 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -95,6 +95,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -344,7 +344,7 @@ index 000000000..4904be939 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0b789d179..7f5493a6d 100644 +index 6d21293e5..918ca762c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -855,6 +855,7 @@ public final class CraftServer implements Server { @@ -391,7 +391,7 @@ index 0b789d179..7f5493a6d 100644 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index b4e65963e..3261d2255 100644 +index a9c96d45c..b65629cac 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -146,6 +146,14 @@ public class Main {