diff --git a/.upstream-data b/.upstream-data index 1df8b86..d622ff9 100644 --- a/.upstream-data +++ b/.upstream-data @@ -1,2 +1,2 @@ -purpurCommit = f6fd5f6ba6e672bfdbc79def7e8598d984ec8b3c -pufferfishCommit = 040d0aa58ee6bdadc1cb040de2cb24e9f3bf4fb2 +purpurCommit = db6f54b4d4744b050a1b3461e0a7169ae0ae199a +pufferfishCommit = 0b0390b5f86c4c6a98d777003ea412e40f78008c diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch index 15cb124..f7d6ad4 100644 --- a/patches/api/0001-Pufferfish-API-Changes.patch +++ b/patches/api/0001-Pufferfish-API-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Kevin Raneri -Date: Wed, 27 Sep 2023 05:21:18 +0000 +Date: Wed, 27 Sep 2023 09:35:56 +0000 Subject: [PATCH] Pufferfish API Changes Original: Kevin Raneri diff --git a/patches/api/0002-Purpur-API-Changes.patch b/patches/api/0002-Purpur-API-Changes.patch index 82cd868..37aa359 100644 --- a/patches/api/0002-Purpur-API-Changes.patch +++ b/patches/api/0002-Purpur-API-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath -Date: Wed, 27 Sep 2023 05:28:53 +0000 +Date: Wed, 27 Sep 2023 09:45:16 +0000 Subject: [PATCH] Purpur API Changes Original: PurpurMC diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index 18d3caf..ce37c99 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Kevin Raneri -Date: Wed, 27 Sep 2023 05:21:18 +0000 +Date: Wed, 27 Sep 2023 09:35:56 +0000 Subject: [PATCH] Pufferfish Server Changes Original: Kevin Raneri diff --git a/patches/server/0002-Purpur-Server-Changes.patch b/patches/server/0002-Purpur-Server-Changes.patch index 2b99cc9..23b6f59 100644 --- a/patches/server/0002-Purpur-Server-Changes.patch +++ b/patches/server/0002-Purpur-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath -Date: Wed, 27 Sep 2023 05:28:53 +0000 +Date: Wed, 27 Sep 2023 09:45:16 +0000 Subject: [PATCH] Purpur Server Changes Original: PurpurMC diff --git a/patches/server/0009-Console-logging-tweaks.patch b/patches/server/0009-Console-logging-tweaks.patch index ed50267..e225538 100644 --- a/patches/server/0009-Console-logging-tweaks.patch +++ b/patches/server/0009-Console-logging-tweaks.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Console logging tweaks diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index a970e00482952318c258fc406cb7c39a229b65bc..3fb6225335060b34b5c541e24dd3a261f24ddeb5 100644 +index a970e00482952318c258fc406cb7c39a229b65bc..879c090d9c4574a2cd45a0eb1bf9cb171834d940 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -180,16 +174,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -180,16 +180,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface DedicatedServer.LOGGER.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\""); } @@ -25,7 +25,7 @@ index a970e00482952318c258fc406cb7c39a229b65bc..3fb6225335060b34b5c541e24dd3a261 DedicatedServer.LOGGER.info("Loading properties"); DedicatedServerProperties dedicatedserverproperties = this.settings.getProperties(); -@@ -318,6 +302,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -318,6 +308,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord"; String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/"; // Paper end @@ -33,7 +33,7 @@ index a970e00482952318c258fc406cb7c39a229b65bc..3fb6225335060b34b5c541e24dd3a261 if (!this.usesAuthentication()) { DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware."); -@@ -331,9 +316,21 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -331,9 +322,21 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface DedicatedServer.LOGGER.warn("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose."); } // Spigot end