Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e6ef1ba [ci skip] Update download urls (#9100) PaperMC/Paper@9367e6e Prevent GameEvents being fired from unloaded chunks PaperMC/Paper@9b77660 Port airplane's use array for gamerule storage patch (#9087)
2026-02-17 16:37:43 +01:00 · 2023-04-06 15:30:17 -04:00
parent 285f9f683d
commit 4155131661
7 changed files with 984 additions and 269 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.4-R0.1-SNAPSHOT

-paperCommit = 497b91939cf2972bac5337487f9f71770044fbc8
+paperCommit = 9b77660f070a0ea2c0d82293d731ff19f60e9787

 org.gradle.caching = true
 org.gradle.parallel = true
--- a/patches/api/0001-Pufferfish-API-Changes.patch
+++ b/patches/api/0001-Pufferfish-API-Changes.patch
@@ -47,7 +47,7 @@ index cad12a2632b9ebb569280441c42869685db1f31a..b83e2c5a0a094002d12aee55ec0cf8d1
         into("META-INF/maven/${project.group}/${project.name}")
 diff --git a/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..6fbaf2a232745db0a41394b1c2cc0cc90cefc4ee
+index 0000000000000000000000000000000000000000..10310fdd53de28efb8a8250f6d3b0c8eb08fb68a
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java
@@ -0,0 +1,161 @@
@@ -69,21 +69,21 @@ index 0000000000000000000000000000000000000000..6fbaf2a232745db0a41394b1c2cc0cc9
 +import org.jetbrains.annotations.Nullable;
 +
 +public class SentryContext {
-+
+	
 +	private static final Gson GSON = new Gson();
-+
+	
 +	public static void setPluginContext(@Nullable Plugin plugin) {
 +		if (plugin != null) {
 +			ThreadContext.put("pufferfishsentry_pluginname", plugin.getName());
 +			ThreadContext.put("pufferfishsentry_pluginversion", plugin.getDescription().getVersion());
 +		}
 +	}
-+
+	
 +	public static void removePluginContext() {
 +		ThreadContext.remove("pufferfishsentry_pluginname");
 +		ThreadContext.remove("pufferfishsentry_pluginversion");
 +	}
-+
+	
 +	public static void setSenderContext(@Nullable CommandSender sender) {
 +		if (sender != null) {
 +			ThreadContext.put("pufferfishsentry_playername", sender.getName());
@@ -92,15 +92,15 @@ index 0000000000000000000000000000000000000000..6fbaf2a232745db0a41394b1c2cc0cc9
 +			}
 +		}
 +	}
-+
+	
 +	public static void removeSenderContext() {
 +		ThreadContext.remove("pufferfishsentry_playername");
 +		ThreadContext.remove("pufferfishsentry_playerid");
 +	}
-+
+	
 +	public static void setEventContext(Event event, RegisteredListener registration) {
 +		setPluginContext(registration.getPlugin());
-+
+		
 +		try {
 +			// Find the player that was involved with this event
 +			Player player = null;
@@ -108,36 +108,36 @@ index 0000000000000000000000000000000000000000..6fbaf2a232745db0a41394b1c2cc0cc9
 +				player = ((PlayerEvent) event).getPlayer();
 +			} else {
 +				Class<? extends Event> eventClass = event.getClass();
-+
+				
 +				Field playerField = null;
-+
+				
 +				for (Field field : eventClass.getDeclaredFields()) {
 +					if (field.getType().equals(Player.class)) {
 +						playerField = field;
 +						break;
 +					}
 +				}
-+
+				
 +				if (playerField != null) {
 +					playerField.setAccessible(true);
 +					player = (Player) playerField.get(event);
 +				}
 +			}
-+
+			
 +			if (player != null) {
 +				setSenderContext(player);
 +			}
 +		} catch (Exception e) {} // We can't really safely log exceptions.
-+
+		
 +		ThreadContext.put("pufferfishsentry_eventdata", GSON.toJson(serializeFields(event)));
 +	}
-+
+	
 +	public static void removeEventContext() {
 +		removePluginContext();
 +		removeSenderContext();
 +		ThreadContext.remove("pufferfishsentry_eventdata");
 +	}
-+
+	
 +	private static Map<String, String> serializeFields(Object object) {
 +		Map<String, String> fields = new TreeMap<>();
 +		fields.put("_class", object.getClass().getName());
@@ -146,7 +146,7 @@ index 0000000000000000000000000000000000000000..6fbaf2a232745db0a41394b1c2cc0cc9
 +				if (Modifier.isStatic(declaredField.getModifiers())) {
 +					continue;
 +				}
-+
+				
 +				String fieldName = declaredField.getName();
 +				if (fieldName.equals("handlers")) {
 +					continue;
@@ -162,51 +162,51 @@ index 0000000000000000000000000000000000000000..6fbaf2a232745db0a41394b1c2cc0cc9
 +		}
 +		return fields;
 +	}
-+
+	
 +	public static class State {
-+
+		
 +		private Plugin plugin;
 +		private Command command;
 +		private String commandLine;
 +		private Event event;
 +		private RegisteredListener registeredListener;
-+
+		
 +		public Plugin getPlugin() {
 +			return plugin;
 +		}
-+
+		
 +		public void setPlugin(Plugin plugin) {
 +			this.plugin = plugin;
 +		}
-+
+		
 +		public Command getCommand() {
 +			return command;
 +		}
-+
+		
 +		public void setCommand(Command command) {
 +			this.command = command;
 +		}
-+
+		
 +		public String getCommandLine() {
 +			return commandLine;
 +		}
-+
+		
 +		public void setCommandLine(String commandLine) {
 +			this.commandLine = commandLine;
 +		}
-+
+		
 +		public Event getEvent() {
 +			return event;
 +		}
-+
+		
 +		public void setEvent(Event event) {
 +			this.event = event;
 +		}
-+
+		
 +		public RegisteredListener getRegisteredListener() {
 +			return registeredListener;
 +		}
-+
+		
 +		public void setRegisteredListener(RegisteredListener registeredListener) {
 +			this.registeredListener = registeredListener;
 +		}
@@ -214,7 +214,7 @@ index 0000000000000000000000000000000000000000..6fbaf2a232745db0a41394b1c2cc0cc9
 +}
 diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..6d266ebf5e52745ad13e90e5754b524383fa9b29
+index 0000000000000000000000000000000000000000..ab5fea0b03224bf249352ce340e94704ff713345
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
@@ -0,0 +1,40 @@
@@ -231,7 +231,7 @@ index 0000000000000000000000000000000000000000..6d266ebf5e52745ad13e90e5754b5243
 + */
 +@Deprecated
 +public class SIMDChecker {
-+
+	
 +	@Deprecated
 +	public static boolean canEnable(Logger logger) {
 +		try {
@@ -239,13 +239,13 @@ index 0000000000000000000000000000000000000000..6d266ebf5e52745ad13e90e5754b5243
 +				return false;
 +			} else {
 +				SIMDDetection.testRun = true;
-+
+				
 +				VectorSpecies<Integer> ISPEC = IntVector.SPECIES_PREFERRED;
 +				VectorSpecies<Float> FSPEC = FloatVector.SPECIES_PREFERRED;
-+
+				
 +				logger.log(Level.INFO, "Max SIMD vector size on this system is " + ISPEC.vectorBitSize() + " bits (int)");
 +				logger.log(Level.INFO, "Max SIMD vector size on this system is " + FSPEC.vectorBitSize() + " bits (float)");
-+
+				
 +				if (ISPEC.elementSize() < 2 || FSPEC.elementSize() < 2) {
 +					logger.log(Level.WARNING, "SIMD is not properly supported on this system!");
 +					return false;
@@ -256,11 +256,11 @@ index 0000000000000000000000000000000000000000..6d266ebf5e52745ad13e90e5754b5243
 +		} catch (NoClassDefFoundError | Exception ignored) {} // Basically, we don't do anything. This lets us detect if it's not functional and disable it.
 +		return false;
 +	}
-+
+	
 +}
 diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..fd708554d6dab2ddcd24c3024330b8ebf9462111
+index 0000000000000000000000000000000000000000..a84889d3e9cfc4d7ab5f867820a6484c6070711b
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java
@@ -0,0 +1,35 @@
@@ -270,11 +270,11 @@ index 0000000000000000000000000000000000000000..fd708554d6dab2ddcd24c3024330b8eb
 +
 +@Deprecated
 +public class SIMDDetection {
-+
+	
 +	public static boolean isEnabled = false;
 +	public static boolean versionLimited = false;
 +	public static boolean testRun = false;
-+
+	
 +	@Deprecated
 +	public static boolean canEnable(Logger logger) {
 +		try {
@@ -283,7 +283,7 @@ index 0000000000000000000000000000000000000000..fd708554d6dab2ddcd24c3024330b8eb
 +			return false;
 +		}
 +	}
-+
+	
 +	@Deprecated
 +	public static int getJavaVersion() {
 +		// https://stackoverflow.com/a/2591122
@@ -297,11 +297,11 @@ index 0000000000000000000000000000000000000000..fd708554d6dab2ddcd24c3024330b8eb
 +		version = version.split("-")[0]; // Azul is stupid
 +		return Integer.parseInt(version);
 +	}
-+
+	
 +}
 diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java b/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..20ec3b29b0cb4061cc89d635b3929ffe71008e22
+index 0000000000000000000000000000000000000000..ae2464920c9412ac90b819a540ee58be0741465f
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java
@@ -0,0 +1,83 @@
@@ -316,10 +316,10 @@ index 0000000000000000000000000000000000000000..20ec3b29b0cb4061cc89d635b3929ffe
 +
 +@Deprecated
 +public class VectorMapPalette {
-+
+	
 +	private static final VectorSpecies<Integer> I_SPEC = IntVector.SPECIES_PREFERRED;
 +	private static final VectorSpecies<Float> F_SPEC = FloatVector.SPECIES_PREFERRED;
-+
+	
 +	@Deprecated
 +	public static void matchColorVectorized(int[] in, byte[] out) {
 +		int speciesLength = I_SPEC.length();
@@ -329,64 +329,64 @@ index 0000000000000000000000000000000000000000..20ec3b29b0cb4061cc89d635b3929ffe
 +			float[] bluesArr = new float[speciesLength];
 +			float[] greensArr = new float[speciesLength];
 +			int[] alphasArr = new int[speciesLength];
-+
+			
 +			for (int j = 0; j < speciesLength; j++) {
 +				alphasArr[j] = (in[i + j] >> 24) & 0xFF;
 +				redsArr[j] = (in[i + j] >> 16) & 0xFF;
 +				greensArr[j] = (in[i + j] >> 8) & 0xFF;
 +				bluesArr[j] = (in[i + j] >> 0) & 0xFF;
 +			}
-+
+			
 +			IntVector alphas = IntVector.fromArray(I_SPEC, alphasArr, 0);
 +			FloatVector reds = FloatVector.fromArray(F_SPEC, redsArr, 0);
 +			FloatVector greens = FloatVector.fromArray(F_SPEC, greensArr, 0);
 +			FloatVector blues = FloatVector.fromArray(F_SPEC, bluesArr, 0);
 +			IntVector resultIndex = IntVector.zero(I_SPEC);
 +			VectorMask<Integer> modificationMask = VectorMask.fromLong(I_SPEC, 0xffffffff);
-+
+			
 +			modificationMask = modificationMask.and(alphas.lt(128).not());
 +			FloatVector bestDistances = FloatVector.broadcast(F_SPEC, Float.MAX_VALUE);
-+
+			
 +			for (int c = 4; c < MapPalette.colors.length; c++) {
 +				// We're using 32-bit floats here because it's 2x faster and nobody will know the difference.
 +				// For correctness, the original algorithm uses 64-bit floats instead. Completely unnecessary.
 +				FloatVector compReds = FloatVector.broadcast(F_SPEC, MapPalette.colors[c].getRed());
 +				FloatVector compGreens = FloatVector.broadcast(F_SPEC, MapPalette.colors[c].getGreen());
 +				FloatVector compBlues = FloatVector.broadcast(F_SPEC, MapPalette.colors[c].getBlue());
-+
+				
 +				FloatVector rMean = reds.add(compReds).div(2.0f);
 +				FloatVector rDiff = reds.sub(compReds);
 +				FloatVector gDiff = greens.sub(compGreens);
 +				FloatVector bDiff = blues.sub(compBlues);
-+
+				
 +				FloatVector weightR = rMean.div(256.0f).add(2);
 +				FloatVector weightG = FloatVector.broadcast(F_SPEC, 4.0f);
 +				FloatVector weightB = FloatVector.broadcast(F_SPEC, 255.0f).sub(rMean).div(256.0f).add(2.0f);
-+
+				
 +				FloatVector distance = weightR.mul(rDiff).mul(rDiff).add(weightG.mul(gDiff).mul(gDiff)).add(weightB.mul(bDiff).mul(bDiff));
-+
+				
 +				// Now we compare to the best distance we've found.
 +				// This mask contains a "1" if better, and a "0" otherwise.
 +				VectorMask<Float> bestDistanceMask = distance.lt(bestDistances);
 +				bestDistances = bestDistances.blend(distance, bestDistanceMask); // Update the best distances
-+
+				
 +				// Update the result array
 +				// We also AND with the modification mask because we don't want to interfere if the alpha value isn't large enough.
 +				resultIndex = resultIndex.blend(c, bestDistanceMask.cast(I_SPEC).and(modificationMask)); // Update the results
 +			}
-+
+			
 +			for (int j = 0; j < speciesLength; j++) {
 +				int index = resultIndex.lane(j);
 +				out[i + j] = (byte) (index < 128 ? index : -129 + (index - 127));
 +			}
 +		}
-+
+		
 +		// For the final ones, fall back to the regular method
 +		for (; i < in.length; i++) {
 +			out[i] = MapPalette.matchColor(new Color(in[i], true));
 +		}
 +	}
-+
+	
 +}
 diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java
 index 3a9aaca2e76411a9c27f9f5e0f22d060d5a66d06..9584e245144b561b4f6745b2f26a4f69a6f92891 100644
@@ -426,7 +426,7 @@ index 3a9aaca2e76411a9c27f9f5e0f22d060d5a66d06..9584e245144b561b4f6745b2f26a4f69
     }
 
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 2b8308989fce7f8a16907f8711b362e671fdbfb6..bd4d1a40f53784662174d426533ef4b5433a15b7 100644
+index fc2dae69165776d08274e34a69962cc70445f411..899d67fa782fac639fe7fb096e05c551d75bd647 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -584,7 +584,9 @@ public final class SimplePluginManager implements PluginManager {
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
--- a/patches/server/0002-Fix-pufferfish-issues.patch
+++ b/patches/server/0002-Fix-pufferfish-issues.patch
@@ -5,10 +5,10 @@ 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 a8cead500186142115d4dc029c942fdfc68f7fe5..866498779e824b971479e92b736b97aa05ce48a3 100644
+index e0076044d0a29e33ee297fe6180a041436075297..e6b26f883c4cc0473cfddb091b8b1b2e58cb1b72 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-@@ -224,7 +224,7 @@ public class PufferfishConfig {
+@@ -232,7 +232,7 @@ public class PufferfishConfig {
     public static int activationDistanceMod;
 
     private static void dynamicActivationOfBrains() throws IOException {
@@ -17,8 +17,8 @@ index a8cead500186142115d4dc029c942fdfc68f7fe5..866498779e824b971479e92b736b97aa
         startDistance = getInt("dab.start-distance", "activation-range.start-distance", 12,
                 "This value determines how far away an entity has to be",
                 "from the player to start being effected by DEAR.");
-@@ -268,7 +268,7 @@ public class PufferfishConfig {
- 
+@@ -276,7 +276,7 @@ public class PufferfishConfig {
+     
     public static boolean throttleInactiveGoalSelectorTick;
 	private static void inactiveGoalSelectorThrottle() {
 -		getBoolean("inactive-goal-selector-throttle", "inactive-goal-selector-disable", true,
@@ -27,7 +27,7 @@ index a8cead500186142115d4dc029c942fdfc68f7fe5..866498779e824b971479e92b736b97aa
 				"This can improve performance by a few percent, but has minor gameplay implications.");
 	}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ff2862bf1f511196d1e911e2584262ed728e9a81..87d6b8e0cd8fec7959fb052dce1b73feb8cdb967 100644
+index 88a6198ea5b0fd33f90737d9515c349791ca81b4..c1cf3e09d12adf90554fc10553a2b461c52dbfd6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -807,7 +807,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
--- a/patches/server/0003-Rebrand.patch
+++ b/patches/server/0003-Rebrand.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand


 diff --git a/build.gradle.kts b/build.gradle.kts
-index b41b186397d013c19436c345be98b785d4bd0295..22470f0ab8354a9f31a0f195f3fe80f2f5ee2f0e 100644
+index 3c8293f002f11b430083502362fdc801f44aa138..6c5b3f6a2c4f7b20e3388b63c36b7c4bc4cf179f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -7,12 +7,8 @@ plugins {
@@ -34,7 +34,7 @@ index b41b186397d013c19436c345be98b785d4bd0295..22470f0ab8354a9f31a0f195f3fe80f2
     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
-@@ -81,7 +81,7 @@ tasks.jar {
+@@ -82,7 +82,7 @@ tasks.jar {
         attributes(
             "Main-Class" to "org.bukkit.craftbukkit.Main",
             "Implementation-Title" to "CraftBukkit",
@@ -43,7 +43,7 @@ index b41b186397d013c19436c345be98b785d4bd0295..22470f0ab8354a9f31a0f195f3fe80f2
             "Implementation-Vendor" to date, // Paper
             "Specification-Title" to "Bukkit",
             "Specification-Version" to project.version,
-@@ -153,7 +153,7 @@ fun TaskContainer.registerRunTask(
+@@ -154,7 +154,7 @@ fun TaskContainer.registerRunTask(
     name: String,
     block: JavaExec.() -> Unit
 ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -53,7 +53,7 @@ index b41b186397d013c19436c345be98b785d4bd0295..22470f0ab8354a9f31a0f195f3fe80f2
     standardInput = System.`in`
     workingDir = rootProject.layout.projectDirectory
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index bf42969859545a8a520923ef1836ffa4a5cc24a0..462a6eed350fd660ddaf25d567bb6e97b77d0b2b 100644
+index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..462a6eed350fd660ddaf25d567bb6e97b77d0b2b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
@@ -19,8 +19,10 @@ import java.util.stream.StreamSupport;
@@ -61,7 +61,7 @@ index bf42969859545a8a520923ef1836ffa4a5cc24a0..462a6eed350fd660ddaf25d567bb6e97
 public class PaperVersionFetcher implements VersionFetcher {
     private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
 -    private static final String GITHUB_BRANCH_NAME = "master";
-    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads";
+-    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper";
 +    // Purpur start
 +    private static final String DOWNLOAD_PAGE = "https://purpurmc.org/downloads";
 +    private static int distance = -2; public int distance() { return distance; }
@@ -175,7 +175,7 @@ index abe37c7c3c6f5ab73afd738ec78f06d7e4d2ed96..b5b6657e52e4f7a630229bd3ba433438
         stringbuilder.append(CrashReport.getErrorComment());
         stringbuilder.append("\n\n");
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 644a7f020afd26017543056fd9378868b1874fe8..5440cd26b9d6cc3988ced96490539d9a794c3a6b 100644
+index a29d92b3f2658b63545b25092bb3a1fea46ca36b..0f6d1c56efbab0f9b84f09f7dc27eb705f4006a9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -927,7 +927,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -197,7 +197,7 @@ index 644a7f020afd26017543056fd9378868b1874fe8..5440cd26b9d6cc3988ced96490539d9a
 
     public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b2d94582037c091bd6a04451bf62b3f9c4923d19..430df6a2b852f07e3a1cd9dfcd5ecf3e52e63b66 100644
+index 7672fe8e6d08370327bb7ad5fa5ac3292c49e3c4..b31f59ecb41fc3a63b1f4ef1a9e267ad1f100175 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -256,7 +256,7 @@ import javax.annotation.Nullable; // Paper
--- a/patches/server/0245-Allow-void-trading.patch
+++ b/patches/server/0245-Allow-void-trading.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow void trading


 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 34761f14354ce29db48859ebb142740ea6b53ff9..e0951fd02868f04bb12afab15b73b6d41e814abd 100644
+index 88722e911bb342d989c0d750f90bc4224351d0ed..b58c07f454fa0b6911f344899c414983fda4b115 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2682,7 +2682,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2685,7 +2685,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
             // Spigot Start
             if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
                 // Paper start
@@ -18,7 +18,7 @@ index 34761f14354ce29db48859ebb142740ea6b53ff9..e0951fd02868f04bb12afab15b73b6d4
                 }
                 // Paper end
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 74583d5034002bc9fb1229fba1f1cf4348828359..0015c6ba0e4d400e309b386246418635a969a751 100644
+index 904849c26b8ef5197500a45b371f49411e415100..8ab5e0ec388f18196242c8fa1672a4729019bdbe 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -425,6 +425,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0285-Make-pufferfish-config-relocatable.patch
+++ b/patches/server/0285-Make-pufferfish-config-relocatable.patch
@@ -5,24 +5,24 @@ Subject: [PATCH] Make pufferfish config relocatable


 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-index 866498779e824b971479e92b736b97aa05ce48a3..62b2a3a44929b80b813bc24a33cd1f5049fecbb2 100644
+index e6b26f883c4cc0473cfddb091b8b1b2e58cb1b72..c0f44f0593aab16d5ceab493f4075772f454732e 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-@@ -28,6 +28,7 @@ public class PufferfishConfig {
- 
+@@ -36,6 +36,7 @@ public class PufferfishConfig {
+ 	
 	private static final YamlFile config = new YamlFile();
 	private static int updates = 0;
 +	public static File pufferfishFile; // Purpur
- 
+ 	
 	private static ConfigurationSection convertToBukkit(org.simpleyaml.configuration.ConfigurationSection section) {
 		ConfigurationSection newSection = new MemoryConfiguration();
-@@ -50,7 +51,7 @@ public class PufferfishConfig {
+@@ -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
@@ -38,7 +38,7 @@ index bed0267d42a8dbbd2996bd19c65d09a5ab27b5d2..582467e3419c23446b20d3076fbfce22
         gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index ad4bc3f46bb6f02284ecf62e2701bb627e096b15..ab05f4151e6ec7404a85ddb3a141ed39d9ed86d7 100644
+index f1755b7f71672383566a9591348b5af5c658350b..d2e20a03bf031011b64d0ae15c09ab7105e0cffa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -179,6 +179,12 @@ public class Main {