From 9bcd08cb3c41d470d7bd5cafcf513db81a29c833 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Feb 2021 16:11:50 -0500 Subject: [PATCH] [CI-SKIP] [Auto] Rebuild Patches A recent commit has been made that caused patches to be out of order, rebuilding --- ...-debugging-dumps.patch => 0676-misc-debugging-dumps.patch} | 4 ++-- ... => 0677-Add-support-for-hex-color-codes-in-console.patch} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename Spigot-Server-Patches/{0675-misc-debugging-dumps.patch => 0676-misc-debugging-dumps.patch} (96%) rename Spigot-Server-Patches/{0676-Add-support-for-hex-color-codes-in-console.patch => 0677-Add-support-for-hex-color-codes-in-console.patch} (100%) diff --git a/Spigot-Server-Patches/0675-misc-debugging-dumps.patch b/Spigot-Server-Patches/0676-misc-debugging-dumps.patch similarity index 96% rename from Spigot-Server-Patches/0675-misc-debugging-dumps.patch rename to Spigot-Server-Patches/0676-misc-debugging-dumps.patch index f168919837..c175861f81 100644 --- a/Spigot-Server-Patches/0675-misc-debugging-dumps.patch +++ b/Spigot-Server-Patches/0676-misc-debugging-dumps.patch @@ -62,7 +62,7 @@ index ccf2d0b090f0c360dfc7886bb0726e099acec42c..ccac3589820f244f36dac310d08091f2 try { this.serverThread.join(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 85023c68a9c85802383cfcf52ec21392abdf3d85..ea1c47ff81d88e1b8d003b66e992727b943b7186 100644 +index cd02c294ebbf95bf939a2d19feff0e29bb87edb1..968349163b15cf40dac9717072740ce48231b7c8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -18,6 +18,7 @@ import com.mojang.serialization.Lifecycle; @@ -73,7 +73,7 @@ index 85023c68a9c85802383cfcf52ec21392abdf3d85..ea1c47ff81d88e1b8d003b66e992727b import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; import java.awt.image.BufferedImage; import java.io.File; -@@ -938,6 +939,7 @@ public final class CraftServer implements Server { +@@ -941,6 +942,7 @@ public final class CraftServer implements Server { plugin.getDescription().getName(), "This plugin is not properly shutting down its async tasks when it is being reloaded. This may cause conflicts with the newly loaded version of the plugin" )); diff --git a/Spigot-Server-Patches/0676-Add-support-for-hex-color-codes-in-console.patch b/Spigot-Server-Patches/0677-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from Spigot-Server-Patches/0676-Add-support-for-hex-color-codes-in-console.patch rename to Spigot-Server-Patches/0677-Add-support-for-hex-color-codes-in-console.patch