From f5b2ba95cc9da10f84ecfe7b11eeee12ed60b3da Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Wed, 24 Aug 2022 20:48:03 -0500 Subject: [PATCH] oops, forgot this part in last commit --- patches/server/0002-Fix-pufferfish-issues.patch | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/patches/server/0002-Fix-pufferfish-issues.patch b/patches/server/0002-Fix-pufferfish-issues.patch index f6ced8897..d87b1f101 100644 --- a/patches/server/0002-Fix-pufferfish-issues.patch +++ b/patches/server/0002-Fix-pufferfish-issues.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix pufferfish issues diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java -index 38cb29c646ff496ffaa6553f98a565b71155c464..e03dd590b0c6c8e85d0f78f9ec48168753a92a48 100644 +index 38cb29c646ff496ffaa6553f98a565b71155c464..76bbaa30dd5ec60024129542f3bd5c2cac8ce426 100644 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java @@ -36,6 +36,7 @@ public class PufferfishConfig { @@ -16,6 +16,15 @@ index 38cb29c646ff496ffaa6553f98a565b71155c464..e03dd590b0c6c8e85d0f78f9ec481687 private static ConfigurationSection convertToBukkit(org.simpleyaml.configuration.ConfigurationSection section) { ConfigurationSection newSection = new MemoryConfiguration(); +@@ -58,7 +59,7 @@ public class PufferfishConfig { + } + + public static void load() throws IOException { +- File configFile = new File("pufferfish.yml"); ++ File configFile = pufferfishFile; // Purpur + + if (configFile.exists()) { + try { diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java index 519883c5549744e047a8a96afee142746fcb49cd..7cf328cf8d31f1041cb964a5a6289c27fd65d3bd 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java