diff --git a/Spigot-Server-Patches/0547-Brand-support.patch b/Spigot-Server-Patches/0548-Brand-support.patch similarity index 100% rename from Spigot-Server-Patches/0547-Brand-support.patch rename to Spigot-Server-Patches/0548-Brand-support.patch diff --git a/Spigot-Server-Patches/Improved-Watchdog-Support.patch b/Spigot-Server-Patches/Improved-Watchdog-Support.patch index c04c5fe632..34cd7273c6 100644 --- a/Spigot-Server-Patches/Improved-Watchdog-Support.patch +++ b/Spigot-Server-Patches/Improved-Watchdog-Support.patch @@ -442,9 +442,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + tryPreloadClass("com.destroystokyo.paper.event.player.PlayerConnectionCloseEvent"); + tryPreloadClass("com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent"); + // Minecraft, seen during saving -+ tryPreloadClass("net.minecraft.server.LightEngineLayerEventListener$Void"); -+ tryPreloadClass("net.minecraft.server.LightEngineLayerEventListener"); -+ tryPreloadClass("net.minecraft.server.ExceptionSuppressor"); ++ tryPreloadClass("net.minecraft.world.level.lighting.LightEngineLayerEventListener$Void"); ++ tryPreloadClass("net.minecraft.world.level.lighting.LightEngineLayerEventListener"); ++ tryPreloadClass("net.minecraft.util.ExceptionSuppressor"); + // Paper end + } + } diff --git a/Spigot-Server-Patches/POM-Changes.patch b/Spigot-Server-Patches/POM-Changes.patch index a9f227f4ed..c8c5b16b20 100644 --- a/Spigot-Server-Patches/POM-Changes.patch +++ b/Spigot-Server-Patches/POM-Changes.patch @@ -59,8 +59,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + <dependency> + <groupId>io.papermc</groupId> <artifactId>minecraft-server</artifactId> - <version>${minecraft.version}-SNAPSHOT</version> +- <version>${minecraft.version}-SNAPSHOT</version> ++ <version>${minecraft.version}-R0.2-SNAPSHOT</version> <scope>compile</scope> + </dependency> + <dependency> @@ -0,0 +0,0 @@ <version>9.0</version> <scope>compile</scope> diff --git a/Spigot-Server-Patches/fixup-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/fixup-Improved-Watchdog-Support.patch deleted file mode 100644 index 3b6f893812..0000000000 --- a/Spigot-Server-Patches/fixup-Improved-Watchdog-Support.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Mariell Hoversholm <proximyst@proximyst.com> -Date: Tue, 16 Mar 2021 16:56:35 +0100 -Subject: [PATCH] fixup! Improved Watchdog Support - - -diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/bukkit/craftbukkit/Main.java -+++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -0,0 +0,0 @@ public class Main { - tryPreloadClass("com.destroystokyo.paper.event.player.PlayerConnectionCloseEvent"); - tryPreloadClass("com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent"); - // Minecraft, seen during saving -- tryPreloadClass("net.minecraft.server.LightEngineLayerEventListener$Void"); -- tryPreloadClass("net.minecraft.server.LightEngineLayerEventListener"); -- tryPreloadClass("net.minecraft.server.ExceptionSuppressor"); -+ tryPreloadClass("net.minecraft.world.level.lighting.LightEngineLayerEventListener$Void"); -+ tryPreloadClass("net.minecraft.world.level.lighting.LightEngineLayerEventListener"); -+ tryPreloadClass("net.minecraft.util.ExceptionSuppressor"); - // Paper end - } - } diff --git a/Spigot-Server-Patches/fixup-POM-Changes.patch b/Spigot-Server-Patches/fixup-POM-Changes.patch deleted file mode 100644 index b7c8c9cb64..0000000000 --- a/Spigot-Server-Patches/fixup-POM-Changes.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Mariell Hoversholm <proximyst@proximyst.com> -Date: Tue, 16 Mar 2021 17:06:29 +0100 -Subject: [PATCH] fixup! POM Changes - - -diff --git a/pom.xml b/pom.xml -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -0,0 +0,0 @@ - <dependency> - <groupId>io.papermc</groupId> - <artifactId>minecraft-server</artifactId> -- <version>${minecraft.version}-SNAPSHOT</version> -+ <version>${minecraft.version}-R0.2-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency>