OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-29 19:52:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

[CI-SKIP] [Auto] Rebuild Patches

Browse source 
A recent commit has been made that caused patches to be out of order, rebuilding
This commit is contained in:
Aikar 2021-02-23 16:11:50 -05:00
parent ea6fd6076c
commit 9bcd08cb3c
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Spigot-Server-Patches/0675-misc-debugging-dumps.patch → Spigot-Server-Patches/0676-misc-debugging-dumps.patch
View file

@ -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"
));

0
Spigot-Server-Patches/0676-Add-support-for-hex-color-codes-in-console.patch → Spigot-Server-Patches/0677-Add-support-for-hex-color-codes-in-console.patch
View file