include pufferfish patches

2026-02-17 16:37:43 +01:00 · 2023-03-22 05:27:54 -07:00
parent 9cda2e740b
commit a0077699e6
362 changed files with 4983 additions and 751 deletions
--- a/TODO.md
+++ b/TODO.md
@@ -4,7 +4,7 @@
 - [x] test player ridable underwater
 - [ ] OPTIONAL: custom damage type instead of magic for scissors & stone cutter patch
 - [x] flip the boolean in the "display names from item forms of entities to entities" patch to keep feature parity with vanilla
- [ ] uncomment if conditions when including Pufferfish
+- [x] uncomment if conditions when including Pufferfish
 - [x] entity attributes patch
  - [x] re-implement options for camel
  - [x] re-implement options for donkey
--- a/patches/api/0001-Pufferfish-API-Changes.patch
+++ b/patches/api/0001-Pufferfish-API-Changes.patch
@@ -0,0 +1,527 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kevin Raneri <kevin.raneri@gmail.com>
 Date: Tue, 9 Nov 2021 14:01:56 -0500
 Subject: [PATCH] Pufferfish API Changes
 Pufferfish
 Copyright (C) 2022 Pufferfish Studios LLC
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 diff --git a/build.gradle.kts b/build.gradle.kts
 index cad12a2632b9ebb569280441c42869685db1f31a..b83e2c5a0a094002d12aee55ec0cf8d12bf33f3e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -42,6 +42,7 @@ dependencies {
     apiAndDocs("net.kyori:adventure-text-logger-slf4j")
     api("org.apache.logging.log4j:log4j-api:2.17.1")
     api("org.slf4j:slf4j-api:1.8.0-beta4")
 +    api("io.sentry:sentry:5.4.0") // Pufferfish
     implementation("org.ow2.asm:asm:9.4")
     implementation("org.ow2.asm:asm-commons:9.4")
@@ -85,6 +86,13 @@ val generateApiVersioningFile by tasks.registering {
     }
 }
 +// Pufferfish Start
 +tasks.withType<JavaCompile> {
 +    val compilerArgs = options.compilerArgs
 +    compilerArgs.add("--add-modules=jdk.incubator.vector")
 +}
 +// Pufferfish End
 +
 tasks.jar {
     from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
         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
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java
@@ -0,0 +1,161 @@
 +package gg.pufferfish.pufferfish.sentry;
 +
 +import com.google.gson.Gson;
 +import java.lang.reflect.Field;
 +import java.lang.reflect.Modifier;
 +import java.util.Map;
 +import java.util.TreeMap;
 +import org.apache.logging.log4j.ThreadContext;
 +import org.bukkit.command.Command;
 +import org.bukkit.command.CommandSender;
 +import org.bukkit.entity.Player;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.player.PlayerEvent;
 +import org.bukkit.plugin.Plugin;
 +import org.bukkit.plugin.RegisteredListener;
 +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());
 +			if (sender instanceof Player player) {
 +				ThreadContext.put("pufferfishsentry_playerid", player.getUniqueId().toString());
 +			}
 +		}
 +	}
 +
 +	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;
 +			if (event instanceof PlayerEvent) {
 +				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());
 +		for (Field declaredField : object.getClass().getDeclaredFields()) {
 +			try {
 +				if (Modifier.isStatic(declaredField.getModifiers())) {
 +					continue;
 +				}
 +
 +				String fieldName = declaredField.getName();
 +				if (fieldName.equals("handlers")) {
 +					continue;
 +				}
 +				declaredField.setAccessible(true);
 +				Object value = declaredField.get(object);
 +				if (value != null) {
 +					fields.put(fieldName, value.toString());
 +				} else {
 +					fields.put(fieldName, "<null>");
 +				}
 +			} catch (Exception e) {} // We can't really safely log exceptions.
 +		}
 +		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;
 +		}
 +	}
 +}
 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
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
@@ -0,0 +1,40 @@
 +package gg.pufferfish.pufferfish.simd;
 +
 +import java.util.logging.Level;
 +import java.util.logging.Logger;
 +import jdk.incubator.vector.FloatVector;
 +import jdk.incubator.vector.IntVector;
 +import jdk.incubator.vector.VectorSpecies;
 +
 +/**
 + * Basically, java is annoying and we have to push this out to its own class.
 + */
 +@Deprecated
 +public class SIMDChecker {
 +
 +	@Deprecated
 +	public static boolean canEnable(Logger logger) {
 +		try {
 +			if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19) {
 +				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;
 +				}
 +
 +				return true;
 +			}
 +		} 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
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java
@@ -0,0 +1,35 @@
 +package gg.pufferfish.pufferfish.simd;
 +
 +import java.util.logging.Logger;
 +
 +@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 {
 +			return SIMDChecker.canEnable(logger);
 +		} catch (NoClassDefFoundError | Exception ignored) {
 +			return false;
 +		}
 +	}
 +
 +	@Deprecated
 +	public static int getJavaVersion() {
 +		// https://stackoverflow.com/a/2591122
 +		String version = System.getProperty("java.version");
 +		if(version.startsWith("1.")) {
 +			version = version.substring(2, 3);
 +		} else {
 +			int dot = version.indexOf(".");
 +			if(dot != -1) { version = version.substring(0, dot); }
 +		}
 +		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
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java
@@ -0,0 +1,83 @@
 +package gg.pufferfish.pufferfish.simd;
 +
 +import java.awt.Color;
 +import jdk.incubator.vector.FloatVector;
 +import jdk.incubator.vector.IntVector;
 +import jdk.incubator.vector.VectorMask;
 +import jdk.incubator.vector.VectorSpecies;
 +import org.bukkit.map.MapPalette;
 +
 +@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();
 +		int i;
 +		for (i = 0; i < in.length - speciesLength; i += speciesLength) {
 +			float[] redsArr = new float[speciesLength];
 +			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
 --- a/src/main/java/org/bukkit/map/MapPalette.java
 +++ b/src/main/java/org/bukkit/map/MapPalette.java
@@ -1,6 +1,7 @@
 package org.bukkit.map;
 import com.google.common.base.Preconditions;
 +import gg.pufferfish.pufferfish.simd.SIMDDetection; // Pufferfish
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Image;
@@ -40,7 +41,7 @@ public final class MapPalette {
     }
     @NotNull
 -    static final Color[] colors = {
 +    public static final Color[] colors = { // Pufferfish - public access
         c(0, 0, 0, 0), c(0, 0, 0, 0), c(0, 0, 0, 0), c(0, 0, 0, 0),
         c(89, 125, 39), c(109, 153, 48), c(127, 178, 56), c(67, 94, 29),
         c(174, 164, 115), c(213, 201, 140), c(247, 233, 163), c(130, 123, 86),
@@ -211,9 +212,15 @@ public final class MapPalette {
         temp.getRGB(0, 0, temp.getWidth(), temp.getHeight(), pixels, 0, temp.getWidth());
         byte[] result = new byte[temp.getWidth() * temp.getHeight()];
 +        // Pufferfish start
 +        if (!SIMDDetection.isEnabled) {
         for (int i = 0; i < pixels.length; i++) {
             result[i] = matchColor(new Color(pixels[i], true));
         }
 +        } else {
 +            gg.pufferfish.pufferfish.simd.VectorMapPalette.matchColorVectorized(pixels, result);
 +        }
 +        // Pufferfish end
         return result;
     }
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 index 2b8308989fce7f8a16907f8711b362e671fdbfb6..bd4d1a40f53784662174d426533ef4b5433a15b7 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 {
     // Paper start
     private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
 +        gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
         server.getLogger().log(Level.SEVERE, msg, ex);
 +        gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
         callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerPluginEnableDisableException(msg, ex, plugin)));
     }
     // Paper end
@@ -654,9 +656,11 @@ public final class SimplePluginManager implements PluginManager {
                             ));
                 }
             } catch (Throwable ex) {
 +                gg.pufferfish.pufferfish.sentry.SentryContext.setEventContext(event, registration); // Pufferfish
                 // Paper start - error reporting
                 String msg = "Could not pass event " + event.getEventName() + " to " + registration.getPlugin().getDescription().getFullName();
                 server.getLogger().log(Level.SEVERE, msg, ex);
 +                gg.pufferfish.pufferfish.sentry.SentryContext.removeEventContext(); // Pufferfish
                 if (!(event instanceof com.destroystokyo.paper.event.server.ServerExceptionEvent)) { // We don't want to cause an endless event loop
                     callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
                 }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..301e82369603f3dd6e6c1bd380da4bacacd7ef6c 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -336,7 +336,13 @@ public final class JavaPluginLoader implements PluginLoader {
             try {
                 jPlugin.setEnabled(true);
             } catch (Throwable ex) {
 +                gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
                 server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
 +                gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
 +                // Paper start - Disable plugins that fail to load
 +                this.server.getPluginManager().disablePlugin(jPlugin);
 +                return;
 +                // Paper end
             }
             // Perhaps abort here, rather than continue going, but as it stands,
@@ -361,7 +367,9 @@ public final class JavaPluginLoader implements PluginLoader {
             try {
                 jPlugin.setEnabled(false);
             } catch (Throwable ex) {
 +                gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
                 server.getLogger().log(Level.SEVERE, "Error occurred while disabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
 +                gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
             }
             if (cloader instanceof PluginClassLoader) {
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 index 1758e8a89c85eea8c2161ddcb5b0e745151a1f5e..fe21d31b463317eb90d58cbca5f098958ca93938 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -48,6 +48,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
     private io.papermc.paper.plugin.provider.classloader.PluginClassLoaderGroup classLoaderGroup; // Paper
     public io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext; // Paper
 +    private boolean closed = false; // Pufferfish
 +
     static {
         ClassLoader.registerAsParallelCapable();
     }
@@ -183,6 +185,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
         throw new ClassNotFoundException(name);
     }
 +    public boolean _airplane_hasClass(@NotNull String name) { return this.classes.containsKey(name); } // Pufferfish
     @Override
     protected Class<?> findClass(String name) throws ClassNotFoundException {
         if (name.startsWith("org.bukkit.") || name.startsWith("net.minecraft.")) {
@@ -190,7 +193,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
         }
         Class<?> result = classes.get(name);
 -        if (result == null) {
 +        if (result == null && !this.closed) { // Pufferfish
             String path = name.replace('.', '/').concat(".class");
             JarEntry entry = jar.getJarEntry(path);
@@ -237,6 +240,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
             this.setClass(name, result); // Paper
         }
 +        if (result == null) throw new ClassNotFoundException(name); // Pufferfish
         return result;
     }
@@ -251,6 +255,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
             // Paper end
             super.close();
         } finally {
 +            this.closed = true; // Pufferfish
             jar.close();
         }
     }
--- a/patches/removed/api/0002-Fix-pufferfish-issues.patch
+++ b/patches/removed/api/0002-Fix-pufferfish-issues.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix pufferfish issues
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 4bca64b2a44ae032730575ecba39f9737a5a1ec7..7769e19a5a86b5c76094058d31269fc6cc9f0ac3 100644
+index 2cb81e6d253d70388da15c9d07b630277d486c70..fa7229ae5e00e36b0dc8b4cf15d3c99892cc3291 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
@@ -47,6 +47,10 @@ public class AnnotationTest {
--- a/patches/api/0003-Build-System-Changes.patch
+++ b/patches/api/0003-Build-System-Changes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Build System Changes
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 097b62f538970013d8297f9f2972d1d2b8a088a3..1d1f5147827466bd3d032d6ea084e75b1b9fa7ad 100644
+index b83e2c5a0a094002d12aee55ec0cf8d12bf33f3e..b5835fa536f90b7f88a5ee4df78733cf43e1cb23 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -97,6 +97,8 @@ tasks.jar {
+@@ -105,6 +105,8 @@ tasks.jar {
 }
 tasks.withType<Javadoc> {
--- a/patches/api/0004-Purpur-config-files.patch
+++ b/patches/api/0004-Purpur-config-files.patch
--- a/patches/api/0005-Purpur-client-support.patch
+++ b/patches/api/0005-Purpur-client-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur client support
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 660f28e371176c62e38a84b187958aceb235c8e3..9306bd672a1c3aae9759e9d8cd434245be066749 100644
+index b5fd857896b3afcfa69cce55cbc2696dd625f805..7ff5d4554be858e6bad5440b8847e3f21523f796 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3000,4 +3000,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/patches/api/0006-Default-permissions.patch
+++ b/patches/api/0006-Default-permissions.patch
--- a/patches/api/0007-Ridables.patch
+++ b/patches/api/0007-Ridables.patch
--- a/patches/api/0008-Allow-inventory-resizing.patch
+++ b/patches/api/0008-Allow-inventory-resizing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow inventory resizing
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index 6957d5b88c549f08dd3afe272f018be122f3a4a6..c5824f7fb988ed68feb8758ce6db748218f10b9b 100644
+index 35aac79a7c58d00e6b3c6c042b291093c9c7af71..7fa8909f07ce768654b9ea7c42c4913b7e2593b7 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
@@ -155,7 +155,7 @@ public enum InventoryType {
--- a/patches/api/0009-Llama-API.patch
+++ b/patches/api/0009-Llama-API.patch
--- a/patches/api/0010-AFK-API.patch
+++ b/patches/api/0010-AFK-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] AFK API
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9306bd672a1c3aae9759e9d8cd434245be066749..8dcb8bd95cad85f80991b0f6ae0439ab070b202e 100644
+index 7ff5d4554be858e6bad5440b8847e3f21523f796..04b31e42865469f9760db061607a803787fbadf3 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3008,5 +3008,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/patches/api/0011-Bring-back-server-name.patch
+++ b/patches/api/0011-Bring-back-server-name.patch
--- a/patches/api/0012-ExecuteCommandEvent.patch
+++ b/patches/api/0012-ExecuteCommandEvent.patch
--- a/patches/api/0013-LivingEntity-safeFallDistance.patch
+++ b/patches/api/0013-LivingEntity-safeFallDistance.patch
--- a/patches/api/0014-Lagging-threshold.patch
+++ b/patches/api/0014-Lagging-threshold.patch
--- a/patches/api/0015-PlayerSetSpawnerTypeWithEggEvent.patch
+++ b/patches/api/0015-PlayerSetSpawnerTypeWithEggEvent.patch
--- a/patches/api/0016-EMC-MonsterEggSpawnEvent.patch
+++ b/patches/api/0016-EMC-MonsterEggSpawnEvent.patch
--- a/patches/api/0017-Player-invulnerabilities.patch
+++ b/patches/api/0017-Player-invulnerabilities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8dcb8bd95cad85f80991b0f6ae0439ab070b202e..6d44768ac23b80dc170e242f040c5bcaabd0510f 100644
+index 04b31e42865469f9760db061607a803787fbadf3..819aa1f1e2c2c32510973e6fc9d8561366230851 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3027,5 +3027,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/patches/api/0018-Anvil-API.patch
+++ b/patches/api/0018-Anvil-API.patch
--- a/patches/api/0019-ItemStack-convenience-methods.patch
+++ b/patches/api/0019-ItemStack-convenience-methods.patch
@@ -50,7 +50,7 @@ index 3c5e90f039f0d2991be442168703526405e18e3d..df992c41d736ee4e89773c2621d261d6
 +    // Purpur end
 }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 449d6e1995eedbfaeffdc5d1f1c2295378006aa8..11261c659e3a378f468f4a19e2c24c1bb1f95a2b 100644
+index cd487177f6e391e114c394cd736796e20e0e8982..e5f129b7bbf4257e6be056af71c4e26a01ffd658 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
--- a/patches/api/0020-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/api/0020-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
--- a/patches/api/0021-ChatColor-conveniences.patch
+++ b/patches/api/0021-ChatColor-conveniences.patch
--- a/patches/api/0022-LivingEntity-broadcastItemBreak.patch
+++ b/patches/api/0022-LivingEntity-broadcastItemBreak.patch
--- a/patches/api/0023-Item-entity-immunities.patch
+++ b/patches/api/0023-Item-entity-immunities.patch
--- a/patches/api/0024-Add-option-to-disable-zombie-aggressiveness-towards-.patch
+++ b/patches/api/0024-Add-option-to-disable-zombie-aggressiveness-towards-.patch
--- a/patches/api/0025-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
+++ b/patches/api/0025-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
--- a/patches/api/0026-Rabid-Wolf-API.patch
+++ b/patches/api/0026-Rabid-Wolf-API.patch
--- a/patches/api/0027-PlayerBookTooLargeEvent.patch
+++ b/patches/api/0027-PlayerBookTooLargeEvent.patch
--- a/patches/api/0028-Full-netherite-armor-grants-fire-resistance.patch
+++ b/patches/api/0028-Full-netherite-armor-grants-fire-resistance.patch
--- a/patches/api/0029-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/api/0029-Add-EntityTeleportHinderedEvent.patch
--- a/patches/api/0030-Add-enchantment-target-for-bows-and-crossbows.patch
+++ b/patches/api/0030-Add-enchantment-target-for-bows-and-crossbows.patch
--- a/patches/api/0031-Iron-golem-poppy-calms-anger.patch
+++ b/patches/api/0031-Iron-golem-poppy-calms-anger.patch
--- a/patches/api/0032-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/api/0032-API-for-any-mob-to-burn-daylight.patch
--- a/patches/api/0033-Add-back-player-spawned-endermite-API.patch
+++ b/patches/api/0033-Add-back-player-spawned-endermite-API.patch
--- a/patches/api/0034-Fix-default-permission-system.patch
+++ b/patches/api/0034-Fix-default-permission-system.patch
--- a/patches/api/0035-Summoner-API.patch
+++ b/patches/api/0035-Summoner-API.patch
--- a/patches/api/0036-Clean-up-version-command-output.patch
+++ b/patches/api/0036-Clean-up-version-command-output.patch
--- a/patches/api/0037-Extended-OfflinePlayer-API.patch
+++ b/patches/api/0037-Extended-OfflinePlayer-API.patch
--- a/patches/api/0038-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/api/0038-Added-the-ability-to-add-combustible-items.patch
--- a/patches/api/0039-Potion-NamespacedKey.patch
+++ b/patches/api/0039-Potion-NamespacedKey.patch
--- a/patches/api/0040-Grindstone-API.patch
+++ b/patches/api/0040-Grindstone-API.patch
--- a/patches/api/0041-Shears-can-have-looting-enchantment.patch
+++ b/patches/api/0041-Shears-can-have-looting-enchantment.patch
--- a/patches/api/0042-Lobotomize-stuck-villagers.patch
+++ b/patches/api/0042-Lobotomize-stuck-villagers.patch
--- a/patches/api/0043-Add-local-difficulty-api.patch
+++ b/patches/api/0043-Add-local-difficulty-api.patch
--- a/patches/api/0044-Remove-Timings.patch
+++ b/patches/api/0044-Remove-Timings.patch
--- a/patches/api/0045-Add-Bee-API.patch
+++ b/patches/api/0045-Add-Bee-API.patch
--- a/patches/api/0046-Debug-Marker-API.patch
+++ b/patches/api/0046-Debug-Marker-API.patch
@@ -260,7 +260,7 @@ index bb249f7d54fd90d63f609eedf0bbb463f1aa96f1..a38863ebd363f54994753937a10e0410
     /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6d44768ac23b80dc170e242f040c5bcaabd0510f..c09c8e2c32b699301ae66b467582511e518bf3d3 100644
+index 819aa1f1e2c2c32510973e6fc9d8561366230851..12b659d13ce336cca52dd704caa7c20366cfe6d9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3048,5 +3048,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/patches/api/0047-Add-death-screen-API.patch
+++ b/patches/api/0047-Add-death-screen-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add death screen API
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c09c8e2c32b699301ae66b467582511e518bf3d3..134a573fd933dce1002d9e3b62dafce83b1d6aea 100644
+index 12b659d13ce336cca52dd704caa7c20366cfe6d9..08b5f448e92add21f9f9797d9cea3ac60581dff5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3118,5 +3118,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/patches/api/0048-Add-item-packet-serialize-event.patch
+++ b/patches/api/0048-Add-item-packet-serialize-event.patch
--- a/patches/api/0049-Language-API.patch
+++ b/patches/api/0049-Language-API.patch
--- a/patches/api/0050-Add-log-suppression-for-LibraryLoader.patch
+++ b/patches/api/0050-Add-log-suppression-for-LibraryLoader.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add log suppression for LibraryLoader
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..f1e58639213be0c43cd2ff090b625e7d0a67e8be 100644
+index 301e82369603f3dd6e6c1bd380da4bacacd7ef6c..0c6ca7588fb3d6b6497ddf032fe75e5c6c9719e5 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -55,6 +55,7 @@ public final class JavaPluginLoader implements PluginLoader {
--- a/patches/api/0051-Fire-Immunity-API.patch
+++ b/patches/api/0051-Fire-Immunity-API.patch
--- a/patches/api/0052-Added-goat-ram-event.patch
+++ b/patches/api/0052-Added-goat-ram-event.patch
--- a/patches/api/0053-Add-PreExplodeEvents.patch
+++ b/patches/api/0053-Add-PreExplodeEvents.patch
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
--- a/patches/removed/server/0002-Fix-pufferfish-issues.patch
+++ b/patches/removed/server/0002-Fix-pufferfish-issues.patch
@@ -5,12 +5,12 @@ 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 6e441a1a28ba72a8b1cc09fe5fca71b3c70627d4..5c691db595ee412b77f729e90172bc4f8ae57226 100644
+index a8cead500186142115d4dc029c942fdfc68f7fe5..866498779e824b971479e92b736b97aa05ce48a3 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 {
     public static int activationDistanceMod;
-
+ 
     private static void dynamicActivationOfBrains() throws IOException {
 -        dearEnabled = getBoolean("dab.enabled", "activation-range.enabled", true);
 +        dearEnabled = getBoolean("dab.enabled", "activation-range.enabled", false); // Purpur
@@ -18,7 +18,7 @@ index 6e441a1a28ba72a8b1cc09fe5fca71b3c70627d4..5c691db595ee412b77f729e90172bc4f
                 "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 {
-
+ 
     public static boolean throttleInactiveGoalSelectorTick;
 	private static void inactiveGoalSelectorThrottle() {
 -		getBoolean("inactive-goal-selector-throttle", "inactive-goal-selector-disable", true,
@@ -27,7 +27,7 @@ index 6e441a1a28ba72a8b1cc09fe5fca71b3c70627d4..5c691db595ee412b77f729e90172bc4f
 				"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 53198ebfa30273c5ddc1bb4324f5174ff99f688d..ccb905ad68465199516534a2ab74f7b3092297a8 100644
+index ff2862bf1f511196d1e911e2584262ed728e9a81..87d6b8e0cd8fec7959fb052dce1b73feb8cdb967 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 {
@@ -37,23 +37,23 @@ index 53198ebfa30273c5ddc1bb4324f5174ff99f688d..ccb905ad68465199516534a2ab74f7b3
 -    // private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); // Pufferfish - moved to super
 +    private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(this.random.nextLong()); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - moved to super // Purpur - dont break ABI
     // Paper end
-
+ 
     private int currentIceAndSnowTick = 0; protected void resetIceAndSnowTick() { this.currentIceAndSnowTick = this.randomTickRandom.nextInt(16); } // Pufferfish
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index edd2c236ca7c37e1a3aec0048b8974f4cd62f2cc..42299fd6ae663b01bb5f010b96887caa744dcb96 100644
+index 6aec1983a0236d6aa0507a2b3ad1c08b3330f0fc..66cc44d9f14b01f6c8e53b0f990866ac897c1c81 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -270,7 +270,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -274,7 +274,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-
+ 
     public abstract ResourceKey<LevelStem> getTypeKey();
-
+ 
 -    protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(java.util.concurrent.ThreadLocalRandom.current().nextLong()); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter
 +    //protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(java.util.concurrent.ThreadLocalRandom.current().nextLong()); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter // Purpur - dont break ABI
-
+ 
     // Pufferfish start - ensure these get inlined
     private final int minBuildHeight, minSection, height, maxBuildHeight, maxSection;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index de7a5f3812a017131fd1b32fbeff10e325b1cd2e..aa327e549949052b5babf4101cc2fc9a37868fa8 100644
+index e7e2b0fc88c9320449bcd0e0929269c2508886e4..b5e361d2170d2741ef990ec342f32ccde0c05750 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -130,7 +130,7 @@ public class LevelChunk extends ChunkAccess {
@@ -63,5 +63,5 @@ index de7a5f3812a017131fd1b32fbeff10e325b1cd2e..aa327e549949052b5babf4101cc2fc9a
 -        this.lightningTick = this.level.getThreadUnsafeRandom().nextInt(100000) << 1; // Pufferfish - initialize lightning tick
 +        this.lightningTick = java.util.concurrent.ThreadLocalRandom.current().nextInt(100000) << 1; // Pufferfish - initialize lightning tick // Purpur - any random will do
     }
-
+ 
     public org.bukkit.Chunk bukkitChunk;
--- a/patches/server/0003-Rebrand.patch
+++ b/patches/server/0003-Rebrand.patch
@@ -5,21 +5,25 @@ Subject: [PATCH] Rebrand
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9cf389defdaeb887e9cad4f0fed3f3b95667b238..761bee802da0d3616ba0739434261b14a030805d 100644
+index b41b186397d013c19436c345be98b785d4bd0295..22470f0ab8354a9f31a0f195f3fe80f2f5ee2f0e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -7,8 +7,8 @@ plugins {
+@@ -7,12 +7,8 @@ plugins {
 }
 dependencies {
-    implementation(project(":paper-api"))
+-    implementation(project(":pufferfish-api")) // Pufferfish // Paper
-    implementation(project(":paper-mojangapi"))
+-    // Pufferfish start
 -    implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") {
 -        exclude("io.papermc.paper", "paper-api")
 -    }
 -    // Pufferfish end
 +    implementation(project(":purpur-api")) // Purpur
 +    implementation("io.papermc.paper:paper-mojangapi:1.19.4-R0.1-SNAPSHOT") // Purpur
     // Paper start
     implementation("org.jline:jline-terminal-jansi:3.21.0")
     implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -38,6 +38,10 @@ dependencies {
+@@ -42,6 +38,10 @@ dependencies {
     }
     // Paper end
@@ -30,16 +34,16 @@ index 9cf389defdaeb887e9cad4f0fed3f3b95667b238..761bee802da0d3616ba0739434261b14
     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")
-@@ -62,7 +66,7 @@ tasks.jar {
+@@ -81,7 +81,7 @@ tasks.jar {
         attributes(
             "Main-Class" to "org.bukkit.craftbukkit.Main",
             "Implementation-Title" to "CraftBukkit",
-            "Implementation-Version" to "git-Paper-$implementationVersion",
+-            "Implementation-Version" to "git-Pufferfish-$implementationVersion", // Pufferfish
-+            "Implementation-Version" to "git-Purpur-$implementationVersion", // Purpur
+            "Implementation-Version" to "git-Purpur-$implementationVersion", // Pufferfish // Purpur
             "Implementation-Vendor" to date, // Paper
             "Specification-Title" to "Bukkit",
             "Specification-Version" to project.version,
-@@ -134,7 +138,7 @@ fun TaskContainer.registerRunTask(
+@@ -153,7 +153,7 @@ fun TaskContainer.registerRunTask(
     name: String,
     block: JavaExec.() -> Unit
 ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -171,10 +175,10 @@ 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 e67c4a7aaa11f5c67f926f92e0a174af526c2ec3..ac0693f439f063d19ea68d8b216d4ecf10441b15 100644
+index a4c64b1cc11955fb279b8ed0fb7d2668a7b90d2b..ab70642d26439ce071a5ad505a83c81d8836c87f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -924,7 +924,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -926,7 +926,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         shutdownThread = Thread.currentThread();
         org.spigotmc.WatchdogThread.doStop(); // Paper
         if (!isSameThread()) {
@@ -183,25 +187,25 @@ index e67c4a7aaa11f5c67f926f92e0a174af526c2ec3..ac0693f439f063d19ea68d8b216d4ecf
             while (this.getRunningThread().isAlive()) {
                 this.getRunningThread().stop();
                 try {
-@@ -1681,7 +1681,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1683,7 +1683,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     @DontObfuscate
     public String getServerModName() {
-        return "Paper"; // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+-        return "Pufferfish"; // Pufferfish - Pufferfish > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return "Purpur"; // Purpur - Purpur > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+        return "Purpur"; // Purpur - Purpur > // Pufferfish - Pufferfish > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
     }
     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 f9a9d2bb7b6d1bf4a0931438de4d8c7ee0757479..e288fd33be490b3269470cd0728a81a0ea6385f1 100644
+index b2d94582037c091bd6a04451bf62b3f9c4923d19..430df6a2b852f07e3a1cd9dfcd5ecf3e52e63b66 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
 import javax.annotation.Nonnull; // Paper
 public final class CraftServer implements Server {
-    private final String serverName = "Paper"; // Paper
+-    private final String serverName = "Pufferfish"; // Paper // Pufferfish
-+    private final String serverName = "Purpur"; // Paper // Purpur
+    private final String serverName = "Purpur"; // Paper // Pufferfish // Purpur
     private final String serverVersion;
     private final String bukkitVersion = Versioning.getBukkitVersion();
     private final Logger logger = Logger.getLogger("Minecraft");
@@ -258,16 +262,29 @@ index cdefb2025eedea7e204d70d568adaf1c1ec4c03c..d1526ed7197b883e1d1f07baf285bf5e
                 // We don't need to parse pending
                 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
             }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 index d4f62940504e3ef7a70e13b1f4a7726f23b4c637..1dd7f923dd6adb41eafc3ea0c063e3aae6670124 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -464,7 +464,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
     @Override
     public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
 -        return new gg.pufferfish.pufferfish.PufferfishVersionFetcher(); // Pufferfish
 +        return new com.destroystokyo.paper.PaperVersionFetcher(); // Purpur
     }
     @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 774556a62eb240da42e84db4502e2ed43495be17..fb87620c742ff7912f5e8ccd2a7930dd605576d9 100644
+index 80553face9c70c2a3d897681e7761df85b22d464..99597258e8e88cd9e2c901c4ac3ff7faeeabee2b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -11,7 +11,7 @@ public final class Versioning {
     public static String getBukkitVersion() {
         String result = "Unknown-Version";
-        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
+-        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/gg.pufferfish.pufferfish/pufferfish-api/pom.properties"); // Pufferfish
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.purpurmc.purpur/purpur-api/pom.properties"); // Purpur
+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.purpurmc.purpur/purpur-api/pom.properties"); // Pufferfish // Purpur
         Properties properties = new Properties();
         if (stream != null) {
--- a/patches/server/0004-Purpur-config-files.patch
+++ b/patches/server/0004-Purpur-config-files.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] Purpur config files
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 4b002e8b75d117b726b0de274a76d3596fce015b..9713263c3bd34ab8a3bfc0a8797ba0b1b88ed733 100644
+index 692c962193cf9fcc6801fc93f3220bdc673d527b..8cde30544e14f8fc2dac32966ae3c21f8cf3a551 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -593,7 +593,7 @@ public class Metrics {
             boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
             // Only start Metrics, if it's enabled in the config
             if (config.getBoolean("enabled", true)) {
-                Metrics metrics = new Metrics("Paper", serverUUID, logFailedRequests, Bukkit.getLogger());
+-                Metrics metrics = new Metrics("Pufferfish", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish
-+                Metrics metrics = new Metrics("Purpur", serverUUID, logFailedRequests, Bukkit.getLogger()); // Purpur
+                Metrics metrics = new Metrics("Purpur", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur
                 metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
                     String minecraftVersion = Bukkit.getVersion();
@@ -26,11 +26,11 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..9713263c3bd34ab8a3bfc0a8797ba0b1
 -                final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion();
 -                if (implVersion != null) {
 -                    final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1);
-                    paperVersion = "git-Paper-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash);
+-                    paperVersion = "git-Pufferfish-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Pufferfish
 -                } else {
 -                    paperVersion = "unknown";
 -                }
-                metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> paperVersion));
+-                metrics.addCustomChart(new Metrics.SimplePie("pufferfish_version", () -> paperVersion)); // Pufferfish
 +                metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() ? "bungee" : "offline"))); // Purpur
 +                metrics.addCustomChart(new Metrics.SimplePie("purpur_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur
@@ -72,7 +72,7 @@ index 7b6b51392b123d34382233adcf4c3d4867bdaa32..ccc78857b51e25640ec1e4dcfe4c76a0
         if (this.source.acceptsSuccess() && !this.silent) {
             this.source.sendSystemMessage(message);
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index a7e133f3495e9132a5fdae2c24f225e7b026295a..329ebc3d94997199ad342cb8e4d9f103ecca169f 100644
+index ad4fdbdcf09f30d10e61ccf47f8fb9ce6bd92e73..ca6a2fee12ac8a89dae57aa2787462f190463cd0 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -218,6 +218,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -92,7 +92,7 @@ index a7e133f3495e9132a5fdae2c24f225e7b026295a..329ebc3d94997199ad342cb8e4d9f103
         io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
         // Paper end
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 973ecd50f9cb6b86c353586e84d15dcb118ccb60..2ae800110dc90b7f2d96d2c05ba3a53aea6c0c53 100644
+index 66cc44d9f14b01f6c8e53b0f990866ac897c1c81..c38aff50c6f0bc37e539bb4d5206f7b6065fa680 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -177,6 +177,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -103,7 +103,7 @@ index 973ecd50f9cb6b86c353586e84d15dcb118ccb60..2ae800110dc90b7f2d96d2c05ba3a53a
     public final co.aikar.timings.WorldTimingsHandler timings; // Paper
     public static BlockPos lastPhysicsProblem; // Spigot
     private org.spigotmc.TickLimiter entityLimiter;
-@@ -277,6 +278,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -288,6 +289,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
         this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
         this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
@@ -112,7 +112,7 @@ index 973ecd50f9cb6b86c353586e84d15dcb118ccb60..2ae800110dc90b7f2d96d2c05ba3a53a
         this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e288fd33be490b3269470cd0728a81a0ea6385f1..3ae359a7334d8e398558fbb7c13cfd490a963d27 100644
+index 430df6a2b852f07e3a1cd9dfcd5ecf3e52e63b66..6f59ff3dda4adaa24065ac388c8de556f3934313 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -956,6 +956,7 @@ public final class CraftServer implements Server {
@@ -139,7 +139,7 @@ index e288fd33be490b3269470cd0728a81a0ea6385f1..3ae359a7334d8e398558fbb7c13cfd49
         this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
         this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
-@@ -2744,6 +2747,18 @@ public final class CraftServer implements Server {
+@@ -2749,6 +2752,18 @@ public final class CraftServer implements Server {
             return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
         }
@@ -159,7 +159,7 @@ index e288fd33be490b3269470cd0728a81a0ea6385f1..3ae359a7334d8e398558fbb7c13cfd49
         public void restart() {
             org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index d51650d3e37eb76a0cf991e95d28a552aa567af9..0206b97cdc244998b1a4f148a71457dabb9236de 100644
+index 4966a1e3dd35357a8ea6a7d2944c84c9c3e9058e..f5266df43726a7805ee2664ed18a2dcf79ab6cde 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -173,6 +173,14 @@ public class Main {
--- a/patches/server/0005-Purpur-client-support.patch
+++ b/patches/server/0005-Purpur-client-support.patch
@@ -17,10 +17,10 @@ index ca5291a9573a62cb5c19539cf5c7aceff11f9829..98d92f6d6a98d66e369286b079db2c4d
     public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
         super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2d8488b9aa088b6d5f0c7e557b8ad0b29bc4cd88..5e407aadb8b880f5bb8a485e681d6d6201cb0f31 100644
+index 24d48fb4a63c2db19c7f957ad2260415fe1db9fe..56b9a7059e3b9c2bc66961cb50bc6be3d02cf41c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3523,6 +3523,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3525,6 +3525,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
     private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister");
     private static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support
@@ -28,7 +28,7 @@ index 2d8488b9aa088b6d5f0c7e557b8ad0b29bc4cd88..5e407aadb8b880f5bb8a485e681d6d62
     @Override
     public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
-@@ -3547,6 +3548,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3549,6 +3550,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                 ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex);
                 this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
             }
@@ -43,7 +43,7 @@ index 2d8488b9aa088b6d5f0c7e557b8ad0b29bc4cd88..5e407aadb8b880f5bb8a485e681d6d62
             try {
                 byte[] data = new byte[packet.data.readableBytes()];
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index eca5e6b93dd84307bf9dbadf32414d6f506e69dc..6c502a804344d2121653d330a689d012cf5c4562 100644
+index 1bada55af5d16437da4d16f9ded55f88a6121eb4..18a32f55727283f73f8d0089a4b1784ae8248076 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3148,4 +3148,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/patches/server/0006-Fix-decompile-errors.patch
+++ b/patches/server/0006-Fix-decompile-errors.patch
--- a/patches/server/0007-Component-related-conveniences.patch
+++ b/patches/server/0007-Component-related-conveniences.patch
@@ -81,10 +81,10 @@ index 93a1e990b0a6caae4143c2f9d09bfb368fa1d6db..615611fe372d6edaef56db058bbf2cf7
         return this.type().msgId();
     }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9a1e8589e6b371869b2199650172d61ae186c907..bd109784a4ab836febef2926e69a7cf88fd2a873 100644
+index 6e8a76d64418c214fcdd021f23bdfaf9827470a9..a0aeb144f4f92b0cfdee1449b44771d0b6808d35 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3874,6 +3874,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3908,6 +3908,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
         return SlotAccess.NULL;
     }
--- a/patches/server/0008-Ridables.patch
+++ b/patches/server/0008-Ridables.patch
@@ -22,10 +22,10 @@ index b37e0ff164a894d2033fb94bbbc2f630a0e66bcd..ac335ec4f70830c7687ac4e0aa2a6cba
         super(x, y, z);
     }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4cd9c56b3aea40996e249db163ffed0625d99b16..a5ed221909bd267711fdfb29c4557220c0998b4b 100644
+index ab70642d26439ce071a5ad505a83c81d8836c87f..276d8594a70f30b90d46319d95629fc262617063 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1526,6 +1526,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1528,6 +1528,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
             worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
             net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper
             worldserver.hasEntityMoveEvent =  io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
@@ -34,7 +34,7 @@ index 4cd9c56b3aea40996e249db163ffed0625d99b16..a5ed221909bd267711fdfb29c4557220
             this.profiler.push(() -> {
                 return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5a5ff40df37db9cbd53c584ed26a3ce4888b29c0..ffde1d129c5434e7748cbdaac9109cbd3d0d29bc 100644
+index 87d6b8e0cd8fec7959fb052dce1b73feb8cdb967..b40bc54e80dadc8eb426ed6217b879631833e4d7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -66,10 +66,10 @@ index d5369a39c86353bd99b4b404028db2aea97f8438..8fa36563e130f8af0fc60d84d08134fa
     public void doTick() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5e407aadb8b880f5bb8a485e681d6d6201cb0f31..4037ab672c5dfe417307b2c40474b3c48ae529f0 100644
+index 56b9a7059e3b9c2bc66961cb50bc6be3d02cf41c..df46668a78adab398f57b4df98d1347844a6674a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2790,6 +2790,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2792,6 +2792,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                             ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
@@ -79,7 +79,7 @@ index 5e407aadb8b880f5bb8a485e681d6d6201cb0f31..4037ab672c5dfe417307b2c40474b3c4
                             if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                                 entity.getEntityData().resendPossiblyDesyncedEntity(player); // Paper - The entire mob gets deleted, so resend it.
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bd109784a4ab836febef2926e69a7cf88fd2a873..ceabcb24504228f25412b8821969b8e151ecaf1b 100644
+index a0aeb144f4f92b0cfdee1449b44771d0b6808d35..f216a136c693a202d1e07f8760ab493e51a4738e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -361,7 +361,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -91,7 +91,7 @@ index bd109784a4ab836febef2926e69a7cf88fd2a873..ceabcb24504228f25412b8821969b8e1
     private float eyeHeight;
     public boolean isInPowderSnow;
     public boolean wasInPowderSnow;
-@@ -2788,6 +2788,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2822,6 +2822,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                 this.passengers = ImmutableList.copyOf(list);
             }
@@ -105,7 +105,7 @@ index bd109784a4ab836febef2926e69a7cf88fd2a873..ceabcb24504228f25412b8821969b8e1
             this.gameEvent(GameEvent.ENTITY_MOUNT, entity);
         }
         return true; // CraftBukkit
-@@ -2829,6 +2836,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2863,6 +2870,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                 return false;
             }
             // Spigot end
@@ -120,7 +120,7 @@ index bd109784a4ab836febef2926e69a7cf88fd2a873..ceabcb24504228f25412b8821969b8e1
             if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
                 this.passengers = ImmutableList.of();
             } else {
-@@ -4645,4 +4660,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4731,4 +4746,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
         return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
     }
     // Paper end
@@ -191,10 +191,10 @@ index c1e9b40a4a0f9cdc650caa88b5ea132e06ee2496..7b1ca8fd2908b8a02ec2cd1966a31e06
     protected ParticleOptions getInkParticle() {
         return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index dcfb71b5a53df789e366fea2080921d677549a2e..e8798de526e2836308eca8e5f4a4388aa7e9d3c0 100644
+index 791f672b30f2a4d3b329e2ce0f4fb9c2ca627b01..223371a33f1c22874d9cc7b8655fef4c61ee5cb4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -217,9 +217,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -216,9 +216,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
     protected int deathScore;
     public float lastHurt;
     public boolean jumping;
@@ -207,7 +207,7 @@ index dcfb71b5a53df789e366fea2080921d677549a2e..e8798de526e2836308eca8e5f4a4388a
     protected int lerpSteps;
     protected double lerpX;
     protected double lerpY;
-@@ -285,7 +285,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -284,7 +284,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
         this.effectsDirty = true;
         this.useItem = ItemStack.EMPTY;
         this.lastClimbablePos = Optional.empty();
@@ -216,7 +216,7 @@ index dcfb71b5a53df789e366fea2080921d677549a2e..e8798de526e2836308eca8e5f4a4388a
         this.craftAttributes = new CraftAttributeMap(this.attributes); // CraftBukkit
         // CraftBukkit - setHealth(getMaxHealth()) inlined and simplified to skip the instanceof check for EntityPlayer, as getBukkitEntity() is not initialized in constructor
         this.entityData.set(LivingEntity.DATA_HEALTH_ID, (float) this.getAttribute(Attributes.MAX_HEALTH).getValue());
-@@ -336,6 +336,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -335,6 +335,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
     public static AttributeSupplier.Builder createLivingAttributes() {
         return AttributeSupplier.builder().add(Attributes.MAX_HEALTH).add(Attributes.KNOCKBACK_RESISTANCE).add(Attributes.MOVEMENT_SPEED).add(Attributes.ARMOR).add(Attributes.ARMOR_TOUGHNESS);
     }
@@ -224,7 +224,7 @@ index dcfb71b5a53df789e366fea2080921d677549a2e..e8798de526e2836308eca8e5f4a4388a
     @Override
     protected void checkFallDamage(double heightDifference, boolean onGround, BlockState state, BlockPos landedPosition) {
-@@ -2630,7 +2631,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2652,7 +2653,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
     }
     protected long lastJumpTime = 0L; // Paper
@@ -233,7 +233,7 @@ index dcfb71b5a53df789e366fea2080921d677549a2e..e8798de526e2836308eca8e5f4a4388a
         double d0 = (double) this.getJumpPower() + this.getJumpBoostPower();
         Vec3 vec3d = this.getDeltaMovement();
         // Paper start
-@@ -3394,8 +3395,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3416,8 +3417,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
         this.pushEntities();
         this.level.getProfiler().pop();
         // Paper start
@@ -246,7 +246,7 @@ index dcfb71b5a53df789e366fea2080921d677549a2e..e8798de526e2836308eca8e5f4a4388a
                 Location from = new Location(this.level.getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO);
                 Location to = new Location (this.level.getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
                 io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone());
-@@ -3405,6 +3408,21 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3427,6 +3430,21 @@ public abstract class LivingEntity extends Entity implements Attackable {
                     absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
                 }
             }
@@ -269,7 +269,7 @@ index dcfb71b5a53df789e366fea2080921d677549a2e..e8798de526e2836308eca8e5f4a4388a
         // Paper end
         if (!this.level.isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 02cb6b8c1d59855ff4a8aad3024fe12007eca0ee..76d8bab7cc1bdbd1946af60a1a2ffef1c7ef4415 100644
+index 636e601b004a412d02e5be86e97d489b52c28e1b..f6ec6a249b4559e681382c9690ddc7b9e17c9efb 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -146,8 +146,8 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -283,7 +283,7 @@ index 02cb6b8c1d59855ff4a8aad3024fe12007eca0ee..76d8bab7cc1bdbd1946af60a1a2ffef1
         this.jumpControl = new JumpControl(this);
         this.bodyRotationControl = this.createBodyControl();
         this.navigation = this.createNavigation(world);
-@@ -1372,7 +1372,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1378,7 +1378,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
     protected void onOffspringSpawnedFromEgg(Player player, Mob child) {}
     protected InteractionResult mobInteract(Player player, InteractionHand hand) {
@@ -292,7 +292,7 @@ index 02cb6b8c1d59855ff4a8aad3024fe12007eca0ee..76d8bab7cc1bdbd1946af60a1a2ffef1
     }
     public boolean isWithinRestriction() {
-@@ -1748,4 +1748,56 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1754,4 +1754,56 @@ public abstract class Mob extends LivingEntity implements Targeting {
         return itemmonsteregg == null ? null : new ItemStack(itemmonsteregg);
     }
@@ -350,13 +350,13 @@ index 02cb6b8c1d59855ff4a8aad3024fe12007eca0ee..76d8bab7cc1bdbd1946af60a1a2ffef1
 +    // Purpur end
 }
 diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-index dd1102d5291ef6f18e82400a6d8a0a376cc071e9..9932a801be1bde1c57697396c097fb47a6b26ede 100644
+index e283eb57c25f7de222f9d09dca851169f5f6e488..210a0bee1227e4671909dd553ab22027cfc868fb 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-@@ -23,13 +23,20 @@ public class AttributeMap {
+@@ -24,14 +24,21 @@ public class AttributeMap {
     private final Map<Attribute, AttributeInstance> attributes = Maps.newHashMap();
     private final Set<AttributeInstance> dirtyAttributes = Sets.newHashSet();
     private final AttributeSupplier supplier;
     private final java.util.function.Function<Attribute, AttributeInstance> createInstance; // Pufferfish
 +    private final net.minecraft.world.entity.LivingEntity entity; // Purpur
     public AttributeMap(AttributeSupplier defaultAttributes) {
@@ -367,6 +367,7 @@ index dd1102d5291ef6f18e82400a6d8a0a376cc071e9..9932a801be1bde1c57697396c097fb47
 +        this.entity = entity;
 +        // Purpur end
         this.supplier = defaultAttributes;
         this.createInstance = attribute -> this.supplier.createInstance(this::onAttributeModified, attribute); // Pufferfish
     }
     private void onAttributeModified(AttributeInstance instance) {
@@ -375,7 +376,7 @@ index dd1102d5291ef6f18e82400a6d8a0a376cc071e9..9932a801be1bde1c57697396c097fb47
             this.dirtyAttributes.add(instance);
         }
-@@ -41,7 +48,7 @@ public class AttributeMap {
+@@ -43,7 +50,7 @@ public class AttributeMap {
     public Collection<AttributeInstance> getSyncableAttributes() {
         return this.attributes.values().stream().filter((attribute) -> {
@@ -538,7 +539,7 @@ index 7df56705a4a0de2dc4ff7ab133fc26612c219162..60d21d6171b9af20a4c6fcc0d564a31a
         }
 diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index f5efdf59617d43de18a2267351fa784c0be3ae83..a48d40e4242f35c6830286739172459635be3e43 100644
+index 59338d739b6130f667d151bc27646c4a346886a2..29bfea3c4f92033aed1de1cf159d61b38708a281 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
@@ -18,6 +18,7 @@ import net.minecraft.world.entity.EntityDimensions;
@@ -2152,7 +2153,7 @@ index 612601b2536dc522356d4dd2c2ea1192f6435f72..c8a18ecd36393747a95ad9026c5a7b1d
         this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this));
         this.targetSelector.addGoal(3, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
 diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-index 9b57d2b766f2de2d3fb4a3b5ef4df8d6756a1942..3e5755764eb585c861c607c1f9fbeeeffc33cff1 100644
+index a41d8101c960163803179d3717889aee6182d0bb..c743f487b7a327ee66cffc86cbe5d13c81fd2cab 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
@@ -101,10 +101,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
@@ -2210,7 +2211,7 @@ index 9b57d2b766f2de2d3fb4a3b5ef4df8d6756a1942..3e5755764eb585c861c607c1f9fbeeef
     protected Brain.Provider<Allay> brainProvider() {
         return Brain.provider(Allay.MEMORY_TYPES, Allay.SENSOR_TYPES);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index a4e98b02175da96472474b8d7ad5975ce4d2fc43..f30aad7e722f895b8f6966f042021fc80f470994 100644
+index 38d21943fb2940f53c2d0ac2c3b94a6f0e46e700..2c5aa1fe81a2411de81c233092bbe3841ed627ea 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -98,6 +98,23 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
@@ -2237,7 +2238,7 @@ index a4e98b02175da96472474b8d7ad5975ce4d2fc43..f30aad7e722f895b8f6966f042021fc8
     @Override
     public Map<String, Vector3f> getModelRotationValues() {
         return this.modelRotationValues;
-@@ -519,14 +536,22 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
+@@ -521,14 +538,22 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
     private static class AxolotlMoveControl extends SmoothSwimmingMoveControl {
         private final Axolotl axolotl;
@@ -2260,7 +2261,7 @@ index a4e98b02175da96472474b8d7ad5975ce4d2fc43..f30aad7e722f895b8f6966f042021fc8
             if (!this.axolotl.isPlayingDead()) {
                 super.tick();
             }
-@@ -541,9 +566,9 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
+@@ -543,9 +568,9 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
         }
         @Override
@@ -2273,7 +2274,7 @@ index a4e98b02175da96472474b8d7ad5975ce4d2fc43..f30aad7e722f895b8f6966f042021fc8
         }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index a65cec3c9837882df5b61de58f03d276d4db6bfc..12962698dd354dc5da325e8bb24e5fff40af9e51 100644
+index be44667b8205cd3bb1cefddf8e0e743535414e14..24419e78976cabc7f14a4cff0f273c958344a8d6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
@@ -82,16 +82,65 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
@@ -2343,7 +2344,7 @@ index a65cec3c9837882df5b61de58f03d276d4db6bfc..12962698dd354dc5da325e8bb24e5fff
     @Override
     protected Brain.Provider<Frog> brainProvider() {
         return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
-@@ -374,7 +423,7 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
+@@ -376,7 +425,7 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
         return world.getBlockState(pos.below()).is(BlockTags.FROGS_SPAWNABLE_ON) && isBrightEnoughToSpawn(world, pos);
     }
@@ -2353,7 +2354,7 @@ index a65cec3c9837882df5b61de58f03d276d4db6bfc..12962698dd354dc5da325e8bb24e5fff
             super(entity);
         }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-index 9058f9f2e561cda9f475f33218bf7a78297de4bc..5551f67b4b4a32487c2f26f2c1e1e97cb21a22ee 100644
+index e591b0a09f5a8475b3ec9cd28bd5d5b69809ed73..63553436193cc3063cd4c4e9f50695fb5209ff9d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
@@ -45,13 +45,50 @@ public class Tadpole extends AbstractFish {
@@ -2409,7 +2410,7 @@ index 9058f9f2e561cda9f475f33218bf7a78297de4bc..5551f67b4b4a32487c2f26f2c1e1e97c
     protected PathNavigation createNavigation(Level world) {
         return new WaterBoundPathNavigation(this, world);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index cfa904d42734d0fb0c1ed8b18f4d8bc131027962..1cfc1ade52b79c6c5577935fe5c37a0e7a1673f0 100644
+index 4fdc3bd591b6df4c28901e4571aa23baf034d885..81790ac38ef67682053751a9e6813eed8d744337 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
@@ -89,6 +89,23 @@ public class Goat extends Animal {
@@ -2436,11 +2437,12 @@ index cfa904d42734d0fb0c1ed8b18f4d8bc131027962..1cfc1ade52b79c6c5577935fe5c37a0e
     @Override
     protected Brain.Provider<Goat> brainProvider() {
         return Brain.provider(Goat.MEMORY_TYPES, Goat.SENSOR_TYPES);
-@@ -191,6 +208,7 @@ public class Goat extends Animal {
+@@ -192,7 +209,7 @@ public class Goat extends Animal {
     @Override
     protected void customServerAiStep() {
         this.level.getProfiler().push("goatBrain");
-+        if ((getRider() == null || !this.isControllable())/* && this.behaviorTick++ % this.activatedPriority == 0*/) // Pufferfish // Purpur - only use brain if no rider TODO: uncomment when including Pufferfish
+-        if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
 +        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
         this.getBrain().tick((ServerLevel) this.level, this);
         this.level.getProfiler().pop();
         this.level.getProfiler().push("goatActivityUpdate");
@@ -3417,7 +3419,7 @@ index d02286d553c600fe7e75f48e278e380d21c5b868..4fbae6e88daaabfce22bb9d6e60e02a1
         return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896D).add(Attributes.ATTACK_DAMAGE, 8.0D).add(Attributes.MAX_HEALTH, 80.0D);
     }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 418d6301f067803e2471e59ac2d52a68cbff249b..db5427939d62434ad2d3271e44ffad58b96f121b 100644
+index c2f5dabb41b172547864decc06aa632d89dff3e1..d1e6b930fe393c4e3c52749819373cc98092aa20 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -92,9 +92,27 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -3465,7 +3467,7 @@ index 418d6301f067803e2471e59ac2d52a68cbff249b..db5427939d62434ad2d3271e44ffad58
             float f = this.getLightLevelDependentMagicValue();
             if (f > 0.5F && this.level.canSeeSky(this.blockPosition()) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F && this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.RUNAWAY)) { // Paper
-@@ -398,6 +417,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -404,6 +423,7 @@ public class EnderMan extends Monster implements NeutralMob {
     public boolean hurt(DamageSource source, float amount) {
         if (this.isInvulnerableTo(source)) {
             return false;
@@ -4806,7 +4808,7 @@ index b75945807b425609394c343da56c316a769f0a29..ad82c064c9e31ffc1dd96e4451718763
     public void setPersistentAngerTarget(@Nullable UUID angryAt) {
         this.persistentAngerTarget = angryAt;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index 5d3b3cb3a882eb5d716f678095a65b28d0967476..b4deb7fa656aadd9c62db68bb46d3fb39f8429e5 100644
+index daa2224b021c966751eb39f269ffbfe6e7f3d426..74d3068c4f74c19740ad3e2f507489d405d78598 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
@@ -67,6 +67,23 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -4833,16 +4835,17 @@ index 5d3b3cb3a882eb5d716f678095a65b28d0967476..b4deb7fa656aadd9c62db68bb46d3fb3
     @Override
     public boolean canBeLeashed(Player player) {
         return !this.isLeashed();
-@@ -129,6 +146,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
+@@ -130,7 +147,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
     @Override
     protected void customServerAiStep() {
         this.level.getProfiler().push("hoglinBrain");
-+        if ((getRider() == null || !this.isControllable())/* && this.behaviorTick++ % this.activatedPriority == 0*/) // Pufferfish // Purpur - only use brain if no rider TODO: uncomment when including Pufferfish
+-        if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
 +        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
         this.getBrain().tick((ServerLevel)this.level, this);
         this.level.getProfiler().pop();
         HoglinAi.updateActivity(this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index afa7ecfa8453da510ec5ccecb1ceeb1d9893d259..dad688184896720099357bf91fe092da3eac8931 100644
+index b401fb4f276ca81b4bb18426ee56abed8a9f7a7b..5dcaa05ee11872502736c39588dfe03cb59c8e2d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
@@ -97,6 +97,23 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@@ -4869,11 +4872,12 @@ index afa7ecfa8453da510ec5ccecb1ceeb1d9893d259..dad688184896720099357bf91fe092da
     @Override
     public void addAdditionalSaveData(CompoundTag nbt) {
         super.addAdditionalSaveData(nbt);
-@@ -311,6 +328,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
+@@ -312,7 +329,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
     @Override
     protected void customServerAiStep() {
         this.level.getProfiler().push("piglinBrain");
-+        if ((getRider() == null || !this.isControllable())/* && this.behaviorTick++ % this.activatedPriority == 0*/) // Pufferfish // Purpur - only use brain if no rider TODO: uncomment when including Pufferfish
+-        if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
 +        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
         this.getBrain().tick((ServerLevel) this.level, this);
         this.level.getProfiler().pop();
         PiglinAi.updateActivity(this);
@@ -4914,7 +4918,7 @@ index 769e4fbaac01a4fe3a45bd9cab5c63b61fc69f53..ac066b2f3e369321752470722941ae26
         this.level.getProfiler().pop();
         PiglinBruteAi.updateActivity(this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index b2b63d9df3c07696f47281e9be74f1799f50b93e..129bba44b8a5ada75b2f73050522975e56d9a069 100644
+index 907d77dd74066c723238155b42028a811365b1f8..f40806e7d9c08cf7b85215fbf0c66169eb4dc6ae 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
@@ -120,8 +120,32 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
@@ -4950,7 +4954,7 @@ index b2b63d9df3c07696f47281e9be74f1799f50b93e..129bba44b8a5ada75b2f73050522975e
     @Override
     public Packet<ClientGamePacketListener> getAddEntityPacket() {
         return new ClientboundAddEntityPacket(this, this.hasPose(Pose.EMERGING) ? 1 : 0);
-@@ -403,19 +427,16 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
+@@ -405,19 +429,16 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
     @Contract("null->false")
     public boolean canTargetEntity(@Nullable Entity entity) {
@@ -4974,10 +4978,10 @@ index b2b63d9df3c07696f47281e9be74f1799f50b93e..129bba44b8a5ada75b2f73050522975e
     public static void applyDarknessAround(ServerLevel world, Vec3 pos, @Nullable Entity entity, int range) {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 6023b9eb3001e1a98ab8b970d853c4e7c7603f4d..dcebf1f79f11b032c12199db8ca0a40396663871 100644
+index 5402a084ef5fe0b3cfea897a90cffade1eff5b66..bf232c81f07e5783071b79b5f3510f9ed473e400 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -153,6 +153,28 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -155,6 +155,28 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
         this.setVillagerData(this.getVillagerData().setType(type).setProfession(VillagerProfession.NONE));
     }
@@ -5006,19 +5010,16 @@ index 6023b9eb3001e1a98ab8b970d853c4e7c7603f4d..dcebf1f79f11b032c12199db8ca0a403
     @Override
     public Brain<Villager> getBrain() {
         return (Brain<Villager>) super.getBrain(); // CraftBukkit - decompile error
-@@ -247,7 +269,10 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -252,7 +274,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     protected void customServerAiStep() { mobTick(false); }
     protected void mobTick(boolean inactive) {
         this.level.getProfiler().push("villagerBrain");
-        if (!inactive) this.getBrain().tick((ServerLevel) this.level, this); // Paper
+         // Pufferfish start
-+        if (!inactive) {
+         if (!inactive) {
-+            if ((getRider() == null || !this.isControllable())/* && this.behaviorTick++ % this.activatedPriority == 0*/) // Pufferfish // Purpur - only use brain if no rider TODO: uncomment when including Pufferfish
+-            if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
-+            this.getBrain().tick((ServerLevel) this.level, this); // Paper
+            if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
-+        }
+             this.getBrain().tick((ServerLevel) this.level, this); // Paper
-         this.level.getProfiler().pop();
+          }
-         if (this.assignProfessionWhenSpawned) {
+         // Pufferfish end
-             this.assignProfessionWhenSpawned = false;
+@@ -312,7 +334,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -304,7 +329,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
         if (!itemstack.is(Items.VILLAGER_SPAWN_EGG) && this.isAlive() && !this.isTrading() && !this.isSleeping()) {
             if (this.isBaby()) {
                 this.setUnhappy();
@@ -5027,7 +5028,7 @@ index 6023b9eb3001e1a98ab8b970d853c4e7c7603f4d..dcebf1f79f11b032c12199db8ca0a403
             } else {
                 boolean flag = this.getOffers().isEmpty();
-@@ -317,8 +342,9 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -325,8 +347,9 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
                 }
                 if (flag) {
--- a/patches/server/0009-Configurable-entity-base-attributes.patch
+++ b/patches/server/0009-Configurable-entity-base-attributes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable entity base attributes
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ceabcb24504228f25412b8821969b8e151ecaf1b..d6ac9c9811449a651e6d13538b9efa7015617b09 100644
+index f216a136c693a202d1e07f8760ab493e51a4738e..a0f63263a2439df93757309a6d9f6394abf81073 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -155,7 +155,7 @@ import org.bukkit.plugin.PluginManager;
@@ -34,10 +34,10 @@ index 7b1ca8fd2908b8a02ec2cd1966a31e06eaa2dd1f..b86329a18dc83073462049da975dd71b
     @Override
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e8798de526e2836308eca8e5f4a4388aa7e9d3c0..1152cdb64ff72358292400d33a4a4f3ca88eff75 100644
+index 223371a33f1c22874d9cc7b8655fef4c61ee5cb4..d8b8547f5561baa5f39d6b5f251a484033483757 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -286,6 +286,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -285,6 +285,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
         this.useItem = ItemStack.EMPTY;
         this.lastClimbablePos = Optional.empty();
         this.attributes = new AttributeMap(DefaultAttributes.getSupplier(type), this); // Purpur
@@ -45,7 +45,7 @@ index e8798de526e2836308eca8e5f4a4388aa7e9d3c0..1152cdb64ff72358292400d33a4a4f3c
         this.craftAttributes = new CraftAttributeMap(this.attributes); // CraftBukkit
         // CraftBukkit - setHealth(getMaxHealth()) inlined and simplified to skip the instanceof check for EntityPlayer, as getBukkitEntity() is not initialized in constructor
         this.entityData.set(LivingEntity.DATA_HEALTH_ID, (float) this.getAttribute(Attributes.MAX_HEALTH).getValue());
-@@ -301,6 +302,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -300,6 +301,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
         this.brain = this.makeBrain(new Dynamic(dynamicopsnbt, (Tag) dynamicopsnbt.createMap((Map) ImmutableMap.of(dynamicopsnbt.createString("memories"), (Tag) dynamicopsnbt.emptyMap()))));
     }
@@ -55,7 +55,7 @@ index e8798de526e2836308eca8e5f4a4388aa7e9d3c0..1152cdb64ff72358292400d33a4a4f3c
         return this.brain;
     }
 diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index a48d40e4242f35c6830286739172459635be3e43..da2b0dfd8a3c033488a1e5d928c40fd66ada5091 100644
+index 29bfea3c4f92033aed1de1cf159d61b38708a281..b1fb9035dc3a1e0d34e1e339f89d9eba073b0d1c 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
@@ -93,6 +93,18 @@ public class Bat extends AmbientCreature {
@@ -459,7 +459,7 @@ index c8a18ecd36393747a95ad9026c5a7b1d62ff727a..05792466a89bdcffe1a4241761b7c23a
     @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index f30aad7e722f895b8f6966f042021fc80f470994..eaf2e6b9865a36b7c648bd1205db922a62cd7ee8 100644
+index 2c5aa1fe81a2411de81c233092bbe3841ed627ea..65587c422eb7e2b64670dd869e01297998765c30 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -113,6 +113,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
@@ -885,7 +885,7 @@ index 4fbae6e88daaabfce22bb9d6e60e02a109e5178a..84bac517860c565d26dfa31ee06fac5c
     public static AttributeSupplier.Builder createAttributes() {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index db5427939d62434ad2d3271e44ffad58b96f121b..b7b2762ff6b01da9a3df0ab0add6d50efd76db8d 100644
+index d1e6b930fe393c4e3c52749819373cc98092aa20..79a5d800434b648c77f25e0d1be8e14b94c30f68 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -107,6 +107,11 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -1424,7 +1424,7 @@ index ad82c064c9e31ffc1dd96e44517187635100fc22..2df1aa1af12b403e9cd87d61b2ff1516
     @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index b4deb7fa656aadd9c62db68bb46d3fb39f8429e5..930d74e5fd20b69baeec60dfc54da37a1290fccc 100644
+index 74d3068c4f74c19740ad3e2f507489d405d78598..b855647ebd374e4d01e90b78a5d650ceab85173d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
@@ -82,6 +82,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -1440,7 +1440,7 @@ index b4deb7fa656aadd9c62db68bb46d3fb39f8429e5..930d74e5fd20b69baeec60dfc54da37a
     @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index dad688184896720099357bf91fe092da3eac8931..9b7e38e7a73206663a06dd180b7ef746d2237f16 100644
+index 5dcaa05ee11872502736c39588dfe03cb59c8e2d..c36b17a7f209ce5f2b366077a192c16fc389cbf7 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
@@ -112,6 +112,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@@ -1472,10 +1472,10 @@ index ac066b2f3e369321752470722941ae26af511309..ba460cb0f65eb98d2c0934084c51c81e
     public static AttributeSupplier.Builder createAttributes() {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index dcebf1f79f11b032c12199db8ca0a40396663871..f9828580075d70d804c92d6db9a944d2e436e268 100644
+index bf232c81f07e5783071b79b5f3510f9ed473e400..fc25e9deb12162f2fe9067da819ff6946f4a5be4 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -173,6 +173,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -175,6 +175,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     protected void registerGoals() {
         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this));
     }
--- a/patches/server/0010-Barrels-and-enderchests-6-rows.patch
+++ b/patches/server/0010-Barrels-and-enderchests-6-rows.patch
--- a/patches/server/0011-Llama-API.patch
+++ b/patches/server/0011-Llama-API.patch
--- a/patches/server/0012-AFK-API.patch
+++ b/patches/server/0012-AFK-API.patch
@@ -73,7 +73,7 @@ index 8fa36563e130f8af0fc60d84d08134fa54c4ca53..dae286863e7bf9316b23724f14d0f22f
         return this.stats;
     }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4037ab672c5dfe417307b2c40474b3c48ae529f0..1e3aa42d2e293f465d91964d2a5aa9118fc4c57b 100644
+index df46668a78adab398f57b4df98d1347844a6674a..db1ff7b3a5d19171480d065ff827606efecbba0f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -337,6 +337,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -119,7 +119,7 @@ index 4037ab672c5dfe417307b2c40474b3c48ae529f0..1e3aa42d2e293f465d91964d2a5aa911
                     // Skip the first time we do this
                     if (true) { // Spigot - don't skip any move events
                         Location oldTo = to.clone();
-@@ -1537,7 +1559,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1538,7 +1560,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                             if (!this.player.isChangingDimension() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.gameMode.isCreative() && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) { // Spigot
                                 flag2 = true; // Paper - diff on change, this should be moved wrongly
@@ -128,7 +128,7 @@ index 4037ab672c5dfe417307b2c40474b3c48ae529f0..1e3aa42d2e293f465d91964d2a5aa911
                             }
                             this.player.absMoveTo(d0, d1, d2, f, f1);
-@@ -1588,6 +1610,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1589,6 +1611,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                                     this.lastYaw = to.getYaw();
                                     this.lastPitch = to.getPitch();
@@ -172,7 +172,7 @@ index 72abebff2018cde2922e97ad6478f93da9aed3ec..412963d7af38a53b6010007278d959a5
     private EntitySelector() {}
     // Paper start
 diff --git a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
-index a7575b5ef56af6f53448d391abb4956e130148ca..0a9e4dc5d6d567605c587df9bcbb57d379b62877 100644
+index e752c83df50fb9b670ecea2abc95426c2a009b6f..baa4f9026d31de92210300ecb8ee8c1b6d575435 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
@@ -64,6 +64,10 @@ public class TargetingConditions {
@@ -218,7 +218,7 @@ index 3b959f42d958bf0f426853aee56753d6c455fcdb..d17abb283ea818244df0379d6b57fc63
                 if (range < 0.0D || d < range * range) {
                     return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6c502a804344d2121653d330a689d012cf5c4562..840849cebbf9090c21923d30e0e3afbc7f14ac43 100644
+index 18a32f55727283f73f8d0089a4b1784ae8248076..2d1ff613dabbc6ae247caf03e79bb7033c28c739 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -525,10 +525,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -281,7 +281,7 @@ index 2f684a8f976f1f1a18c31f4c1a7eba9080099e55..c517873abdcb1e5334ba9e7a1c2f06bb
     public static int barrelRows = 3;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 08b8d90ebdfd3937b6c32a7f18f08aeeaa4a8189..63b5be2433b5fba5c4139a9c1dbaaa79655fba7a 100644
+index 46b6994812086405f20a4dd410c1d79621958cd5..21a33a7952ea9d70df45a99e82286713fd939696 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -92,6 +92,24 @@ public class PurpurWorldConfig {
@@ -310,10 +310,10 @@ index 08b8d90ebdfd3937b6c32a7f18f08aeeaa4a8189..63b5be2433b5fba5c4139a9c1dbaaa79
     public boolean untamedTamablesAreRidable = true;
     public boolean useNightVisionWhenRiding = false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index e881584d38dc354204479863f004e974a0ac6c07..5fde2a74385e621ae96922fd8aa6e386f5b780bb 100644
+index 63d3fcc45be732a4cd2dc8b5347d860fd6577bdd..f1abcd9c63d7bb9797f05e3764262e0080c60da2 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -199,6 +199,7 @@ public class ActivationRange
+@@ -203,6 +203,7 @@ public class ActivationRange
                 continue;
             }
--- a/patches/server/0013-Bring-back-server-name.patch
+++ b/patches/server/0013-Bring-back-server-name.patch
@@ -17,10 +17,10 @@ index 818289e831e3dad29345c43265e2efd7689bc500..1ea3012995c738c67b31e997c138f824
     public final boolean spawnNpcs = this.get("spawn-npcs", true);
     public final boolean pvp = this.get("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3ae359a7334d8e398558fbb7c13cfd490a963d27..e313f4a9025e19b9afd5a725b89dca803516919b 100644
+index 6f59ff3dda4adaa24065ac388c8de556f3934313..3ed3375c327f426c8e20efde000806a8b4bfa24d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2934,4 +2934,11 @@ public final class CraftServer implements Server {
+@@ -2939,4 +2939,11 @@ public final class CraftServer implements Server {
     }
     // Paper end
--- a/patches/server/0014-Configurable-server-mod-name.patch
+++ b/patches/server/0014-Configurable-server-mod-name.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] Configurable server mod name
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9fb7e742b91311bf542f533e2a411e9847be7038..14990205ac4bb02f26a90b91002e1dc07d36d40d 100644
+index 276d8594a70f30b90d46319d95629fc262617063..4ef09e062e1f5157b04623a107ef6bef28b276c9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1682,7 +1682,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1684,7 +1684,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     @DontObfuscate
     public String getServerModName() {
-        return "Purpur"; // Purpur - Purpur > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+-        return "Purpur"; // Purpur - Purpur > // Pufferfish - Pufferfish > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return org.purpurmc.purpur.PurpurConfig.serverModName; // Purpur - Purpur > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+        return org.purpurmc.purpur.PurpurConfig.serverModName; // Purpur - Purpur > // Pufferfish - Pufferfish > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
     }
     public SystemReport fillSystemReport(SystemReport details) {
--- a/patches/server/0015-LivingEntity-safeFallDistance.patch
+++ b/patches/server/0015-LivingEntity-safeFallDistance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity safeFallDistance
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1152cdb64ff72358292400d33a4a4f3ca88eff75..40f9e0969eef6d3543c6ca65915a68479fab700d 100644
+index d8b8547f5561baa5f39d6b5f251a484033483757..cf7ac9f5e18921723b0a8cfd0ed8a829d73e1fd4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -252,6 +252,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -251,6 +251,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
     private boolean skipDropExperience;
     // CraftBukkit start
     public int expToDrop;
@@ -16,7 +16,7 @@ index 1152cdb64ff72358292400d33a4a4f3ca88eff75..40f9e0969eef6d3543c6ca65915a6847
     public boolean forceDrops;
     public ArrayList<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>();
     public final org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
-@@ -352,8 +353,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -351,8 +352,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
             this.tryAddSoulSpeed();
         }
@@ -27,7 +27,7 @@ index 1152cdb64ff72358292400d33a4a4f3ca88eff75..40f9e0969eef6d3543c6ca65915a6847
             if (!state.isAir()) {
                 double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
-@@ -1996,7 +1997,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2018,7 +2019,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
             MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP);
             float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
--- a/patches/server/0016-Lagging-threshold.patch
+++ b/patches/server/0016-Lagging-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1af65fe3e5f05900b25f49ee6b70286eb7b466ed..3bb2aec5a3d73acc47f28a168cbe4973c81bfca5 100644
+index 4ef09e062e1f5157b04623a107ef6bef28b276c9..03358854c88f97bb557da30b29d5a10068d96c99 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -308,6 +308,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -16,7 +16,7 @@ index 1af65fe3e5f05900b25f49ee6b70286eb7b466ed..3bb2aec5a3d73acc47f28a168cbe4973
     public volatile Thread shutdownThread; // Paper
     public volatile boolean abnormalExit = false; // Paper
-@@ -1156,6 +1157,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1158,6 +1159,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                     this.recentTps[1] = tps5.getAverage();
                     this.recentTps[2] = tps15.getAverage();
                     // Paper end
@@ -25,10 +25,10 @@ index 1af65fe3e5f05900b25f49ee6b70286eb7b466ed..3bb2aec5a3d73acc47f28a168cbe4973
                 }
                 // Spigot end
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e313f4a9025e19b9afd5a725b89dca803516919b..8f51ce6068ac610fed09da9d0ffc384f37eeaff2 100644
+index 3ed3375c327f426c8e20efde000806a8b4bfa24d..c6067c4446ee5c531bc2c855ebd0c9cb2e3dada8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2940,5 +2940,10 @@ public final class CraftServer implements Server {
+@@ -2945,5 +2945,10 @@ public final class CraftServer implements Server {
     public String getServerName() {
         return this.getProperties().serverName;
     }
--- a/patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch
+++ b/patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index ceacc0d383e2ee674783d3c0a7df0a951595faca..b8007196d117fa30722b81fc1cf8f1ce04c97c68 100644
+index 8af0918d3a62de58a4b2af55022c812bb0e46092..944ccfacd740ea0cdd0b8ffbd75bd2e561ebad9b 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -313,6 +313,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -315,6 +315,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
         return (EntityType) Registry.register(BuiltInRegistries.ENTITY_TYPE, id, (EntityType<T>) type.build(id)); // CraftBukkit - decompile error
     }
@@ -25,7 +25,7 @@ index ceacc0d383e2ee674783d3c0a7df0a951595faca..b8007196d117fa30722b81fc1cf8f1ce
     public static ResourceLocation getKey(EntityType<?> type) {
         return BuiltInRegistries.ENTITY_TYPE.getKey(type);
     }
-@@ -528,6 +538,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -530,6 +540,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
         return this.category;
     }
--- a/patches/server/0018-Player-invulnerabilities.patch
+++ b/patches/server/0018-Player-invulnerabilities.patch
@@ -82,10 +82,10 @@ index dae286863e7bf9316b23724f14d0f22f522cad4a..90baf612964501ce7048610f62e53894
     public Scoreboard getScoreboard() {
         return this.getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1e3aa42d2e293f465d91964d2a5aa9118fc4c57b..5248a576c65f5758252bb9428c3363b25432ac3e 100644
+index db1ff7b3a5d19171480d065ff827606efecbba0f..6568f3dac5a77ac0cbbaffe7bf499ca1b5f3ff81 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2081,12 +2081,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2082,12 +2082,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
     @Override
     public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
@@ -121,7 +121,7 @@ index 86a1f0733ed2aabe09fc748bdf9561d9b9a8286e..3ed1af31cf0beb945699480bca104e7a
         return entityplayer1;
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 840849cebbf9090c21923d30e0e3afbc7f14ac43..17ea58f45f4bc4eb8bbbeadd6f25a477061d1617 100644
+index 2d1ff613dabbc6ae247caf03e79bb7033c28c739..254d91e2a06186d602f7edae7a46b0e4ee9be662 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3174,5 +3174,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -146,7 +146,7 @@ index 840849cebbf9090c21923d30e0e3afbc7f14ac43..17ea58f45f4bc4eb8bbbeadd6f25a477
     // Purpur end
 }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 63b5be2433b5fba5c4139a9c1dbaaa79655fba7a..38bfaa8e15d56bc2934f3281ec43954f94ea1ca7 100644
+index 21a33a7952ea9d70df45a99e82286713fd939696..786c1e30c56dfe28d00a9727c97d837cf7310ad3 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -97,6 +97,8 @@ public class PurpurWorldConfig {
--- a/patches/server/0019-Anvil-API.patch
+++ b/patches/server/0019-Anvil-API.patch
--- a/patches/server/0020-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0020-Alternative-Keepalive-Handling.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5248a576c65f5758252bb9428c3363b25432ac3e..a225da8118b25f15876d700f2b3b02b1c6bc5ddb 100644
+index 6568f3dac5a77ac0cbbaffe7bf499ca1b5f3ff81..4e23ff71e14be7b88abc0bbcb8523eeb87556310 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -261,6 +261,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -38,7 +38,7 @@ index 5248a576c65f5758252bb9428c3363b25432ac3e..a225da8118b25f15876d700f2b3b02b1
         if (this.keepAlivePending) {
             if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                 ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
-@@ -3508,6 +3524,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3510,6 +3526,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
     @Override
     public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
--- a/patches/server/0021-Silk-touch-spawners.patch
+++ b/patches/server/0021-Silk-touch-spawners.patch
@@ -89,7 +89,7 @@ index 936d844a5a246138c9f9ae4ae6e318242b8f1420..d58dc4aa02fe371deaf879df8692dbe9
             int i = 15 + worldserver.random.nextInt(15) + worldserver.random.nextInt(15);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 38bfaa8e15d56bc2934f3281ec43954f94ea1ca7..c0e4a7228420ad552e65d2a5fec3cddee18a13fb 100644
+index 786c1e30c56dfe28d00a9727c97d837cf7310ad3..e7b23899c4787fbcb6a8c65ece88967eece4f3e1 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -114,6 +114,38 @@ public class PurpurWorldConfig {
--- a/patches/server/0022-Add-turtle-egg-block-options.patch
+++ b/patches/server/0022-Add-turtle-egg-block-options.patch
@@ -36,7 +36,7 @@ index 6c1a0e6f961e46a1a89850746a71e97b32514adf..1942649e868fc985a488034c411a6721
     }
 }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c0e4a7228420ad552e65d2a5fec3cddee18a13fb..a5b2f8611d5270f9188b257b7adcf209da51e1ec 100644
+index e7b23899c4787fbcb6a8c65ece88967eece4f3e1..1046f6de8a04c4368870596f90236fe01671173d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -146,6 +146,15 @@ public class PurpurWorldConfig {
--- a/patches/server/0023-Fix-vanilla-command-permission-handler.patch
+++ b/patches/server/0023-Fix-vanilla-command-permission-handler.patch
--- a/patches/server/0024-Logger-settings-suppressing-pointless-logs.patch
+++ b/patches/server/0024-Logger-settings-suppressing-pointless-logs.patch
--- a/patches/server/0025-Disable-outdated-build-check.patch
+++ b/patches/server/0025-Disable-outdated-build-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable outdated build check
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 0206b97cdc244998b1a4f148a71457dabb9236de..1b366a36e78aecce6ae1022c4caa65923b8693a9 100644
+index f5266df43726a7805ee2664ed18a2dcf79ab6cde..ad4bc3f46bb6f02284ecf62e2701bb627e096b15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -285,7 +285,7 @@ public class Main {
--- a/patches/server/0026-Giants-AI-settings.patch
+++ b/patches/server/0026-Giants-AI-settings.patch
--- a/patches/server/0027-Zombie-horse-naturally-spawn.patch
+++ b/patches/server/0027-Zombie-horse-naturally-spawn.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Zombie horse naturally spawn
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ffde1d129c5434e7748cbdaac9109cbd3d0d29bc..057f4b71ff295cf6fed9cc5b86aa40345e448af3 100644
+index b40bc54e80dadc8eb426ed6217b879631833e4d7..a7c153f957af48cf42ecbb01ada5f8f384c4e5e4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -814,10 +814,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -830,10 +830,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
                 boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01D) && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper
                 if (flag1) {
--- a/patches/server/0028-Charged-creeper-naturally-spawn.patch
+++ b/patches/server/0028-Charged-creeper-naturally-spawn.patch
--- a/patches/server/0029-Rabbit-naturally-spawn-toast-and-killer.patch
+++ b/patches/server/0029-Rabbit-naturally-spawn-toast-and-killer.patch
--- a/patches/server/0030-Fix-outdated-server-showing-in-ping-before-server-fu.patch
+++ b/patches/server/0030-Fix-outdated-server-showing-in-ping-before-server-fu.patch
--- a/patches/server/0031-Tulips-change-fox-type.patch
+++ b/patches/server/0031-Tulips-change-fox-type.patch
--- a/patches/server/0032-Breedable-Polar-Bears.patch
+++ b/patches/server/0032-Breedable-Polar-Bears.patch
--- a/patches/server/0033-Chickens-can-retaliate.patch
+++ b/patches/server/0033-Chickens-can-retaliate.patch
--- a/patches/server/0034-Add-option-to-set-armorstand-step-height.patch
+++ b/patches/server/0034-Add-option-to-set-armorstand-step-height.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to set armorstand step height
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d6ac9c9811449a651e6d13538b9efa7015617b09..2e263243651e9feb1ea7e011507502b6a634a49c 100644
+index a0f63263a2439df93757309a6d9f6394abf81073..af6da7a9b93ef808759c7e213354ebfeed7e7a77 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -319,7 +319,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -30,7 +30,7 @@ index 3677dd991ae73428984e62e4d6fb757317987887..697d6d6cca0a1c8df9c5bf6852495130
         if (!this.canTick) {
             if (this.noTickPoseDirty) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6d9c429b91aef725bc0da88c790ef63417595208..652f9dc1dc0f31f72d15d2fa99406b4860109b1f 100644
+index 47bd9c45b4a560b1fcc01eee9606afef7416f70d..7fe6efbed2bd5f9a9d5b9a8ff5118a799cda4d11 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -92,6 +92,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0035-Cat-spawning-options.patch
+++ b/patches/server/0035-Cat-spawning-options.patch
--- a/patches/server/0036-Cows-eat-mushrooms.patch
+++ b/patches/server/0036-Cows-eat-mushrooms.patch
--- a/patches/server/0037-Fix-cow-rotation-when-shearing-mooshroom.patch
+++ b/patches/server/0037-Fix-cow-rotation-when-shearing-mooshroom.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix cow rotation when shearing mooshroom
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index 19bd997d421a338966fcd3e3dfeb8669a6fb542f..2f85004a9dac740a9ddadd18b47cf3be821e5add 100644
+index b1c2663a7f42714a620d59096f26f0a965875846..12b715086a347b82726327358ac71c72a4fca8b0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
@@ -202,7 +202,13 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
--- a/patches/server/0038-Pigs-give-saddle-back.patch
+++ b/patches/server/0038-Pigs-give-saddle-back.patch
--- a/patches/server/0039-Snowman-drop-and-put-back-pumpkin.patch
+++ b/patches/server/0039-Snowman-drop-and-put-back-pumpkin.patch
--- a/patches/server/0040-Ender-dragon-always-drop-full-exp.patch
+++ b/patches/server/0040-Ender-dragon-always-drop-full-exp.patch
--- a/patches/server/0041-Signs-editable-on-right-click.patch
+++ b/patches/server/0041-Signs-editable-on-right-click.patch
@@ -50,7 +50,7 @@ index aface9a9697095a29edaf73c9cdabc2c1414b9d7..1a04d0a601b8e481dd6e2592b849b907
                 } else {
                     return InteractionResult.PASS;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 5b12598509f16dd44f8c256143db6e30c9bd014a..48de15c64ab761934a8e5499c760a78ad1dc7465 100644
+index d0ce35d161498220eb1b0ce7ff8d0abd8a06fc35..8db5d37e22bc3c20bf9c8f0737968c39d475db9f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -151,6 +151,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0042-Allow-soil-to-moisten-from-water-directly-under-it.patch
+++ b/patches/server/0042-Allow-soil-to-moisten-from-water-directly-under-it.patch
@@ -18,7 +18,7 @@ index 34d744837e599633a3c2c0b72f253bb0e157f226..fce9ebcaaac18ecee24c7091ea77a32a
     @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 48de15c64ab761934a8e5499c760a78ad1dc7465..df7e76dfc54d9183a043e1818a597e44f418fd9f 100644
+index 8db5d37e22bc3c20bf9c8f0737968c39d475db9f..7b0829e64b04affe1af155419722c78a187ff216 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -151,6 +151,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0043-Minecart-settings-and-WASD-controls.patch
+++ b/patches/server/0043-Minecart-settings-and-WASD-controls.patch
@@ -149,7 +149,7 @@ index 505503a3f59d4b747649275c6f6faa504b7c7b64..532a9920bccfc90ee75ac21714812e88
     protected final float explosionResistance;
     protected final boolean isRandomlyTicking;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index df7e76dfc54d9183a043e1818a597e44f418fd9f..ba924f551f0d67007b94521f7e7925916e46f429 100644
+index 7b0829e64b04affe1af155419722c78a187ff216..4ed7b12a08df116807be89123b7b9b689eace49a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -97,6 +97,68 @@ public class PurpurWorldConfig {
--- a/patches/server/0044-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/server/0044-Disable-loot-drops-on-death-by-cramming.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable loot drops on death by cramming
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d0437c2d10c44883c90861666dc2cd8805c4d5ab..bf4d6413f90e7b6941acdfd78e52b7f97232a670 100644
+index cf7ac9f5e18921723b0a8cfd0ed8a829d73e1fd4..5ce0906f891f9465eea4dc8c574b83ccc937f80c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1748,6 +1748,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1756,6 +1756,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
         this.dropEquipment(); // CraftBukkit - from below
         if (this.shouldDropLoot() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
@@ -16,7 +16,7 @@ index d0437c2d10c44883c90861666dc2cd8805c4d5ab..bf4d6413f90e7b6941acdfd78e52b7f9
             this.dropFromLootTable(source, flag);
             // Paper start
             final boolean prev = this.clearEquipmentSlots;
-@@ -1756,6 +1757,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1764,6 +1765,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
             // Paper end
             this.dropCustomDeathLoot(source, i, flag);
             this.clearEquipmentSlots = prev; // Paper
@@ -25,7 +25,7 @@ index d0437c2d10c44883c90861666dc2cd8805c4d5ab..bf4d6413f90e7b6941acdfd78e52b7f9
         // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment
         org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops, () -> {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ba924f551f0d67007b94521f7e7925916e46f429..d3ebe9773e7b2b590956a5744cbec6d45ef96af7 100644
+index 4ed7b12a08df116807be89123b7b9b689eace49a..6cfd8e222d432ffc23eeb21db240a21e1e52f678 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -97,6 +97,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0045-Option-to-toggle-milk-curing-bad-omen.patch
+++ b/patches/server/0045-Option-to-toggle-milk-curing-bad-omen.patch
@@ -28,7 +28,7 @@ index f33977d95b6db473be4f95075ba99caf90ad0220..56dc04d8875971ee9a5d077a695509af
         return stack.isEmpty() ? new ItemStack(Items.BUCKET) : stack;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d3ebe9773e7b2b590956a5744cbec6d45ef96af7..35a8eda30400a606358f62c02f984376632cce92 100644
+index 6cfd8e222d432ffc23eeb21db240a21e1e52f678..58ada439e2d02383573c69859f48a2f6286a8899 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -98,8 +98,10 @@ public class PurpurWorldConfig {
--- a/patches/server/0046-End-gateway-should-check-if-entity-can-use-portal.patch
+++ b/patches/server/0046-End-gateway-should-check-if-entity-can-use-portal.patch
--- a/Show More
+++ b/Show More