More more more more work

2022-07-27 22:55:55 +02:00
parent b0694bd518
commit f7123fdddb
111 changed files with 13 additions and 13 deletions
--- a/patches/unapplied/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/unapplied/server/Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alvinn8 <42838560+Alvinn8@users.noreply.github.com>
-Date: Fri, 8 Jan 2021 20:31:13 +0100
-Subject: [PATCH] Add Adventure message to PlayerAdvancementDoneEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
-+++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-@@ -0,0 +0,0 @@ public class PlayerAdvancements {
-             this.progressChanged.add(advancement);
-             flag = true;
-             if (!flag1 && advancementprogress.isDone()) {
-                this.player.level.getCraftServer().getPluginManager().callEvent(new org.bukkit.event.player.PlayerAdvancementDoneEvent(this.player.getBukkitEntity(), advancement.bukkit)); // CraftBukkit
-+                // Paper start - Add Adventure message to PlayerAdvancementDoneEvent
-+                boolean announceToChat = advancement.getDisplay() != null && advancement.getDisplay().shouldAnnounceChat();
-+                net.kyori.adventure.text.Component message = announceToChat ? io.papermc.paper.adventure.PaperAdventure.asAdventure(Component.translatable("chat.type.advancement." + advancement.getDisplay().getFrame().getName(), this.player.getDisplayName(), advancement.getChatComponent())) : null;
-+                org.bukkit.event.player.PlayerAdvancementDoneEvent event = new org.bukkit.event.player.PlayerAdvancementDoneEvent(this.player.getBukkitEntity(), advancement.bukkit, message);
-+                this.player.level.getCraftServer().getPluginManager().callEvent(event);
-+                message = event.message();
-+                // Paper end
-                 advancement.getRewards().grant(this.player);
-                if (advancement.getDisplay() != null && advancement.getDisplay().shouldAnnounceChat() && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
-                    this.playerList.broadcastSystemMessage(Component.translatable("chat.type.advancement." + advancement.getDisplay().getFrame().getName(), this.player.getDisplayName(), advancement.getChatComponent()), ChatType.SYSTEM);
-+                // Paper start - Add Adventure message to PlayerAdvancementDoneEvent
-+                if (message != null && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
-+                    this.playerList.broadcastSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), ChatType.SYSTEM);
-+                    // Paper end
-                 }
-             }
-         }
--- a/patches/unapplied/server/Add-Block-isValidTool.patch
+++ b/patches/unapplied/server/Add-Block-isValidTool.patch
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 6 Jul 2020 12:44:31 -0700
-Subject: [PATCH] Add Block#isValidTool
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -0,0 +0,0 @@ public class CraftBlock implements Block {
-         }
-         return speed;
-     }
-+
-+    public boolean isValidTool(ItemStack itemStack) {
-+        return getDrops(itemStack).size() != 0;
-+    }
-     // Paper end
- }
--- a/patches/unapplied/server/Add-Channel-initialization-listeners.patch
+++ b/patches/unapplied/server/Add-Channel-initialization-listeners.patch
@@ -1,155 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Thu, 29 Apr 2021 21:19:33 +0200
-Subject: [PATCH] Add Channel initialization listeners
-
-
-diff --git a/src/main/java/io/papermc/paper/network/ChannelInitializeListener.java b/src/main/java/io/papermc/paper/network/ChannelInitializeListener.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/network/ChannelInitializeListener.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.network;
-+
-+import io.netty.channel.Channel;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+
-+/**
-+ * Internal API to register channel initialization listeners.
-+ * <p>
-+ * This is not officially supported API and we make no guarantees to the existence or state of this interface.
-+ */
-+@FunctionalInterface
-+public interface ChannelInitializeListener {
-+
-+    void afterInitChannel(@NonNull Channel channel);
-+}
-diff --git a/src/main/java/io/papermc/paper/network/ChannelInitializeListenerHolder.java b/src/main/java/io/papermc/paper/network/ChannelInitializeListenerHolder.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/network/ChannelInitializeListenerHolder.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.network;
-+
-+import io.netty.channel.Channel;
-+import net.kyori.adventure.key.Key;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+
-+import java.util.Collections;
-+import java.util.HashMap;
-+import java.util.Map;
-+
-+/**
-+ * Internal API to register channel initialization listeners.
-+ * <p>
-+ * This is not officially supported API and we make no guarantees to the existence or state of this class.
-+ */
-+public final class ChannelInitializeListenerHolder {
-+
-+    private static final Map<Key, ChannelInitializeListener> LISTENERS = new HashMap<>();
-+    private static final Map<Key, ChannelInitializeListener> IMMUTABLE_VIEW = Collections.unmodifiableMap(LISTENERS);
-+
-+    private ChannelInitializeListenerHolder() {
-+    }
-+
-+    /**
-+     * Registers whether an initialization listener is registered under the given key.
-+     *
-+     * @param key key
-+     * @return whether an initialization listener is registered under the given key
-+     */
-+    public static boolean hasListener(@NonNull Key key) {
-+        return LISTENERS.containsKey(key);
-+    }
-+
-+    /**
-+     * Registers a channel initialization listener called after ServerConnection is initialized.
-+     *
-+     * @param key      key
-+     * @param listener initialization listeners
-+     */
-+    public static void addListener(@NonNull Key key, @NonNull ChannelInitializeListener listener) {
-+        LISTENERS.put(key, listener);
-+    }
-+
-+    /**
-+     * Removes and returns an initialization listener registered by the given key if present.
-+     *
-+     * @param key key
-+     * @return removed initialization listener if present
-+     */
-+    public static @Nullable ChannelInitializeListener removeListener(@NonNull Key key) {
-+        return LISTENERS.remove(key);
-+    }
-+
-+    /**
-+     * Returns an immutable map of registered initialization listeners.
-+     *
-+     * @return immutable map of registered initialization listeners
-+     */
-+    public static @NonNull Map<Key, ChannelInitializeListener> getListeners() {
-+        return IMMUTABLE_VIEW;
-+    }
-+
-+    /**
-+     * Calls the registered listeners with the given channel.
-+     *
-+     * @param channel channel
-+     */
-+    public static void callListeners(@NonNull Channel channel) {
-+        for (ChannelInitializeListener listener : LISTENERS.values()) {
-+            listener.afterInitChannel(channel);
-+        }
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/network/ConnectionEvent.java b/src/main/java/io/papermc/paper/network/ConnectionEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/network/ConnectionEvent.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.network;
-+
-+/**
-+ * Internal connection pipeline events.
-+ */
-+public enum ConnectionEvent {
-+
-+    COMPRESSION_THRESHOLD_SET,
-+    COMPRESSION_DISABLED
-+}
-diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/network/Connection.java
-+++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -0,0 +0,0 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-             } else {
-                 this.channel.pipeline().addBefore("encoder", "compress", new CompressionEncoder(compressionThreshold));
-             }
-+            this.channel.pipeline().fireUserEventTriggered(io.papermc.paper.network.ConnectionEvent.COMPRESSION_THRESHOLD_SET); // Paper
-         } else {
-             if (this.channel.pipeline().get("decompress") instanceof CompressionDecoder) {
-                 this.channel.pipeline().remove("decompress");
-@@ -0,0 +0,0 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-             if (this.channel.pipeline().get("compress") instanceof CompressionEncoder) {
-                 this.channel.pipeline().remove("compress");
-             }
-+            this.channel.pipeline().fireUserEventTriggered(io.papermc.paper.network.ConnectionEvent.COMPRESSION_DISABLED); // Paper
-         }
- 
-     }
-diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-+++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -0,0 +0,0 @@ public class ServerConnectionListener {
-                     pending.add((Connection) object); // Paper
-                     channel.pipeline().addLast("packet_handler", (ChannelHandler) object);
-                     ((Connection) object).setListener(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));
-+                    io.papermc.paper.network.ChannelInitializeListenerHolder.callListeners(channel); // Paper
-                 }
-             }).group((EventLoopGroup) lazyinitvar.get()).localAddress(address, port)).option(ChannelOption.AUTO_READ, false).bind().syncUninterruptibly()); // CraftBukkit
-         }
--- a/patches/unapplied/server/Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/unapplied/server/Add-EntityBlockStorage-clearEntities.patch
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Mon, 5 Apr 2021 18:12:29 -0400
-Subject: [PATCH] Add EntityBlockStorage#clearEntities()
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-@@ -0,0 +0,0 @@ public class BeehiveBlockEntity extends BlockEntity {
-         return this.stored.size();
-     }
- 
-+    // Paper start - Add EntityBlockStorage clearEntities
-+    public void clearBees() {
-+        this.stored.clear();
-+    }
-+    // Paper end
-     public static int getHoneyLevel(BlockState state) {
-         return (Integer) state.getValue(BeehiveBlock.HONEY_LEVEL);
-     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
-@@ -0,0 +0,0 @@ public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> impl
- 
-         getSnapshot().addOccupant(((CraftBee) entity).getHandle(), false);
-     }
-+    // Paper start - Add EntityBlockStorage clearEntities
-+    @Override
-+    public void clearEntities() {
-+        getSnapshot().clearBees();
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/Add-EntityLoadCrossbowEvent.patch
+++ b/patches/unapplied/server/Add-EntityLoadCrossbowEvent.patch
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Josh Roy <10731363+JRoy@users.noreply.github.com>
-Date: Wed, 7 Oct 2020 12:04:01 -0400
-Subject: [PATCH] Add EntityLoadCrossbowEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/CrossbowItem.java
-+++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java
-@@ -0,0 +0,0 @@ public class CrossbowItem extends ProjectileWeaponItem implements Vanishable {
-         int j = this.getUseDuration(stack) - remainingUseTicks;
-         float f = CrossbowItem.getPowerForTime(j, stack);
- 
-        if (f >= 1.0F && !CrossbowItem.isCharged(stack) && CrossbowItem.tryLoadProjectiles(user, stack)) {
-+        // Paper start - EntityLoadCrossbowEvent
-+        if (f >= 1.0F && !CrossbowItem.isCharged(stack) /*&& CrossbowItem.tryLoadProjectiles(entityliving, itemstack)*/) {
-+            final io.papermc.paper.event.entity.EntityLoadCrossbowEvent event = new io.papermc.paper.event.entity.EntityLoadCrossbowEvent(user.getBukkitLivingEntity(), stack.asBukkitMirror(), user.getUsedItemHand() == InteractionHand.MAIN_HAND ? org.bukkit.inventory.EquipmentSlot.HAND : org.bukkit.inventory.EquipmentSlot.OFF_HAND);
-+            if (!event.callEvent() || !tryLoadProjectiles(user, stack, event.shouldConsumeItem())) {
-+                if (user instanceof ServerPlayer player) player.containerMenu.sendAllDataToRemote();
-+                return;
-+            }
-+            // Paper end
-             CrossbowItem.setCharged(stack, true);
-             SoundSource soundcategory = user instanceof Player ? SoundSource.PLAYERS : SoundSource.HOSTILE;
- 
-@@ -0,0 +0,0 @@ public class CrossbowItem extends ProjectileWeaponItem implements Vanishable {
-     }
- 
-     private static boolean tryLoadProjectiles(LivingEntity shooter, ItemStack projectile) {
-+        // Paper start
-+        return CrossbowItem.tryLoadProjectiles(shooter, projectile, true);
-+    }
-+    private static boolean tryLoadProjectiles(LivingEntity shooter, ItemStack projectile, boolean consume) {
-+        // Paper end
-         int i = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.MULTISHOT, projectile);
-         int j = i == 0 ? 1 : 3;
-        boolean flag = shooter instanceof Player && ((Player) shooter).getAbilities().instabuild;
-+        boolean flag = !consume || shooter instanceof Player && ((Player) shooter).getAbilities().instabuild; // Paper - add consume
-         ItemStack itemstack1 = shooter.getProjectile(projectile);
-         ItemStack itemstack2 = itemstack1.copy();
- 
--- a/patches/unapplied/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/unapplied/server/Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 24 Dec 2020 12:43:39 -0800
-Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -0,0 +0,0 @@ public class CraftEventFactory {
-                         return BedEnterResult.TOO_FAR_AWAY;
-                     case NOT_SAFE:
-                         return BedEnterResult.NOT_SAFE;
-+                        // Paper start
-+                    case OBSTRUCTED:
-+                        return BedEnterResult.OBSTRUCTED;
-+                        // Paper end
-                     default:
-                         return BedEnterResult.OTHER_PROBLEM;
-                 }
--- a/patches/unapplied/server/Add-PaperRegistry.patch
+++ b/patches/unapplied/server/Add-PaperRegistry.patch
@@ -1,242 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 2 Mar 2022 13:33:08 -0800
-Subject: [PATCH] Add PaperRegistry
-
-PaperRegistry is a server-backed impl of bukkit's Registry interface
-
-diff --git a/src/main/java/io/papermc/paper/registry/PaperRegistry.java b/src/main/java/io/papermc/paper/registry/PaperRegistry.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/registry/PaperRegistry.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.registry;
-+
-+import com.google.common.base.Preconditions;
-+import com.google.common.base.Suppliers;
-+import net.minecraft.core.Holder;
-+import net.minecraft.core.Registry;
-+import net.minecraft.core.RegistryAccess;
-+import net.minecraft.resources.ResourceKey;
-+import net.minecraft.resources.ResourceLocation;
-+import net.minecraft.server.MinecraftServer;
-+import org.bukkit.Keyed;
-+import org.bukkit.NamespacedKey;
-+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+import java.util.Collections;
-+import java.util.HashMap;
-+import java.util.Iterator;
-+import java.util.Map;
-+import java.util.Objects;
-+import java.util.Optional;
-+import java.util.concurrent.ConcurrentHashMap;
-+import java.util.function.Consumer;
-+import java.util.function.Supplier;
-+
-+@DefaultQualifier(NonNull.class)
-+public abstract class PaperRegistry<API extends Keyed, MINECRAFT> implements org.bukkit.Registry<API> {
-+
-+    @SuppressWarnings("FieldMayBeFinal") // non-final for testing
-+    private static Supplier<RegistryAccess> REGISTRY_ACCESS = Suppliers.memoize(() -> MinecraftServer.getServer().registryAccess());
-+    private static final Map<RegistryKey<?, ?>, PaperRegistry<?, ?>> INTERNAL_REGISTRIES = new HashMap<>();
-+    public static final Map<RegistryKey<?, ?>, PaperRegistry<?, ?>> REGISTRIES = Collections.unmodifiableMap(INTERNAL_REGISTRIES);
-+    private static final Map<Class<?>, PaperRegistry<?, ?>> REGISTRY_BY_API_CLASS = new HashMap<>();
-+    private static final Map<ResourceKey<? extends Registry<?>>, PaperRegistry<?, ?>> REGISTRY_BY_RES_KEY = new HashMap<>();
-+
-+    private boolean registered;
-+    private final RegistryKey<API, MINECRAFT> registryKey;
-+    private final Supplier<Registry<MINECRAFT>> registry;
-+    private final Map<NamespacedKey, API> cache = new ConcurrentHashMap<>();
-+    private final Map<NamespacedKey, ResourceKey<MINECRAFT>> resourceKeyCache = new ConcurrentHashMap<>();
-+
-+    public PaperRegistry(RegistryKey<API, MINECRAFT> registryKey) {
-+        this.registryKey = registryKey;
-+        this.registry = Suppliers.memoize(() -> REGISTRY_ACCESS.get().registryOrThrow(this.registryKey.resourceKey()));
-+    }
-+
-+    @Override
-+    public @Nullable API get(NamespacedKey key) {
-+        return this.cache.computeIfAbsent(key, k -> {
-+            final @Nullable MINECRAFT nms = this.registry.get().get(CraftNamespacedKey.toMinecraft(k));
-+            if (nms != null) {
-+                return this.convertToApi(k, nms);
-+            }
-+            return null;
-+        });
-+    }
-+
-+    public abstract @Nullable API convertToApi(NamespacedKey key, MINECRAFT nms);
-+
-+    public API convertToApiOrThrow(ResourceLocation resourceLocation, MINECRAFT nms) {
-+        return Objects.requireNonNull(this.convertToApi(resourceLocation, nms), resourceLocation + " has a null api representation");
-+    }
-+
-+    public @Nullable API convertToApi(ResourceLocation resourceLocation, MINECRAFT nms) {
-+        return this.convertToApi(CraftNamespacedKey.fromMinecraft(resourceLocation), nms);
-+    }
-+
-+    public API convertToApiOrThrow(Holder<MINECRAFT> nmsHolder) {
-+        return Objects.requireNonNull(this.convertToApi(nmsHolder), nmsHolder + " has a null api representation");
-+    }
-+
-+    public @Nullable API convertToApi(Holder<MINECRAFT> nmsHolder) {
-+        final Optional<ResourceKey<MINECRAFT>> key = nmsHolder.unwrapKey();
-+        if (nmsHolder.isBound() && key.isPresent()) {
-+            return this.convertToApi(key.get().location(), nmsHolder.value());
-+        } else if (!nmsHolder.isBound() && key.isPresent()) {
-+            return this.convertToApi(key.get().location(), this.registry.get().getOrThrow(key.get()));
-+        } else if (nmsHolder.isBound() && key.isEmpty()) {
-+            final @Nullable ResourceLocation loc = this.registry.get().getKey(nmsHolder.value());
-+            if (loc != null) {
-+                return this.convertToApi(loc, nmsHolder.value());
-+            }
-+        }
-+        throw new IllegalStateException("Cannot convert " + nmsHolder + " to an API type in: " + this.registryKey);
-+    }
-+
-+    public void convertToApi(Iterable<Holder<MINECRAFT>> holders, Consumer<API> apiConsumer, boolean throwOnNull) {
-+        for (Holder<MINECRAFT> holder : holders) {
-+            final @Nullable API api = this.convertToApi(holder);
-+            if (api == null && throwOnNull) {
-+                throw new NullPointerException(holder + " has a null api representation");
-+            } else if (api != null) {
-+                apiConsumer.accept(api);
-+            }
-+        }
-+    }
-+
-+    public MINECRAFT getMinecraftValue(API apiValue) {
-+        return this.registry.get().getOptional(CraftNamespacedKey.toMinecraft(apiValue.getKey())).orElseThrow();
-+    }
-+
-+    public Holder<MINECRAFT> getMinecraftHolder(API apiValue) {
-+        return this.registry.get().getHolderOrThrow(this.resourceKeyCache.computeIfAbsent(apiValue.getKey(), key -> ResourceKey.create(this.registryKey.resourceKey(), CraftNamespacedKey.toMinecraft(key))));
-+    }
-+
-+    @Override
-+    public Iterator<API> iterator() {
-+        return this.registry.get().keySet().stream().map(key -> this.get(CraftNamespacedKey.fromMinecraft(key))).iterator();
-+    }
-+
-+    public void clearCache() {
-+        this.cache.clear();
-+    }
-+
-+    public void register() {
-+        if (this.registered) {
-+            throw new IllegalStateException("Already registered: " + this.registryKey.apiClass());
-+        }
-+        INTERNAL_REGISTRIES.put(this.registryKey, this);
-+        REGISTRY_BY_API_CLASS.put(this.registryKey.apiClass(), this);
-+        REGISTRY_BY_RES_KEY.put(this.registryKey.resourceKey(), this);
-+        this.registered = true;
-+    }
-+
-+    @Override
-+    public boolean equals(@Nullable Object o) {
-+        if (this == o) return true;
-+        if (o == null || !PaperRegistry.class.isAssignableFrom(o.getClass())) return false;
-+        PaperRegistry<?, ?> that = (PaperRegistry<?, ?>) o;
-+        return this.registryKey.equals(that.registryKey);
-+    }
-+
-+    @Override
-+    public int hashCode() {
-+        return Objects.hash(this.registryKey);
-+    }
-+
-+    protected static <T> Supplier<Registry<T>> registryFor(ResourceKey<? extends Registry<T>> registryKey) {
-+        return Suppliers.memoize(() -> REGISTRY_ACCESS.get().registryOrThrow(registryKey));
-+    }
-+
-+    public static void clearCaches() {
-+        for (PaperRegistry<?, ?> registry : INTERNAL_REGISTRIES.values()) {
-+            registry.clearCache();
-+        }
-+    }
-+
-+    @SuppressWarnings("unchecked")
-+    public static <T extends Keyed> PaperRegistry<T, ?> getRegistry(Class<T> classOfT) {
-+        Preconditions.checkArgument(REGISTRY_BY_API_CLASS.containsKey(classOfT), "No registry for that type");
-+        return (PaperRegistry<T, ?>) REGISTRY_BY_API_CLASS.get(classOfT);
-+    }
-+
-+    @SuppressWarnings("unchecked")
-+    public static <T> PaperRegistry<?, T> getRegistry(ResourceKey<? extends Registry<T>> resourceKey) {
-+        Preconditions.checkArgument(REGISTRY_BY_RES_KEY.containsKey(resourceKey));
-+        return (PaperRegistry<?, T>) REGISTRY_BY_RES_KEY.get(resourceKey);
-+    }
-+
-+    @SuppressWarnings("unchecked")
-+    public static <A extends Keyed, M> PaperRegistry<A, M> getRegistry(RegistryKey<A, M> registryKey) {
-+        Preconditions.checkArgument(INTERNAL_REGISTRIES.containsKey(registryKey));
-+        return (PaperRegistry<A, M>) INTERNAL_REGISTRIES.get(registryKey);
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/registry/RegistryKey.java b/src/main/java/io/papermc/paper/registry/RegistryKey.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/registry/RegistryKey.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.registry;
-+
-+import net.minecraft.core.Registry;
-+import net.minecraft.resources.ResourceKey;
-+import org.bukkit.Keyed;
-+
-+public record RegistryKey<API extends Keyed, MINECRAFT>(Class<API> apiClass, ResourceKey<? extends Registry<MINECRAFT>> resourceKey) {
-+}
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             this.packRepository.setSelected(dataPacks);
-             this.worldData.setDataPackConfig(MinecraftServer.getSelectedPacks(this.packRepository));
-             this.resources.managers.updateRegistryTags(this.registryAccess());
-+            io.papermc.paper.registry.PaperRegistry.clearCaches(); // Paper
-             new io.papermc.paper.event.server.ServerResourcesReloadedEvent(cause).callEvent(); // Paper
-             // Paper start
-             if (Thread.currentThread() != this.serverThread) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     public int nextEntityId() {
-         return net.minecraft.world.entity.Entity.nextEntityId();
-     }
-+
-+    @Override
-+    public <T extends org.bukkit.Keyed> Registry<T> registryFor(Class<T> classOfT) {
-+        return io.papermc.paper.registry.PaperRegistry.getRegistry(classOfT);
-+    }
-     // Paper end
- 
-     /**
-diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
-+++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-@@ -0,0 +0,0 @@ public abstract class AbstractTestingBase {
-         MultiPackResourceManager resourceManager = new MultiPackResourceManager(PackType.SERVER_DATA, Collections.singletonList(new VanillaPackResources(ServerPacksSource.BUILT_IN_METADATA, "minecraft")));
-         // add tags and loot tables for unit tests
-         REGISTRY_CUSTOM = RegistryAccess.builtinCopy().freeze();
-+        // Paper start
-+        try {
-+            java.lang.reflect.Field field = io.papermc.paper.registry.PaperRegistry.class.getDeclaredField("REGISTRY_ACCESS");
-+            field.trySetAccessible();
-+            field.set(null, com.google.common.base.Suppliers.ofInstance(REGISTRY_CUSTOM));
-+        } catch (ReflectiveOperationException ex) {
-+            throw new IllegalStateException("Could not reflectively set RegistryAccess in PaperRegistry", ex);
-+        }
-+        // Paper end
-         // Register vanilla pack
-         DATA_PACK = ReloadableServerResources.loadResources(resourceManager, REGISTRY_CUSTOM, Commands.CommandSelection.DEDICATED, 0, MoreExecutors.directExecutor(), MoreExecutors.directExecutor()).join();
-         // Bind tags
--- a/patches/unapplied/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/unapplied/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
@@ -1,251 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 2 Jul 2020 16:12:10 -0700
-Subject: [PATCH] Add PlayerTradeEvent and PlayerPurchaseEvent
-
-Co-authored-by: Alexander <protonull@protonmail.com>
-
-diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-@@ -0,0 +0,0 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
-     @Override
-     public void overrideXp(int experience) {}
- 
-+    // Paper start
-+    @Override
-+    public void processTrade(MerchantOffer recipe, @Nullable io.papermc.paper.event.player.PlayerPurchaseEvent event) { // The MerchantRecipe passed in here is the one set by the PlayerPurchaseEvent
-+        if (event == null || event.willIncreaseTradeUses()) {
-+            recipe.increaseUses();
-+        }
-+        if (event == null || event.isRewardingExp()) {
-+            this.rewardTradeXp(recipe);
-+        }
-+        this.notifyTrade(recipe);
-+    }
-+    // Paper end
-+
-     @Override
-     public void notifyTrade(MerchantOffer offer) {
-        offer.increaseUses();
-+        // offer.increaseUses(); // Paper - handled in processTrade
-         this.ambientSoundTime = -this.getAmbientSoundInterval();
-        this.rewardTradeXp(offer);
-+        // this.rewardTradeXp(offer); // Paper - handled in processTrade
-         if (this.tradingPlayer instanceof ServerPlayer) {
-             CriteriaTriggers.TRADE.trigger((ServerPlayer) this.tradingPlayer, this, offer.getResult());
-         }
-diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-@@ -0,0 +0,0 @@ public abstract class AbstractContainerMenu {
-     public abstract boolean stillValid(Player player);
- 
-     protected boolean moveItemStackTo(ItemStack stack, int startIndex, int endIndex, boolean fromLast) {
-+        // Paper start
-+        return this.moveItemStackTo(stack, startIndex, endIndex, fromLast, false);
-+    }
-+    protected boolean moveItemStackTo(ItemStack stack, int startIndex, int endIndex, boolean fromLast, boolean isCheck) {
-+        if (isCheck) {
-+            stack = stack.copy();
-+        }
-+        // Paper end
-         boolean flag1 = false;
-         int k = startIndex;
- 
-@@ -0,0 +0,0 @@ public abstract class AbstractContainerMenu {
- 
-                 slot = (Slot) this.slots.get(k);
-                 itemstack1 = slot.getItem();
-+                // Paper start - clone if only a check
-+                if (isCheck) {
-+                    itemstack1 = itemstack1.copy();
-+                }
-+                // Paper end
-                 if (!itemstack1.isEmpty() && ItemStack.isSameItemSameTags(stack, itemstack1)) {
-                     int l = itemstack1.getCount() + stack.getCount();
- 
-                     if (l <= stack.getMaxStackSize()) {
-                         stack.setCount(0);
-                         itemstack1.setCount(l);
-+                        if (!isCheck) { // Paper - dont update if only a check
-                         slot.setChanged();
-+                        } // Paper
-                         flag1 = true;
-                     } else if (itemstack1.getCount() < stack.getMaxStackSize()) {
-                         stack.shrink(stack.getMaxStackSize() - itemstack1.getCount());
-                         itemstack1.setCount(stack.getMaxStackSize());
-+                        if (!isCheck) { // Paper - dont update if only a check
-                         slot.setChanged();
-+                        } // Paper
-                         flag1 = true;
-                     }
-                 }
-@@ -0,0 +0,0 @@ public abstract class AbstractContainerMenu {
- 
-                 slot = (Slot) this.slots.get(k);
-                 itemstack1 = slot.getItem();
-+                // Paper start - clone if only a check
-+                if (isCheck) {
-+                    itemstack1 = itemstack1.copy();
-+                }
-+                // Paper end
-                 if (itemstack1.isEmpty() && slot.mayPlace(stack)) {
-                     if (stack.getCount() > slot.getMaxStackSize()) {
-+                        // Paper start - dont set slot if only check
-+                        if (isCheck) {
-+                            stack.shrink(slot.getMaxStackSize());
-+                        } else {
-+                        // Paper end
-                         slot.set(stack.split(slot.getMaxStackSize()));
-+                        } // Paper
-                     } else {
-+                        // Paper start - dont set slot if only check
-+                        if (isCheck) {
-+                            stack.shrink(stack.getCount());
-+                        } else {
-+                        // Paper end
-                         slot.set(stack.split(stack.getCount()));
-+                        } // Paper
-                     }
- 
-+                    if (!isCheck) { // Paper - dont update if only check
-                     slot.setChanged();
-+                    } // Paper
-                     flag1 = true;
-                     break;
-                 }
-diff --git a/src/main/java/net/minecraft/world/inventory/MerchantMenu.java b/src/main/java/net/minecraft/world/inventory/MerchantMenu.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/MerchantMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/MerchantMenu.java
-@@ -0,0 +0,0 @@ public class MerchantMenu extends AbstractContainerMenu {
- 
-             itemstack = itemstack1.copy();
-             if (index == 2) {
-                if (!this.moveItemStackTo(itemstack1, 3, 39, true)) {
-+                if (!this.moveItemStackTo(itemstack1, 3, 39, true, true)) { // Paper
-                     return ItemStack.EMPTY;
-                 }
- 
-                slot.onQuickCraft(itemstack1, itemstack);
-                this.playTradeSound();
-+                // slot.onQuickCraft(itemstack1, itemstack); // Paper - moved to after the non-check moveItemStackTo call
-+                // this.playTradeSound();
-             } else if (index != 0 && index != 1) {
-                 if (index >= 3 && index < 30) {
-                     if (!this.moveItemStackTo(itemstack1, 30, 39, false)) {
-@@ -0,0 +0,0 @@ public class MerchantMenu extends AbstractContainerMenu {
-                 return ItemStack.EMPTY;
-             }
- 
-+            if (index != 2) { // Paper - moved down for slot 2
-             if (itemstack1.isEmpty()) {
-                 slot.set(ItemStack.EMPTY);
-             } else {
-@@ -0,0 +0,0 @@ public class MerchantMenu extends AbstractContainerMenu {
-             }
- 
-             slot.onTake(player, itemstack1);
-+            } // Paper start - handle slot 2
-+            if (index == 2) { // is merchant result slot
-+                slot.onTake(player, itemstack1);
-+                if (itemstack1.isEmpty()) {
-+                    slot.set(ItemStack.EMPTY);
-+                    return ItemStack.EMPTY;
-+                }
-+
-+                this.moveItemStackTo(itemstack1, 3, 39, true, false); // This should always succeed because it's checked above
-+
-+                slot.onQuickCraft(itemstack1, itemstack);
-+                this.playTradeSound();
-+                slot.set(ItemStack.EMPTY); // itemstack1 should ALWAYS be empty
-+            }
-+            // Paper end
-         }
- 
-         return itemstack;
-diff --git a/src/main/java/net/minecraft/world/inventory/MerchantResultSlot.java b/src/main/java/net/minecraft/world/inventory/MerchantResultSlot.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/MerchantResultSlot.java
-+++ b/src/main/java/net/minecraft/world/inventory/MerchantResultSlot.java
-@@ -0,0 +0,0 @@ public class MerchantResultSlot extends Slot {
- 
-     @Override
-     public void onTake(Player player, ItemStack stack) {
-        this.checkTakeAchievements(stack);
-+        // this.checkTakeAchievements(stack); // Paper - move to after event is called and not cancelled
-         MerchantOffer merchantOffer = this.slots.getActiveOffer();
-+        // Paper start
-+        io.papermc.paper.event.player.PlayerPurchaseEvent event = null;
-+        if (merchantOffer != null && player instanceof net.minecraft.server.level.ServerPlayer serverPlayer) {
-+            if (this.merchant instanceof net.minecraft.world.entity.npc.AbstractVillager abstractVillager) {
-+                event = new io.papermc.paper.event.player.PlayerTradeEvent(serverPlayer.getBukkitEntity(), (org.bukkit.entity.AbstractVillager) abstractVillager.getBukkitEntity(), merchantOffer.asBukkit(), true, true);
-+            } else if (this.merchant instanceof org.bukkit.craftbukkit.inventory.CraftMerchantCustom.MinecraftMerchant) {
-+                event = new io.papermc.paper.event.player.PlayerPurchaseEvent(serverPlayer.getBukkitEntity(), merchantOffer.asBukkit(), false, true);
-+            }
-+            if (event != null) {
-+                if (!event.callEvent()) {
-+                    stack.setCount(0);
-+                    event.getPlayer().updateInventory();
-+                    return;
-+                }
-+                merchantOffer = org.bukkit.craftbukkit.inventory.CraftMerchantRecipe.fromBukkit(event.getTrade()).toMinecraft();
-+            }
-+        }
-+        this.checkTakeAchievements(stack);
-+        // Paper end
-         if (merchantOffer != null) {
-             ItemStack itemStack = this.slots.getItem(0);
-             ItemStack itemStack2 = this.slots.getItem(1);
-             if (merchantOffer.take(itemStack, itemStack2) || merchantOffer.take(itemStack2, itemStack)) {
-                this.merchant.notifyTrade(merchantOffer);
-+                this.merchant.processTrade(merchantOffer, event); // Paper
-                 player.awardStat(Stats.TRADED_WITH_VILLAGER);
-                 this.slots.setItem(0, itemStack);
-                 this.slots.setItem(1, itemStack2);
-diff --git a/src/main/java/net/minecraft/world/item/trading/Merchant.java b/src/main/java/net/minecraft/world/item/trading/Merchant.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/trading/Merchant.java
-+++ b/src/main/java/net/minecraft/world/item/trading/Merchant.java
-@@ -0,0 +0,0 @@ public interface Merchant {
- 
-     void overrideOffers(MerchantOffers offers);
- 
-+    default void processTrade(MerchantOffer merchantRecipe, @Nullable io.papermc.paper.event.player.PlayerPurchaseEvent event) { this.notifyTrade(merchantRecipe); } // Paper
-     void notifyTrade(MerchantOffer offer);
- 
-     void notifyTradeUpdated(ItemStack stack);
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java
-@@ -0,0 +0,0 @@ public class CraftMerchantCustom extends CraftMerchant {
-             return this.trades;
-         }
- 
-+        // Paper start
-+        @Override
-+        public void processTrade(MerchantOffer merchantRecipe, @javax.annotation.Nullable io.papermc.paper.event.player.PlayerPurchaseEvent event) { // The MerchantRecipe passed in here is the one set by the PlayerPurchaseEvent
-+            /** Based on {@link net.minecraft.world.entity.npc.AbstractVillager#processTrade(MerchantOffer, io.papermc.paper.event.player.PlayerPurchaseEvent)} */
-+            if (getTradingPlayer() instanceof net.minecraft.server.level.ServerPlayer) {
-+                if (event == null || event.willIncreaseTradeUses()) {
-+                    merchantRecipe.increaseUses();
-+                }
-+                if (event == null || event.isRewardingExp()) {
-+                    this.tradingPlayer.level.addFreshEntity(new net.minecraft.world.entity.ExperienceOrb(tradingPlayer.level, tradingPlayer.getX(), tradingPlayer.getY(), tradingPlayer.getZ(), merchantRecipe.getXp(), org.bukkit.entity.ExperienceOrb.SpawnReason.VILLAGER_TRADE, this.tradingPlayer, null));
-+                }
-+            }
-+            this.notifyTrade(merchantRecipe);
-+        }
-+        // Paper end
-         @Override
-         public void notifyTrade(MerchantOffer offer) {
-             // increase recipe's uses
-            offer.increaseUses();
-+            // offer.increaseUses(); // Paper - handled above in processTrade
-         }
- 
-         @Override
--- a/patches/unapplied/server/Add-StructuresLocateEvent.patch
+++ b/patches/unapplied/server/Add-StructuresLocateEvent.patch
@@ -1,214 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: dfsek <dfsek@protonmail.com>
-Date: Wed, 16 Sep 2020 01:12:29 -0700
-Subject: [PATCH] Add StructuresLocateEvent
-
-Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
-
-diff --git a/src/main/java/io/papermc/paper/registry/RegistryKey.java b/src/main/java/io/papermc/paper/registry/RegistryKey.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/io/papermc/paper/registry/RegistryKey.java
-+++ b/src/main/java/io/papermc/paper/registry/RegistryKey.java
-@@ -0,0 +0,0 @@
- package io.papermc.paper.registry;
- 
-+import io.papermc.paper.world.structure.ConfiguredStructure;
- import net.minecraft.core.Registry;
- import net.minecraft.resources.ResourceKey;
-+import net.minecraft.world.level.levelgen.structure.Structure;
- import org.bukkit.Keyed;
- 
- public record RegistryKey<API extends Keyed, MINECRAFT>(Class<API> apiClass, ResourceKey<? extends Registry<MINECRAFT>> resourceKey) {
-+
-+    public static final RegistryKey<ConfiguredStructure, Structure> CONFIGURED_STRUCTURE_REGISTRY = new RegistryKey<>(ConfiguredStructure.class, Registry.STRUCTURE_REGISTRY);
-+
- }
-diff --git a/src/main/java/io/papermc/paper/world/structure/PaperConfiguredStructure.java b/src/main/java/io/papermc/paper/world/structure/PaperConfiguredStructure.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/world/structure/PaperConfiguredStructure.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.world.structure;
-+
-+import io.papermc.paper.registry.PaperRegistry;
-+import io.papermc.paper.registry.RegistryKey;
-+import net.minecraft.core.Registry;
-+import net.minecraft.resources.ResourceLocation;
-+import net.minecraft.world.level.levelgen.structure.Structure;
-+import org.bukkit.NamespacedKey;
-+import org.bukkit.StructureType;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.checker.nullness.qual.Nullable;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+import java.util.Objects;
-+import java.util.function.Supplier;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class PaperConfiguredStructure {
-+
-+    private PaperConfiguredStructure() {
-+    }
-+
-+    public static void init() {
-+        new ConfiguredStructureRegistry().register();
-+    }
-+
-+    static final class ConfiguredStructureRegistry extends PaperRegistry<ConfiguredStructure, Structure> {
-+
-+        private static final Supplier<Registry<Structure>> STRUCTURE_FEATURE_REGISTRY = registryFor(Registry.STRUCTURE_REGISTRY);
-+
-+        public ConfiguredStructureRegistry() {
-+            super(RegistryKey.CONFIGURED_STRUCTURE_REGISTRY);
-+        }
-+
-+        @Override
-+        public @Nullable ConfiguredStructure convertToApi(NamespacedKey key, Structure nms) {
-+            final ResourceLocation structureTypeLoc = Objects.requireNonNull(Registry.STRUCTURE_TYPES.getKey(nms.type()), "unexpected structure type " + nms.type());
-+            final @Nullable StructureType structureType = StructureType.getStructureTypes().get(structureTypeLoc.getPath());
-+            return structureType == null ? null : new ConfiguredStructure(key, structureType);
-+        }
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-@@ -0,0 +0,0 @@ public abstract class ChunkGenerator {
- 
-     @Nullable
-     public Pair<BlockPos, Holder<Structure>> findNearestMapStructure(ServerLevel world, HolderSet<Structure> structures, BlockPos center, int radius, boolean skipReferencedStructures) {
-+        // Paper start - StructureLocateEvent
-+        final org.bukkit.World bukkitWorld = world.getWorld();
-+        final org.bukkit.Location origin = net.minecraft.server.MCUtil.toLocation(world, center);
-+        final var paperRegistry = io.papermc.paper.registry.PaperRegistry.getRegistry(io.papermc.paper.registry.RegistryKey.CONFIGURED_STRUCTURE_REGISTRY);
-+        final List<io.papermc.paper.world.structure.ConfiguredStructure> configuredStructures = new ArrayList<>();
-+        paperRegistry.convertToApi(structures, configuredStructures::add, false); // gracefully handle missing api, use tests to check (or exclude)
-+        if (!configuredStructures.isEmpty()) {
-+            final io.papermc.paper.event.world.StructuresLocateEvent event = new io.papermc.paper.event.world.StructuresLocateEvent(bukkitWorld, origin, configuredStructures, radius, skipReferencedStructures);
-+            if (!event.callEvent()) {
-+                return null;
-+            }
-+            if (event.getResult() != null) {
-+                return Pair.of(net.minecraft.server.MCUtil.toBlockPosition(event.getResult().position()), paperRegistry.getMinecraftHolder(event.getResult().configuredStructure()));
-+            }
-+            center = net.minecraft.server.MCUtil.toBlockPosition(event.getOrigin());
-+            radius = event.getRadius();
-+            skipReferencedStructures = event.shouldFindUnexplored();
-+            structures = HolderSet.direct(paperRegistry::getMinecraftHolder, event.getConfiguredStructures());
-+        }
-+        // Paper end
-         Map<StructurePlacement, Set<Holder<Structure>>> map = new Object2ObjectArrayMap();
-         Iterator iterator = structures.iterator();
- 
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/Structure.java b/src/main/java/net/minecraft/world/level/levelgen/structure/Structure.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/levelgen/structure/Structure.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/structure/Structure.java
-@@ -0,0 +0,0 @@ public abstract class Structure {
-     public static final Codec<Structure> DIRECT_CODEC = Registry.STRUCTURE_TYPES.byNameCodec().dispatch(Structure::type, StructureType::codec);
-     public static final Codec<Holder<Structure>> CODEC = RegistryFileCodec.create(Registry.STRUCTURE_REGISTRY, DIRECT_CODEC);
-     protected final Structure.StructureSettings settings;
-+    static { io.papermc.paper.world.structure.PaperConfiguredStructure.init(); } // Paper
- 
-     public static <S extends Structure> RecordCodecBuilder<S, Structure.StructureSettings> settingsCodec(RecordCodecBuilder.Instance<S> instance) {
-         return Structure.StructureSettings.CODEC.forGetter((feature) -> {
-diff --git a/src/test/java/io/papermc/paper/world/structure/ConfiguredStructureTest.java b/src/test/java/io/papermc/paper/world/structure/ConfiguredStructureTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/test/java/io/papermc/paper/world/structure/ConfiguredStructureTest.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.world.structure;
-+
-+import io.papermc.paper.registry.Reference;
-+import net.minecraft.data.BuiltinRegistries;
-+import net.minecraft.resources.ResourceKey;
-+import net.minecraft.resources.ResourceLocation;
-+import net.minecraft.server.Bootstrap;
-+import net.minecraft.world.level.levelgen.structure.Structure;
-+import net.minecraft.world.level.levelgen.structure.BuiltinStructures;
-+import org.bukkit.NamespacedKey;
-+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-+import org.bukkit.support.AbstractTestingBase;
-+import org.junit.AfterClass;
-+import org.junit.BeforeClass;
-+import org.junit.Test;
-+
-+import java.io.PrintStream;
-+import java.lang.reflect.Field;
-+import java.lang.reflect.Modifier;
-+import java.util.LinkedHashMap;
-+import java.util.Map;
-+import java.util.StringJoiner;
-+
-+import static org.junit.Assert.assertEquals;
-+import static org.junit.Assert.assertNotNull;
-+import static org.junit.Assert.assertTrue;
-+
-+public class ConfiguredStructureTest extends AbstractTestingBase {
-+
-+    private static final Map<ResourceLocation, String> BUILT_IN_STRUCTURES = new LinkedHashMap<>();
-+    private static final Map<NamespacedKey, Reference<?>> DEFAULT_CONFIGURED_STRUCTURES = new LinkedHashMap<>();
-+
-+    private static PrintStream out;
-+
-+    @BeforeClass
-+    public static void collectStructures() throws ReflectiveOperationException {
-+        out = System.out;
-+        System.setOut(Bootstrap.STDOUT);
-+        for (Field field : BuiltinStructures.class.getDeclaredFields()) {
-+            if (field.getType().equals(ResourceKey.class) && Modifier.isStatic(field.getModifiers())) {
-+                BUILT_IN_STRUCTURES.put(((ResourceKey<?>) field.get(null)).location(), field.getName());
-+            }
-+        }
-+        for (Field field : ConfiguredStructure.class.getDeclaredFields()) {
-+            if (field.getType().equals(Reference.class) && Modifier.isStatic(field.getModifiers())) {
-+                final Reference<?> ref = (Reference<?>) field.get(null);
-+                DEFAULT_CONFIGURED_STRUCTURES.put(ref.getKey(), ref);
-+            }
-+        }
-+    }
-+
-+    @Test
-+    public void testMinecraftToApi() {
-+        assertEquals("configured structure maps should be the same size", BUILT_IN_STRUCTURES.size(), BuiltinRegistries.STRUCTURES.size());
-+
-+        Map<ResourceLocation, Structure> missing = new LinkedHashMap<>();
-+        for (Structure feature : BuiltinRegistries.STRUCTURES) {
-+            final ResourceLocation key = BuiltinRegistries.STRUCTURES.getKey(feature);
-+            assertNotNull("Missing built-in registry key", key);
-+            if (key.equals(BuiltinStructures.ANCIENT_CITY.location())) {
-+                continue; // TODO remove when upstream adds "jigsaw" StructureType
-+            }
-+            if (DEFAULT_CONFIGURED_STRUCTURES.get(CraftNamespacedKey.fromMinecraft(key)) == null) {
-+                missing.put(key, feature);
-+            }
-+        }
-+
-+        assertTrue(printMissing(missing), missing.isEmpty());
-+    }
-+
-+    @Test
-+    public void testApiToMinecraft() {
-+        for (NamespacedKey apiKey : DEFAULT_CONFIGURED_STRUCTURES.keySet()) {
-+            assertTrue(apiKey + " does not have a minecraft counterpart", BuiltinRegistries.STRUCTURES.containsKey(CraftNamespacedKey.toMinecraft(apiKey)));
-+        }
-+    }
-+
-+    private static String printMissing(Map<ResourceLocation, Structure> missing) {
-+        final StringJoiner joiner = new StringJoiner("\n", "Missing: \n", "");
-+
-+        missing.forEach((key, configuredFeature) -> {
-+            joiner.add("public static final Reference<ConfiguredStructure> " + BUILT_IN_STRUCTURES.get(key) + " = create(\"" + key.getPath() + "\");");
-+        });
-+
-+        return joiner.toString();
-+    }
-+
-+    @AfterClass
-+    public static void after() {
-+        System.setOut(out);
-+    }
-+}
--- a/patches/unapplied/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/unapplied/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
@@ -1,131 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MeFisto94 <MeFisto94@users.noreply.github.com>
-Date: Tue, 11 May 2021 00:48:33 +0200
-Subject: [PATCH] Add a "should burn in sunlight" API for Phantoms and
- Skeletons
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -0,0 +0,0 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
-         return MobType.UNDEAD;
-     }
- 
-+    // Paper start
-+    private boolean shouldBurnInDay = true;
-+    public boolean shouldBurnInDay() { return shouldBurnInDay; }
-+    public void setShouldBurnInDay(boolean shouldBurnInDay) { this.shouldBurnInDay = shouldBurnInDay; }
-+    // Paper end
-+
-     @Override
-     public void aiStep() {
-        boolean flag = this.isSunBurnTick();
-+        boolean flag = shouldBurnInDay && this.isSunBurnTick(); // Paper - Configurable Burning
- 
-         if (flag) {
-             ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
-@@ -0,0 +0,0 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
-     public void readAdditionalSaveData(CompoundTag nbt) {
-         super.readAdditionalSaveData(nbt);
-         this.reassessWeaponGoal();
-+        // Paper start
-+        if (nbt.contains("Paper.ShouldBurnInDay")) {
-+            this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
-+        }
-+        // Paper end
-+    }
-+
-+    // Paper start
-+    @Override
-+    public void addAdditionalSaveData(CompoundTag nbt) {
-+        super.addAdditionalSaveData(nbt);
-+        nbt.putBoolean("Paper.ShouldBurnInDay", this.shouldBurnInDay);
-     }
-+    // Paper end
- 
-     @Override
-     public void setItemSlot(EquipmentSlot slot, ItemStack stack) {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -0,0 +0,0 @@ public class Phantom extends FlyingMob implements Enemy {
- 
-     @Override
-     public void aiStep() {
-        if (this.isAlive() && this.isSunBurnTick()) {
-+        if (this.isAlive() && shouldBurnInDay && this.isSunBurnTick()) { // Paper - Configurable Burning
-             this.setSecondsOnFire(8);
-         }
- 
-@@ -0,0 +0,0 @@ public class Phantom extends FlyingMob implements Enemy {
-         if (nbt.hasUUID("Paper.SpawningEntity")) {
-             this.spawningEntity = nbt.getUUID("Paper.SpawningEntity");
-         }
-+        if (nbt.contains("Paper.ShouldBurnInDay")) {
-+            this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
-+        }
-         // Paper end
-     }
- 
-@@ -0,0 +0,0 @@ public class Phantom extends FlyingMob implements Enemy {
-         if (this.spawningEntity != null) {
-             nbt.putUUID("Paper.SpawningEntity", this.spawningEntity);
-         }
-+        nbt.putBoolean("Paper.ShouldBurnInDay", shouldBurnInDay);
-         // Paper end
-     }
- 
-@@ -0,0 +0,0 @@ public class Phantom extends FlyingMob implements Enemy {
-         return spawningEntity;
-     }
-     public void setSpawningEntity(java.util.UUID entity) { this.spawningEntity = entity; }
-+
-+    private boolean shouldBurnInDay = true;
-+    public boolean shouldBurnInDay() { return shouldBurnInDay; }
-+    public void setShouldBurnInDay(boolean shouldBurnInDay) { this.shouldBurnInDay = shouldBurnInDay; }
-     // Paper end
-     private static enum AttackPhase {
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java
-@@ -0,0 +0,0 @@ public abstract class CraftAbstractSkeleton extends CraftMonster implements Abst
-         return (net.minecraft.world.entity.monster.AbstractSkeleton) super.getHandle();
-     }
-     // Paper end
-+    // Paper start
-+    @Override
-+    public boolean shouldBurnInDay() {
-+        return getHandle().shouldBurnInDay();
-+    }
-+
-+    @Override
-+    public void setShouldBurnInDay(boolean shouldBurnInDay) {
-+        getHandle().setShouldBurnInDay(shouldBurnInDay);
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-@@ -0,0 +0,0 @@ public class CraftPhantom extends CraftFlying implements Phantom {
-     public java.util.UUID getSpawningEntity() {
-         return getHandle().getSpawningEntity();
-     }
-+
-+    @Override
-+    public boolean shouldBurnInDay() {
-+        return getHandle().shouldBurnInDay();
-+    }
-+
-+    @Override
-+    public void setShouldBurnInDay(boolean shouldBurnInDay) {
-+        getHandle().setShouldBurnInDay(shouldBurnInDay);
-+    }
-     // Paper end
- }
--- a/patches/unapplied/server/Add-basic-Datapack-API.patch
+++ b/patches/unapplied/server/Add-basic-Datapack-API.patch
@@ -1,125 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Connor Linfoot <connorlinfoot@me.com>
-Date: Sun, 16 May 2021 15:07:34 +0100
-Subject: [PATCH] Add basic Datapack API
-
-
-diff --git a/src/main/java/io/papermc/paper/datapack/PaperDatapack.java b/src/main/java/io/papermc/paper/datapack/PaperDatapack.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/datapack/PaperDatapack.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.datapack;
-+
-+import io.papermc.paper.event.server.ServerResourcesReloadedEvent;
-+import net.minecraft.server.MinecraftServer;
-+import net.minecraft.server.packs.repository.Pack;
-+import java.util.List;
-+import java.util.stream.Collectors;
-+
-+public class PaperDatapack implements Datapack {
-+    private final String name;
-+    private final Compatibility compatibility;
-+    private final boolean enabled;
-+
-+    PaperDatapack(Pack loader, boolean enabled) {
-+        this.name = loader.getId();
-+        this.compatibility = Compatibility.valueOf(loader.getCompatibility().name());
-+        this.enabled = enabled;
-+    }
-+
-+    @Override
-+    public String getName() {
-+        return name;
-+    }
-+
-+    @Override
-+    public Compatibility getCompatibility() {
-+        return compatibility;
-+    }
-+
-+    @Override
-+    public boolean isEnabled() {
-+        return enabled;
-+    }
-+
-+    @Override
-+    public void setEnabled(boolean enabled) {
-+        if (enabled == this.enabled) {
-+            return;
-+        }
-+
-+        MinecraftServer server = MinecraftServer.getServer();
-+        List<String> enabledKeys = server.getPackRepository().getSelectedPacks().stream().map(Pack::getId).collect(Collectors.toList());
-+        if (enabled) {
-+            enabledKeys.add(this.name);
-+        } else {
-+            enabledKeys.remove(this.name);
-+        }
-+        server.reloadResources(enabledKeys, ServerResourcesReloadedEvent.Cause.PLUGIN);
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/datapack/PaperDatapackManager.java b/src/main/java/io/papermc/paper/datapack/PaperDatapackManager.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/datapack/PaperDatapackManager.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.datapack;
-+
-+import java.util.Collection;
-+import java.util.stream.Collectors;
-+import net.minecraft.server.packs.repository.Pack;
-+import net.minecraft.server.packs.repository.PackRepository;
-+
-+public class PaperDatapackManager implements DatapackManager {
-+    private final PackRepository repository;
-+
-+    public PaperDatapackManager(PackRepository repository) {
-+        this.repository = repository;
-+    }
-+
-+    @Override
-+    public Collection<Datapack> getPacks() {
-+        Collection<Pack> enabledPacks = repository.getSelectedPacks();
-+        return repository.getAvailablePacks().stream().map(loader -> new PaperDatapack(loader, enabledPacks.contains(loader))).collect(Collectors.toList());
-+    }
-+
-+    @Override
-+    public Collection<Datapack> getEnabledPacks() {
-+        return repository.getSelectedPacks().stream().map(loader -> new PaperDatapack(loader, true)).collect(Collectors.toList());
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-     public boolean ignoreVanillaPermissions = false;
-     private final List<CraftPlayer> playerView;
-     public int reloadCount;
-+    private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper
-     public static Exception excessiveVelEx; // Paper - Velocity warnings
- 
-     static {
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-         if (this.configuration.getBoolean("settings.use-map-color-cache")) {
-             MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
-         }
-+        datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
-     }
- 
-     public boolean getCommandBlockOverride(String command) {
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-     public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
-         return mobGoals;
-     }
-+
-+    @Override
-+    public io.papermc.paper.datapack.PaperDatapackManager getDatapackManager() {
-+        return datapackManager;
-+    }
-+
-     // Paper end
- }
--- a/patches/unapplied/server/Add-bypass-host-check.patch
+++ b/patches/unapplied/server/Add-bypass-host-check.patch
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 18 Apr 2021 21:27:01 +0100
-Subject: [PATCH] Add bypass host check
-
-Paper.bypassHostCheck
-
-Seriously, fix your firewalls. -.-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
-     private static final Component IGNORE_STATUS_REASON = Component.literal("Ignoring status request");
-     private final MinecraftServer server;
-     private final Connection connection;
-+    private static final boolean BYPASS_HOSTCHECK = Boolean.getBoolean("Paper.bypassHostCheck"); // Paper
- 
-     public ServerHandshakePacketListenerImpl(MinecraftServer server, Connection connection) {
-         this.server = server;
-@@ -0,0 +0,0 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
-                     if (!handledByEvent && proxyLogicEnabled) {
-                         // Paper end
-                     // if (org.spigotmc.SpigotConfig.bungee) { // Paper - comment out, we check above!
-                        if ( ( split.length == 3 || split.length == 4 ) && ( ServerHandshakePacketListenerImpl.HOST_PATTERN.matcher( split[1] ).matches() ) ) {
-+                        if ( ( split.length == 3 || split.length == 4 ) && ( ServerHandshakePacketListenerImpl.BYPASS_HOSTCHECK || ServerHandshakePacketListenerImpl.HOST_PATTERN.matcher( split[1] ).matches() ) ) { // Paper
-                             packet.hostName = split[0];
-                             connection.address = new java.net.InetSocketAddress(split[1], ((java.net.InetSocketAddress) this.connection.getRemoteAddress()).getPort());
-                             connection.spoofedUUID = com.mojang.util.UUIDTypeAdapter.fromString( split[2] );
--- a/patches/unapplied/server/Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/unapplied/server/Add-dropLeash-variable-to-EntityUnleashEvent.patch
@@ -1,140 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Fri, 29 Jan 2021 15:13:11 +0100
-Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -0,0 +0,0 @@ public abstract class Mob extends LivingEntity {
-             return InteractionResult.PASS;
-         } else if (this.getLeashHolder() == player) {
-             // CraftBukkit start - fire PlayerUnleashEntityEvent
-            if (CraftEventFactory.callPlayerUnleashEntityEvent(this, player).isCancelled()) {
-+            // Paper start - drop leash variable
-+            org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, !player.getAbilities().instabuild);
-+            if (event.isCancelled()) {
-+                // Paper end
-                 ((ServerPlayer) player).connection.send(new ClientboundSetEntityLinkPacket(this, this.getLeashHolder()));
-                 return InteractionResult.PASS;
-             }
-             // CraftBukkit end
-            this.dropLeash(true, !player.getAbilities().instabuild);
-+            this.dropLeash(true, event.isDropLeash()); // Paper - drop leash variable
-             return InteractionResult.sidedSuccess(this.level.isClientSide);
-         } else {
-             InteractionResult enuminteractionresult = this.checkAndHandleImportantInteractions(player, hand);
-@@ -0,0 +0,0 @@ public abstract class Mob extends LivingEntity {
- 
-         if (this.leashHolder != null) {
-             if (!this.isAlive() || !this.leashHolder.isAlive()) {
-                this.level.getCraftServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), (!this.isAlive()) ? UnleashReason.PLAYER_UNLEASH : UnleashReason.HOLDER_GONE)); // CraftBukkit
-                this.dropLeash(true, true);
-+                // Paper start - drop leash variable
-+                EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), (!this.isAlive()) ? UnleashReason.PLAYER_UNLEASH : UnleashReason.HOLDER_GONE, true);
-+                this.level.getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
-+                this.dropLeash(true, event.isDropLeash());
-+                // Paper end
-             }
- 
-         }
-@@ -0,0 +0,0 @@ public abstract class Mob extends LivingEntity {
-         boolean flag1 = super.startRiding(entity, force);
- 
-         if (flag1 && this.isLeashed()) {
-            this.level.getCraftServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.UNKNOWN)); // CraftBukkit
-            this.dropLeash(true, true);
-+            // Paper start - drop leash variable
-+            EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.UNKNOWN, true);
-+            this.level.getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
-+            this.dropLeash(true, event.isDropLeash());
-+            // Paper end
-         }
- 
-         return flag1;
-@@ -0,0 +0,0 @@ public abstract class Mob extends LivingEntity {
-     @Override
-     protected void removeAfterChangingDimensions() {
-         super.removeAfterChangingDimensions();
-        this.level.getCraftServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.UNKNOWN)); // CraftBukkit
-        this.dropLeash(true, false);
-+        // Paper start - drop leash variable
-+        EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.UNKNOWN, false);
-+        this.level.getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
-+        this.dropLeash(true, event.isDropLeash());
-+        // Paper end
-         this.getAllSlots().forEach((itemstack) -> {
-             if (!itemstack.isEmpty()) itemstack.setCount(0); // CraftBukkit
-         });
-diff --git a/src/main/java/net/minecraft/world/entity/PathfinderMob.java b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/PathfinderMob.java
-+++ b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
-@@ -0,0 +0,0 @@ public abstract class PathfinderMob extends Mob {
- 
-             if (this instanceof TamableAnimal && ((TamableAnimal) this).isInSittingPose()) {
-                 if (f > entity.level.paperConfig().misc.maxLeashDistance) { // Paper
-                    this.level.getCraftServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE)); // CraftBukkit
-                    this.dropLeash(true, true);
-+                    // Paper start - drop leash variable
-+                    EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE, true);
-+                    this.level.getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
-+                    this.dropLeash(true, event.isDropLeash());
-+                    // Paper end
-                 }
- 
-                 return;
-@@ -0,0 +0,0 @@ public abstract class PathfinderMob extends Mob {
- 
-             this.onLeashDistance(f);
-             if (f > entity.level.paperConfig().misc.maxLeashDistance) { // Paper
-                this.level.getCraftServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE)); // CraftBukkit
-                this.dropLeash(true, true);
-+                // Paper start - drop leash variable
-+                EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE, true);
-+                this.level.getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
-+                this.dropLeash(true, event.isDropLeash());
-+                // Paper end
-                 this.goalSelector.disableControlFlag(Goal.Flag.MOVE);
-             } else if (f > 6.0F) {
-                 double d0 = (entity.getX() - this.getX()) / (double) f;
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java b/src/main/java/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java
-@@ -0,0 +0,0 @@ public class LeashFenceKnotEntity extends HangingEntity {
-                         entityinsentient = (Mob) iterator.next();
-                         if (entityinsentient.isLeashed() && entityinsentient.getLeashHolder() == this) {
-                             // CraftBukkit start
-                            if (CraftEventFactory.callPlayerUnleashEntityEvent(entityinsentient, player).isCancelled()) {
-+                            // Paper start - drop leash variable
-+                            org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(entityinsentient, player, !player.getAbilities().instabuild);
-+                            if (event.isCancelled()) {
-+                                // Paper end
-                                 die = false;
-                                 continue;
-                             }
-                            entityinsentient.dropLeash(true, !player.getAbilities().instabuild); // false -> survival mode boolean
-+                            entityinsentient.dropLeash(true, event.isDropLeash()); // false -> survival mode boolean // Paper - drop leash variable
-                             // CraftBukkit end
-                         }
-                     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -0,0 +0,0 @@ public class CraftEventFactory {
-         return itemInHand;
-     }
- 
-    public static PlayerUnleashEntityEvent callPlayerUnleashEntityEvent(Mob entity, net.minecraft.world.entity.player.Player player) {
-        PlayerUnleashEntityEvent event = new PlayerUnleashEntityEvent(entity.getBukkitEntity(), (Player) player.getBukkitEntity());
-+    // Paper start - drop leash variable
-+    public static PlayerUnleashEntityEvent callPlayerUnleashEntityEvent(Mob entity, net.minecraft.world.entity.player.Player player, boolean dropLeash) {
-+        PlayerUnleashEntityEvent event = new PlayerUnleashEntityEvent(entity.getBukkitEntity(), (Player) player.getBukkitEntity(), dropLeash);
-+        // Paper end
-         entity.level.getCraftServer().getPluginManager().callEvent(event);
-         return event;
-     }
--- a/patches/unapplied/server/Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/unapplied/server/Add-environment-variable-to-disable-server-gui.patch
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Riley Park <rileysebastianpark@gmail.com>
-Date: Mon, 17 May 2021 00:34:55 -0700
-Subject: [PATCH] Add environment variable to disable server gui
-
-
-diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -0,0 +0,0 @@ public class Main {
-                 */
-                 boolean flag1 = !optionset.has("nogui") && !optionset.nonOptionArguments().contains("nogui");
- 
-+                if(!Boolean.parseBoolean(System.getenv().getOrDefault("PAPER_DISABLE_SERVER_GUI", String.valueOf(false)))) // Paper
-                 if (flag1 && !GraphicsEnvironment.isHeadless()) {
-                     dedicatedserver1.showGui();
-                 }
--- a/patches/unapplied/server/Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/unapplied/server/Add-fast-alternative-constructor-for-Rotations.patch
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Irmo van den Berge <irmo.vandenberge@ziggo.nl>
-Date: Wed, 10 Mar 2021 21:26:31 +0100
-Subject: [PATCH] Add fast alternative constructor for Rotations
-
-Signed-off-by: Irmo van den Berge <irmo.vandenberge@ziggo.nl>
-
-diff --git a/src/main/java/net/minecraft/core/Rotations.java b/src/main/java/net/minecraft/core/Rotations.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/core/Rotations.java
-+++ b/src/main/java/net/minecraft/core/Rotations.java
-@@ -0,0 +0,0 @@ public class Rotations {
-         this(serialized.getFloat(0), serialized.getFloat(1), serialized.getFloat(2));
-     }
- 
-+    // Paper start - faster alternative constructor
-+    private Rotations(float x, float y, float z, Void dummy_var) {
-+        this.x = x;
-+        this.y = y;
-+        this.z = z;
-+    }
-+
-+    public static Rotations createWithoutValidityChecks(float x, float y, float z) {
-+        return new Rotations(x, y, z, null);
-+    }
-+    // Paper end
-+
-     public ListTag save() {
-         ListTag listTag = new ListTag();
-         listTag.add(FloatTag.valueOf(this.x));
--- a/patches/unapplied/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/unapplied/server/Add-getMainThreadExecutor-to-BukkitScheduler.patch
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aleksander Jagiello <themolkapl@gmail.com>
-Date: Sun, 24 Jan 2021 22:17:54 +0100
-Subject: [PATCH] Add getMainThreadExecutor to BukkitScheduler
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
-     public BukkitTask runTaskTimerAsynchronously(Plugin plugin, BukkitRunnable task, long delay, long period) throws IllegalArgumentException {
-         throw new UnsupportedOperationException("Use BukkitRunnable#runTaskTimerAsynchronously(Plugin, long, long)");
-     }
-+
-+    // Paper start - add getMainThreadExecutor
-+    @Override
-+    public Executor getMainThreadExecutor(Plugin plugin) {
-+        Validate.notNull(plugin, "Plugin cannot be null");
-+        return command -> {
-+            Validate.notNull(command, "Command cannot be null");
-+            this.runTask(plugin, command);
-+        };
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/Add-more-WanderingTrader-API.patch
+++ b/patches/unapplied/server/Add-more-WanderingTrader-API.patch
@@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: HexedHero <6012891+HexedHero@users.noreply.github.com>
-Date: Thu, 6 May 2021 14:56:43 +0100
-Subject: [PATCH] Add more WanderingTrader API
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -0,0 +0,0 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
-     @Nullable
-     private BlockPos wanderTarget;
-     private int despawnDelay;
-+    // Paper start - Add more WanderingTrader API
-+    public boolean canDrinkPotion = true;
-+    public boolean canDrinkMilk = true;
-+    // Paper end
- 
-     public WanderingTrader(EntityType<? extends WanderingTrader> type, Level world) {
-         super(type, world);
-@@ -0,0 +0,0 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
-     protected void registerGoals() {
-         this.goalSelector.addGoal(0, new FloatGoal(this));
-         this.goalSelector.addGoal(0, new UseItemGoal<>(this, PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.INVISIBILITY), SoundEvents.WANDERING_TRADER_DISAPPEARED, (entityvillagertrader) -> {
-            return this.level.isNight() && !entityvillagertrader.isInvisible();
-+            return this.canDrinkPotion && this.level.isNight() && !entityvillagertrader.isInvisible(); // Paper - Add more WanderingTrader API
-         }));
-         this.goalSelector.addGoal(0, new UseItemGoal<>(this, new ItemStack(Items.MILK_BUCKET), SoundEvents.WANDERING_TRADER_REAPPEARED, (entityvillagertrader) -> {
-            return this.level.isDay() && entityvillagertrader.isInvisible();
-+            return canDrinkMilk && this.level.isDay() && entityvillagertrader.isInvisible(); // Paper - Add more WanderingTrader API
-         }));
-         this.goalSelector.addGoal(1, new TradeWithPlayerGoal(this));
-         this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Zombie.class, 8.0F, 0.5D, 0.5D));
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
-@@ -0,0 +0,0 @@ public class CraftWanderingTrader extends CraftAbstractVillager implements Wande
-     public void setDespawnDelay(int despawnDelay) {
-         this.getHandle().setDespawnDelay(despawnDelay);
-     }
-+
-+    // Paper start - Add more WanderingTrader API
-+    @Override
-+    public void setCanDrinkPotion(boolean bool) {
-+        getHandle().canDrinkPotion = bool;
-+    }
-+
-+    @Override
-+    public boolean canDrinkPotion() {
-+        return getHandle().canDrinkPotion;
-+    }
-+
-+    @Override
-+    public void setCanDrinkMilk(boolean bool) {
-+        getHandle().canDrinkMilk = bool;
-+    }
-+
-+    @Override
-+    public boolean canDrinkMilk() {
-+        return getHandle().canDrinkMilk;
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/unapplied/server/Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Connor Linfoot <connorlinfoot@me.com>
-Date: Wed, 12 May 2021 08:09:19 +0100
-Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
-                             // Paper end
-                         String playerName = ServerLoginPacketListenerImpl.this.gameProfile.getName();
-                         java.net.InetAddress address = ((java.net.InetSocketAddress) ServerLoginPacketListenerImpl.this.connection.getRemoteAddress()).getAddress();
-+                        java.net.InetAddress rawAddress = ((java.net.InetSocketAddress) connection.getRawAddress()).getAddress(); // Paper
-                         java.util.UUID uniqueId = ServerLoginPacketListenerImpl.this.gameProfile.getId();
-                         final org.bukkit.craftbukkit.CraftServer server = ServerLoginPacketListenerImpl.this.server.server;
- 
-                         // Paper start
-                         com.destroystokyo.paper.profile.PlayerProfile profile = com.destroystokyo.paper.profile.CraftPlayerProfile.asBukkitMirror(ServerLoginPacketListenerImpl.this.gameProfile);
-                        AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, uniqueId, profile);
-+                        AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, rawAddress, uniqueId, profile); // Paper - add rawAddress
-                         server.getPluginManager().callEvent(asyncEvent);
-                         profile = asyncEvent.getPlayerProfile();
-                         profile.complete(true); // Paper - setPlayerProfileAPI
--- a/patches/unapplied/server/Add-recipe-to-cook-events.patch
+++ b/patches/unapplied/server/Add-recipe-to-cook-events.patch
@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thonk <30448663+ExcessiveAmountsOfZombies@users.noreply.github.com>
-Date: Wed, 6 Jan 2021 12:04:03 -0800
-Subject: [PATCH] Add recipe to cook events
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-@@ -0,0 +0,0 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
-             CraftItemStack source = CraftItemStack.asCraftMirror(itemstack);
-             org.bukkit.inventory.ItemStack result = CraftItemStack.asBukkitCopy(itemstack1);
- 
-            FurnaceSmeltEvent furnaceSmeltEvent = new FurnaceSmeltEvent(CraftBlock.at(world, blockposition), source, result);
-+            FurnaceSmeltEvent furnaceSmeltEvent = new FurnaceSmeltEvent(CraftBlock.at(world, blockposition), source, result, (org.bukkit.inventory.CookingRecipe<?>) irecipe.toBukkitRecipe()); // Paper
-             world.getCraftServer().getPluginManager().callEvent(furnaceSmeltEvent);
- 
-             if (furnaceSmeltEvent.isCancelled()) {
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
-@@ -0,0 +0,0 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
- 
-                 if (campfire.cookingProgress[i] >= campfire.cookingTime[i]) {
-                     SimpleContainer inventorysubcontainer = new SimpleContainer(new ItemStack[]{itemstack});
-                    ItemStack itemstack1 = (ItemStack) campfire.quickCheck.getRecipeFor(inventorysubcontainer, world).map((recipecampfire) -> {
-+                    Optional<CampfireCookingRecipe> recipe = campfire.quickCheck.getRecipeFor( inventorysubcontainer, world);
-+                    ItemStack itemstack1 = (ItemStack) recipe.map((recipecampfire) -> {
-+                        // Paper end
-                         return recipecampfire.assemble(inventorysubcontainer);
-                     }).orElse(itemstack);
- 
-@@ -0,0 +0,0 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
-                     CraftItemStack source = CraftItemStack.asCraftMirror(itemstack);
-                     org.bukkit.inventory.ItemStack result = CraftItemStack.asBukkitCopy(itemstack1);
- 
-                    BlockCookEvent blockCookEvent = new BlockCookEvent(CraftBlock.at(world, pos), source, result);
-+                    BlockCookEvent blockCookEvent = new BlockCookEvent(CraftBlock.at(world, pos), source, result, (org.bukkit.inventory.CookingRecipe<?>) recipe.map(CampfireCookingRecipe::toBukkitRecipe).orElse(null)); // Paper
-                     world.getCraftServer().getPluginManager().callEvent(blockCookEvent);
- 
-                     if (blockCookEvent.isCancelled()) {
--- a/patches/unapplied/server/Add-sendOpLevel-API.patch
+++ b/patches/unapplied/server/Add-sendOpLevel-API.patch
@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mariell Hoversholm <proximyst@proximyst.com>
-Date: Tue, 29 Dec 2020 15:03:03 +0100
-Subject: [PATCH] Add sendOpLevel API
-
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
-     }
- 
-     private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) {
-+        // Paper start - add recalculatePermissions parameter
-+        this.sendPlayerPermissionLevel(player, permissionLevel, true);
-+    }
-+    public void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel, boolean recalculatePermissions) {
-+        // Paper end
-         if (player.connection != null) {
-             byte b0;
- 
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
-             player.connection.send(new ClientboundEntityEventPacket(player, b0));
-         }
- 
-+        if (recalculatePermissions) { // Paper
-         player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
-         this.server.getCommands().sendCommands(player);
-+        } // Paper
-     }
- 
-     public boolean isWhiteListed(GameProfile profile) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-             ? (org.bukkit.entity.Firework) entity.getBukkitEntity()
-             : null;
-     }
-+
-+    @Override
-+    public void sendOpLevel(byte level) {
-+        Preconditions.checkArgument(level >= 0 && level <= 4, "Level must be within [0, 4]");
-+
-+        this.getHandle().getServer().getPlayerList().sendPlayerPermissionLevel(this.getHandle(), level, false);
-+    }
-     // Paper end
- 
-     @Override
--- a/patches/unapplied/server/Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/unapplied/server/Add-support-for-hex-color-codes-in-console.patch
@@ -1,326 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Josh Roy <10731363+JRoy@users.noreply.github.com>
-Date: Sat, 20 Feb 2021 13:09:59 -0500
-Subject: [PATCH] Add support for hex color codes in console
-
-Converts upstream's hex color code legacy format into actual hex color codes in the console.
-
-diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
-+++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
-@@ -0,0 +0,0 @@
- package com.destroystokyo.paper.console;
- 
-+import net.kyori.adventure.audience.MessageType;
-+import net.kyori.adventure.identity.Identity;
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
-+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
- import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
- import org.bukkit.craftbukkit.command.CraftConsoleCommandSender;
- 
- public class TerminalConsoleCommandSender extends CraftConsoleCommandSender {
- 
-    private static final Logger LOGGER = LogManager.getRootLogger();
-+    private static final ComponentLogger LOGGER = ComponentLogger.logger(LogManager.getRootLogger().getName());
- 
-     @Override
-     public void sendRawMessage(String message) {
-        // TerminalConsoleAppender supports color codes directly in log messages
-+        final Component msg = LegacyComponentSerializer.legacySection().deserialize(message);
-+        this.sendMessage(Identity.nil(), msg, MessageType.SYSTEM);
-+    }
-+
-+    @Override
-+    public void sendMessage(Identity identity, Component message, MessageType type) {
-         LOGGER.info(message);
-     }
- 
-diff --git a/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java b/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java
-+++ b/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java
-@@ -0,0 +0,0 @@
- package io.papermc.paper.adventure.providers;
- 
-import io.papermc.paper.adventure.PaperAdventure;
-+import io.papermc.paper.console.HexFormattingConverter;
-+import java.util.Locale;
- import net.kyori.adventure.text.Component;
- import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
- import net.kyori.adventure.text.logger.slf4j.ComponentLoggerProvider;
-+import net.kyori.adventure.translation.GlobalTranslator;
- import org.jetbrains.annotations.NotNull;
- import org.slf4j.LoggerFactory;
- 
-@@ -0,0 +0,0 @@ public class ComponentLoggerProviderImpl implements ComponentLoggerProvider {
-     }
- 
-     private String serialize(final Component message) {
-        return PaperAdventure.asPlain(message, null);
-+        return HexFormattingConverter.SERIALIZER.serialize(GlobalTranslator.render(message, Locale.getDefault()));
-     }
- }
-diff --git a/src/main/java/io/papermc/paper/console/HexFormattingConverter.java b/src/main/java/io/papermc/paper/console/HexFormattingConverter.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/console/HexFormattingConverter.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.console;
-+
-+import io.papermc.paper.configuration.GlobalConfiguration;
-+import io.papermc.paper.adventure.PaperAdventure;
-+import net.kyori.adventure.text.format.NamedTextColor;
-+import net.kyori.adventure.text.format.TextColor;
-+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-+import net.minecrell.terminalconsole.TerminalConsoleAppender;
-+import org.apache.logging.log4j.core.LogEvent;
-+import org.apache.logging.log4j.core.config.Configuration;
-+import org.apache.logging.log4j.core.config.plugins.Plugin;
-+import org.apache.logging.log4j.core.layout.PatternLayout;
-+import org.apache.logging.log4j.core.pattern.ConverterKeys;
-+import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
-+import org.apache.logging.log4j.core.pattern.PatternConverter;
-+import org.apache.logging.log4j.core.pattern.PatternFormatter;
-+import org.apache.logging.log4j.core.pattern.PatternParser;
-+import org.apache.logging.log4j.util.PerformanceSensitive;
-+import org.apache.logging.log4j.util.PropertiesUtil;
-+
-+import java.util.List;
-+import java.util.regex.Matcher;
-+import java.util.regex.Pattern;
-+
-+import static net.minecrell.terminalconsole.MinecraftFormattingConverter.KEEP_FORMATTING_PROPERTY;
-+
-+/**
-+ * Modified version of <a href="https://github.com/Minecrell/TerminalConsoleAppender/blob/master/src/main/java/net/minecrell/terminalconsole/MinecraftFormattingConverter.java">
-+ * TerminalConsoleAppender's MinecraftFormattingConverter</a> to support hex color codes using the Adventure [char]#rrggbb format.
-+ */
-+@Plugin(name = "paperMinecraftFormatting", category = PatternConverter.CATEGORY)
-+@ConverterKeys({"paperMinecraftFormatting"})
-+@PerformanceSensitive("allocation")
-+public final class HexFormattingConverter extends LogEventPatternConverter {
-+
-+    private static final boolean KEEP_FORMATTING = PropertiesUtil.getProperties().getBooleanProperty(KEEP_FORMATTING_PROPERTY);
-+
-+    private static final String ANSI_RESET = "\u001B[m";
-+
-+    private static final char COLOR_CHAR = 0x7f;
-+    public static final LegacyComponentSerializer SERIALIZER = LegacyComponentSerializer.builder()
-+        .hexColors()
-+        .flattener(PaperAdventure.FLATTENER)
-+        .character(HexFormattingConverter.COLOR_CHAR)
-+        .build();
-+    private static final String LOOKUP = "0123456789abcdefklmnor";
-+
-+    private static final String RGB_ANSI = "\u001B[38;2;%d;%d;%dm";
-+    private static final Pattern NAMED_PATTERN = Pattern.compile(COLOR_CHAR + "[0-9a-fk-orA-FK-OR]");
-+    private static final Pattern RGB_PATTERN = Pattern.compile(COLOR_CHAR + "#([0-9a-fA-F]){6}");
-+
-+    private static final String[] RGB_ANSI_CODES = new String[]{
-+        formatHexAnsi(NamedTextColor.BLACK),         // Black §0
-+        formatHexAnsi(NamedTextColor.DARK_BLUE),     // Dark Blue §1
-+        formatHexAnsi(NamedTextColor.DARK_GREEN),    // Dark Green §2
-+        formatHexAnsi(NamedTextColor.DARK_AQUA),     // Dark Aqua §3
-+        formatHexAnsi(NamedTextColor.DARK_RED),      // Dark Red §4
-+        formatHexAnsi(NamedTextColor.DARK_PURPLE),   // Dark Purple §5
-+        formatHexAnsi(NamedTextColor.GOLD),          // Gold §6
-+        formatHexAnsi(NamedTextColor.GRAY),          // Gray §7
-+        formatHexAnsi(NamedTextColor.DARK_GRAY),     // Dark Gray §8
-+        formatHexAnsi(NamedTextColor.BLUE),          // Blue §9
-+        formatHexAnsi(NamedTextColor.GREEN),         // Green §a
-+        formatHexAnsi(NamedTextColor.AQUA),          // Aqua §b
-+        formatHexAnsi(NamedTextColor.RED),           // Red §c
-+        formatHexAnsi(NamedTextColor.LIGHT_PURPLE),  // Light Purple §d
-+        formatHexAnsi(NamedTextColor.YELLOW),        // Yellow §e
-+        formatHexAnsi(NamedTextColor.WHITE),         // White §f
-+        "\u001B[5m",                                 // Obfuscated §k
-+        "\u001B[1m",                                 // Bold §l
-+        "\u001B[9m",                                 // Strikethrough §m
-+        "\u001B[4m",                                 // Underline §n
-+        "\u001B[3m",                                 // Italic §o
-+        ANSI_RESET,                                  // Reset §r
-+    };
-+    private static final String[] ANSI_ANSI_CODES = new String[]{
-+        "\u001B[0;30m",    // Black §0
-+        "\u001B[0;34m",    // Dark Blue §1
-+        "\u001B[0;32m",    // Dark Green §2
-+        "\u001B[0;36m",    // Dark Aqua §3
-+        "\u001B[0;31m",    // Dark Red §4
-+        "\u001B[0;35m",    // Dark Purple §5
-+        "\u001B[0;33m",    // Gold §6
-+        "\u001B[0;37m",    // Gray §7
-+        "\u001B[0;30;1m",  // Dark Gray §8
-+        "\u001B[0;34;1m",  // Blue §9
-+        "\u001B[0;32;1m",  // Green §a
-+        "\u001B[0;36;1m",  // Aqua §b
-+        "\u001B[0;31;1m",  // Red §c
-+        "\u001B[0;35;1m",  // Light Purple §d
-+        "\u001B[0;33;1m",  // Yellow §e
-+        "\u001B[0;37;1m",  // White §f
-+        "\u001B[5m",       // Obfuscated §k
-+        "\u001B[1m",       // Bold §l
-+        "\u001B[9m",       // Strikethrough §m
-+        "\u001B[4m",       // Underline §n
-+        "\u001B[3m",       // Italic §o
-+        ANSI_RESET,        // Reset §r
-+    };
-+
-+    private final boolean ansi;
-+    private final List<PatternFormatter> formatters;
-+
-+    /**
-+     * Construct the converter.
-+     *
-+     * @param formatters The pattern formatters to generate the text to manipulate
-+     * @param strip      If true, the converter will strip all formatting codes
-+     */
-+    protected HexFormattingConverter(List<PatternFormatter> formatters, boolean strip) {
-+        super("paperMinecraftFormatting", null);
-+        this.formatters = formatters;
-+        this.ansi = !strip;
-+    }
-+
-+    @Override
-+    public void format(LogEvent event, StringBuilder toAppendTo) {
-+        int start = toAppendTo.length();
-+        //noinspection ForLoopReplaceableByForEach
-+        for (int i = 0, size = formatters.size(); i < size; i++) {
-+            formatters.get(i).format(event, toAppendTo);
-+        }
-+
-+        if (KEEP_FORMATTING || toAppendTo.length() == start) {
-+            // Skip replacement if disabled or if the content is empty
-+            return;
-+        }
-+
-+        boolean useAnsi = ansi && TerminalConsoleAppender.isAnsiSupported();
-+        String content = toAppendTo.substring(start);
-+        content = useAnsi ? convertRGBColors(content) : stripRGBColors(content);
-+        format(content, toAppendTo, start, useAnsi);
-+    }
-+
-+    private static String convertRGBColors(final String input) {
-+        return RGB_PATTERN.matcher(input).replaceAll(result -> {
-+            final int hex = Integer.decode(result.group().substring(1));
-+            return formatHexAnsi(hex);
-+        });
-+    }
-+
-+    private static String formatHexAnsi(final TextColor color) {
-+        return formatHexAnsi(color.value());
-+    }
-+
-+    private static String formatHexAnsi(final int color) {
-+        final int red = color >> 16 & 0xFF;
-+        final int green = color >> 8 & 0xFF;
-+        final int blue = color & 0xFF;
-+        return String.format(RGB_ANSI, red, green, blue);
-+    }
-+
-+    private static String stripRGBColors(final String input) {
-+        return RGB_PATTERN.matcher(input).replaceAll("");
-+    }
-+
-+    static void format(String content, StringBuilder result, int start, boolean ansi) {
-+        int next = content.indexOf(COLOR_CHAR);
-+        int last = content.length() - 1;
-+        if (next == -1 || next == last) {
-+            result.setLength(start);
-+            result.append(content);
-+            if (ansi) {
-+                result.append(ANSI_RESET);
-+            }
-+            return;
-+        }
-+
-+        Matcher matcher = NAMED_PATTERN.matcher(content);
-+        StringBuilder buffer = new StringBuilder();
-+        final String[] ansiCodes = GlobalConfiguration.get().logging.useRgbForNamedTextColors ? RGB_ANSI_CODES : ANSI_ANSI_CODES;
-+        while (matcher.find()) {
-+            int format = LOOKUP.indexOf(Character.toLowerCase(matcher.group().charAt(1)));
-+            if (format != -1) {
-+                matcher.appendReplacement(buffer, ansi ? ansiCodes[format] : "");
-+            }
-+        }
-+        matcher.appendTail(buffer);
-+
-+        result.setLength(start);
-+        result.append(buffer);
-+        if (ansi) {
-+            result.append(ANSI_RESET);
-+        }
-+    }
-+
-+    /**
-+     * Gets a new instance of the {@link HexFormattingConverter} with the
-+     * specified options.
-+     *
-+     * @param config  The current configuration
-+     * @param options The pattern options
-+     * @return The new instance
-+     * @see HexFormattingConverter
-+     */
-+    public static HexFormattingConverter newInstance(Configuration config, String[] options) {
-+        if (options.length < 1 || options.length > 2) {
-+            LOGGER.error("Incorrect number of options on paperMinecraftFormatting. Expected at least 1, max 2 received " + options.length);
-+            return null;
-+        }
-+        if (options[0] == null) {
-+            LOGGER.error("No pattern supplied on paperMinecraftFormatting");
-+            return null;
-+        }
-+
-+        PatternParser parser = PatternLayout.createPatternParser(config);
-+        List<PatternFormatter> formatters = parser.parse(options[0]);
-+        boolean strip = options.length > 1 && "strip".equals(options[1]);
-+        return new HexFormattingConverter(formatters, strip);
-+    }
-+
-+}
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     @Override
-     public void sendSystemMessage(Component message) {
-        MinecraftServer.LOGGER.info(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(io.papermc.paper.adventure.PaperAdventure.asAdventure(message))); // Paper - Log message with colors
-+        MinecraftServer.LOGGER.info(io.papermc.paper.console.HexFormattingConverter.SERIALIZER.serialize(io.papermc.paper.adventure.PaperAdventure.asAdventure(message))); // Paper - Log message with colors
-     }
- 
-     public KeyPair getKeyPair() {
-diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/resources/log4j2.xml
-+++ b/src/main/resources/log4j2.xml
-@@ -0,0 +0,0 @@
-         </Queue>
-         <TerminalConsole name="TerminalConsole">
-             <PatternLayout>
-                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %minecraftFormatting{%msg}%n%xEx{full}}">
-+                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %paperMinecraftFormatting{%msg}%n%xEx{full}}">
-                     <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
-                     <!-- Disable prefix for various plugins that bypass the plugin logger -->
-                     <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE"
-                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx{full}}" />
-+                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %paperMinecraftFormatting{%msg}%n%xEx{full}}" />
-                 </LoggerNamePatternSelector>
-             </PatternLayout>
-         </TerminalConsole>
-         <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
-             <PatternLayout>
-                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %minecraftFormatting{%msg}{strip}%n%xEx{full}">
-+                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %paperMinecraftFormatting{%msg}{strip}%n%xEx{full}">
-                     <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
-                     <!-- Disable prefix for various plugins that bypass the plugin logger -->
-                     <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE"
-                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg}{strip}%n%xEx{full}" />
-+                                  pattern="[%d{HH:mm:ss}] [%t/%level]: %paperMinecraftFormatting{%msg}{strip}%n%xEx{full}" />
-                 </LoggerNamePatternSelector>
-             </PatternLayout>
-             <Policies>
--- a/patches/unapplied/server/Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/unapplied/server/Add-toggle-for-always-placing-the-dragon-egg.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Thu, 26 Nov 2020 11:47:24 +0000
-Subject: [PATCH] Add toggle for always placing the dragon egg
-
-
-diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-+++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-@@ -0,0 +0,0 @@ public class EndDragonFight {
-             this.dragonEvent.setVisible(false);
-             this.spawnExitPortal(true);
-             this.spawnNewGateway();
-            if (!this.previouslyKilled) {
-+            if (this.level.paperConfig().entities.behavior.enderDragonsDeathAlwaysPlacesDragonEgg || !this.previouslyKilled) { // Paper - always place dragon egg
-                 this.level.setBlockAndUpdate(this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, EndPodiumFeature.END_PODIUM_LOCATION), Blocks.DRAGON_EGG.defaultBlockState());
-             }
- 
--- a/patches/unapplied/server/Add-worldborder-events.patch
+++ b/patches/unapplied/server/Add-worldborder-events.patch
@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 4 Jan 2021 22:40:34 -0800
-Subject: [PATCH] Add worldborder events
-
-
-diff --git a/src/main/java/net/minecraft/world/level/border/WorldBorder.java b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/border/WorldBorder.java
-+++ b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
-@@ -0,0 +0,0 @@ public class WorldBorder {
-     }
- 
-     public void setCenter(double x, double z) {
-+        // Paper start
-+        if (this.world != null) {
-+            io.papermc.paper.event.world.border.WorldBorderCenterChangeEvent event = new io.papermc.paper.event.world.border.WorldBorderCenterChangeEvent(world.getWorld(), world.getWorld().getWorldBorder(), new org.bukkit.Location(world.getWorld(), this.getCenterX(), 0, this.getCenterZ()), new org.bukkit.Location(world.getWorld(), x, 0, z));
-+            if (!event.callEvent()) return;
-+            x = event.getNewCenter().getX();
-+            z = event.getNewCenter().getZ();
-+        }
-+        // Paper end
-         this.centerX = x;
-         this.centerZ = z;
-         this.extent.onCenterChange();
-@@ -0,0 +0,0 @@ public class WorldBorder {
-     }
- 
-     public void setSize(double size) {
-+        // Paper start
-+        if (this.world != null) {
-+            io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent event = new io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent(world.getWorld(), world.getWorld().getWorldBorder(), io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.INSTANT_MOVE, getSize(), size, 0);
-+            if (!event.callEvent()) return;
-+            if (event.getType() == io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.STARTED_MOVE && event.getDuration() > 0) { // If changed to a timed transition
-+                lerpSizeBetween(event.getOldSize(), event.getNewSize(), event.getDuration());
-+                return;
-+            }
-+            size = event.getNewSize();
-+        }
-+        // Paper end
-         this.extent = new WorldBorder.StaticBorderExtent(size);
-         Iterator iterator = this.getListeners().iterator();
- 
-@@ -0,0 +0,0 @@ public class WorldBorder {
-     }
- 
-     public void lerpSizeBetween(double fromSize, double toSize, long time) {
-+        // Paper start
-+        if (this.world != null) {
-+            io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type type;
-+            if (fromSize == toSize) { // new size = old size
-+                type = io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.INSTANT_MOVE; // Use INSTANT_MOVE because below it creates a Static border if they are equal.
-+            } else {
-+                type = io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.STARTED_MOVE;
-+            }
-+            io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent event = new io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent(world.getWorld(), world.getWorld().getWorldBorder(), type, fromSize, toSize, time);
-+            if (!event.callEvent()) return;
-+            toSize = event.getNewSize();
-+            time = event.getDuration();
-+        }
-+        // Paper end
-         this.extent = (WorldBorder.BorderExtent) (fromSize == toSize ? new WorldBorder.StaticBorderExtent(toSize) : new WorldBorder.MovingBorderExtent(fromSize, toSize, time));
-         Iterator iterator = this.getListeners().iterator();
- 
-@@ -0,0 +0,0 @@ public class WorldBorder {
- 
-         @Override
-         public WorldBorder.BorderExtent update() {
-+            if (world != null && this.getLerpRemainingTime() <= 0L) new io.papermc.paper.event.world.border.WorldBorderBoundsChangeFinishEvent(world.getWorld(), world.getWorld().getWorldBorder(), this.from, this.to, this.lerpDuration).callEvent(); // Paper
-             return (WorldBorder.BorderExtent) (this.getLerpRemainingTime() <= 0L ? WorldBorder.this.new StaticBorderExtent(this.to) : this);
-         }
- 
--- a/patches/unapplied/server/Added-PlayerBedFailEnterEvent.patch
+++ b/patches/unapplied/server/Added-PlayerBedFailEnterEvent.patch
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 24 Dec 2020 12:27:41 -0800
-Subject: [PATCH] Added PlayerBedFailEnterEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-@@ -0,0 +0,0 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
-                 BlockPos finalblockposition = pos;
-                 // CraftBukkit end
-                 player.startSleepInBed(pos).ifLeft((entityhuman_enumbedresult) -> {
-+                    // Paper start - PlayerBedFailEnterEvent
-+                    if (entityhuman_enumbedresult != null) {
-+                        io.papermc.paper.event.player.PlayerBedFailEnterEvent event = new io.papermc.paper.event.player.PlayerBedFailEnterEvent((org.bukkit.entity.Player) player.getBukkitEntity(), io.papermc.paper.event.player.PlayerBedFailEnterEvent.FailReason.VALUES[entityhuman_enumbedresult.ordinal()], org.bukkit.craftbukkit.block.CraftBlock.at(world, finalblockposition), !world.dimensionType().bedWorks(), io.papermc.paper.adventure.PaperAdventure.asAdventure(entityhuman_enumbedresult.getMessage()));
-+                        if (!event.callEvent()) {
-+                            return;
-+                        }
-+                        // Paper end
-                     // CraftBukkit start - handling bed explosion from below here
-                    if (!world.dimensionType().bedWorks()) {
-+                    if (event.getWillExplode()) { // Paper
-                         this.explodeBed(finaliblockdata, world, finalblockposition);
-                     } else
-                     // CraftBukkit end
-                     if (entityhuman_enumbedresult.getMessage() != null) {
-                        player.displayClientMessage(entityhuman_enumbedresult.getMessage(), true);
-+                        final net.kyori.adventure.text.Component message = event.getMessage(); // Paper
-+                        if (message != null) player.displayClientMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), true); // Paper
-                     }
-+                    } // Paper
- 
-                 });
-                 return InteractionResult.SUCCESS;
--- a/patches/unapplied/server/Added-PlayerDeepSleepEvent.patch
+++ b/patches/unapplied/server/Added-PlayerDeepSleepEvent.patch
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 21 Apr 2021 15:58:19 -0700
-Subject: [PATCH] Added PlayerDeepSleepEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -0,0 +0,0 @@ public abstract class Player extends LivingEntity {
- 
-         if (this.isSleeping()) {
-             ++this.sleepCounter;
-+            // Paper start
-+            if (this.sleepCounter == 100) {
-+                if (!new io.papermc.paper.event.player.PlayerDeepSleepEvent((org.bukkit.entity.Player) getBukkitEntity()).callEvent()) { this.sleepCounter = Integer.MIN_VALUE; }
-+            }
-+            // Paper end
-             if (this.sleepCounter > 100) {
-                 this.sleepCounter = 100;
-             }
--- a/patches/unapplied/server/Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/unapplied/server/Added-PlayerLecternPageChangeEvent.patch
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 23 Nov 2020 12:58:51 -0800
-Subject: [PATCH] Added PlayerLecternPageChangeEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/LecternMenu.java b/src/main/java/net/minecraft/world/inventory/LecternMenu.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/LecternMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/LecternMenu.java
-@@ -0,0 +0,0 @@ public class LecternMenu extends AbstractContainerMenu {
-     @Override
-     public boolean clickMenuButton(net.minecraft.world.entity.player.Player player, int id) {
-         int j;
-+        io.papermc.paper.event.player.PlayerLecternPageChangeEvent playerLecternPageChangeEvent; CraftInventoryLectern bukkitView; // Paper
- 
-         if (id >= 100) {
-             j = id - 100;
-@@ -0,0 +0,0 @@ public class LecternMenu extends AbstractContainerMenu {
-             switch (id) {
-                 case 1:
-                     j = this.lecternData.get(0);
-                    this.setData(0, j - 1);
-+                    // Paper start
-+                    bukkitView = (CraftInventoryLectern) getBukkitView().getTopInventory();
-+                    playerLecternPageChangeEvent = new io.papermc.paper.event.player.PlayerLecternPageChangeEvent((org.bukkit.entity.Player) player.getBukkitEntity(), bukkitView.getHolder(), bukkitView.getBook(), io.papermc.paper.event.player.PlayerLecternPageChangeEvent.PageChangeDirection.LEFT, j, j - 1);
-+                    if (!playerLecternPageChangeEvent.callEvent()) {
-+                        return false;
-+                    }
-+                    this.setData(0, playerLecternPageChangeEvent.getNewPage());
-+                    // Paper end
-                     return true;
-                 case 2:
-                     j = this.lecternData.get(0);
-                    this.setData(0, j + 1);
-+                    // Paper start
-+                    bukkitView = (CraftInventoryLectern) getBukkitView().getTopInventory();
-+                    playerLecternPageChangeEvent = new io.papermc.paper.event.player.PlayerLecternPageChangeEvent((org.bukkit.entity.Player) player.getBukkitEntity(), bukkitView.getHolder(), bukkitView.getBook(), io.papermc.paper.event.player.PlayerLecternPageChangeEvent.PageChangeDirection.RIGHT, j, j + 1);
-+                    if (!playerLecternPageChangeEvent.callEvent()) {
-+                        return false;
-+                    }
-+                    this.setData(0, playerLecternPageChangeEvent.getNewPage());
-+                    // Paper end
-                     return true;
-                 case 3:
-                     if (!player.mayBuild()) {
--- a/patches/unapplied/server/Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/unapplied/server/Added-PlayerLoomPatternSelectEvent.patch
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 25 Nov 2020 16:33:27 -0800
-Subject: [PATCH] Added PlayerLoomPatternSelectEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/LoomMenu.java b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/LoomMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
-@@ -0,0 +0,0 @@ public class LoomMenu extends AbstractContainerMenu {
-     @Override
-     public boolean clickMenuButton(net.minecraft.world.entity.player.Player player, int id) {
-         if (id >= 0 && id < this.selectablePatterns.size()) {
-            this.selectedBannerPatternIndex.set(id);
-            this.setupResultSlot((Holder) this.selectablePatterns.get(id));
-+            // Paper start
-+            int selectablePatternIndex = id;
-+            io.papermc.paper.event.player.PlayerLoomPatternSelectEvent event = new io.papermc.paper.event.player.PlayerLoomPatternSelectEvent((Player) player.getBukkitEntity(), ((CraftInventoryLoom) getBukkitView().getTopInventory()), org.bukkit.block.banner.PatternType.getByIdentifier(this.selectablePatterns.get(selectablePatternIndex).value().getHashname()));
-+            if (!event.callEvent()) {
-+                ((Player) player.getBukkitEntity()).updateInventory();
-+                return false;
-+            }
-+            Holder<BannerPattern> selectedPattern = null;
-+            for (int i = 0; i < this.selectablePatterns.size(); i++) {
-+                final Holder<BannerPattern> holder = this.selectablePatterns.get(i);
-+                if (event.getPatternType().getIdentifier().equals(holder.value().getHashname())) {
-+                    selectablePatternIndex = i;
-+                    selectedPattern = holder;
-+                    break;
-+                }
-+            }
-+            if (selectedPattern == null) {
-+                for (BannerPattern pattern : Registry.BANNER_PATTERN) {
-+                    if (event.getPatternType().getIdentifier().equals(pattern.getHashname())) {
-+                        selectedPattern = Registry.BANNER_PATTERN.getHolder(Registry.BANNER_PATTERN.getId(pattern)).orElseThrow();
-+                        break;
-+                    }
-+                }
-+                selectablePatternIndex = -1;
-+            }
-+            ((Player) player.getBukkitEntity()).updateInventory();
-+            this.selectedBannerPatternIndex.set(selectablePatternIndex);
-+            this.setupResultSlot(java.util.Objects.requireNonNull(selectedPattern, "selectedPattern was null, this is unexpected"));
-+            // Paper end
-             return true;
-         } else {
-             return false;
--- a/patches/unapplied/server/Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/unapplied/server/Added-PlayerStonecutterRecipeSelectEvent.patch
@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Fri, 27 Nov 2020 17:14:27 -0800
-Subject: [PATCH] Added PlayerStonecutterRecipeSelectEvent
-
-Co-Authored-By: MiniDigger | Martin <admin@minidigger.dev>
-
-diff --git a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
-@@ -0,0 +0,0 @@ public class StonecutterMenu extends AbstractContainerMenu {
- 
-     public StonecutterMenu(int syncId, Inventory playerInventory, final ContainerLevelAccess context) {
-         super(MenuType.STONECUTTER, syncId);
-        this.selectedRecipeIndex = DataSlot.standalone();
-+        this.selectedRecipeIndex = DataSlot.shared(new int[1], 0); // Paper - allow replication
-         this.recipes = Lists.newArrayList();
-         this.input = ItemStack.EMPTY;
-         this.slotUpdateListener = () -> {
-@@ -0,0 +0,0 @@ public class StonecutterMenu extends AbstractContainerMenu {
-     @Override
-     public boolean clickMenuButton(net.minecraft.world.entity.player.Player player, int id) {
-         if (this.isValidRecipeIndex(id)) {
-            this.selectedRecipeIndex.set(id);
-+            // Paper start
-+            int recipeIndex = id;
-+            this.selectedRecipeIndex.set(recipeIndex);
-+            this.selectedRecipeIndex.checkAndClearUpdateFlag(); // mark as changed
-+            if (this.isValidRecipeIndex(id)) {
-+                io.papermc.paper.event.player.PlayerStonecutterRecipeSelectEvent event = new io.papermc.paper.event.player.PlayerStonecutterRecipeSelectEvent((Player) player.getBukkitEntity(), (org.bukkit.inventory.StonecutterInventory) getBukkitView().getTopInventory(), (org.bukkit.inventory.StonecuttingRecipe) this.getRecipes().get(id).toBukkitRecipe());
-+                if (!event.callEvent()) {
-+                    ((Player) player.getBukkitEntity()).updateInventory();
-+                    return false;
-+                }
-+                int newRecipeIndex;
-+                if (!this.getRecipes().get(recipeIndex).getId().equals(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(event.getStonecuttingRecipe().getKey()))) { // If the recipe did NOT stay the same
-+                    for (newRecipeIndex = 0; newRecipeIndex < this.getRecipes().size(); newRecipeIndex++) {
-+                        if (this.getRecipes().get(newRecipeIndex).getId().equals(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(event.getStonecuttingRecipe().getKey()))) {
-+                            recipeIndex = newRecipeIndex;
-+                            break;
-+                        }
-+                    }
-+                }
-+            }
-+            ((Player) player.getBukkitEntity()).updateInventory();
-+            this.selectedRecipeIndex.set(recipeIndex); // set new index, so that listeners can read it
-+            // Paper end
-             this.setupResultSlot();
-         }
- 
--- a/patches/unapplied/server/Added-ServerResourcesReloadedEvent.patch
+++ b/patches/unapplied/server/Added-ServerResourcesReloadedEvent.patch
@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 2 Dec 2020 20:04:01 -0800
-Subject: [PATCH] Added ServerResourcesReloadedEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         return this.functionManager;
-     }
- 
-+    // Paper start - add cause
-+    @Deprecated
-     public CompletableFuture<Void> reloadResources(Collection<String> dataPacks) {
-+        return this.reloadResources(dataPacks, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.PLUGIN);
-+    }
-+    public CompletableFuture<Void> reloadResources(Collection<String> dataPacks, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause cause) {
-+        // Paper end
-         RegistryAccess.Frozen iregistrycustom_dimension = this.registryAccess();
-         CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
-             Stream<String> stream = dataPacks.stream(); // CraftBukkit - decompile error
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             this.packRepository.setSelected(dataPacks);
-             this.worldData.setDataPackConfig(MinecraftServer.getSelectedPacks(this.packRepository));
-             this.resources.managers.updateRegistryTags(this.registryAccess());
-+            new io.papermc.paper.event.server.ServerResourcesReloadedEvent(cause).callEvent(); // Paper
-             // Paper start
-             if (Thread.currentThread() != this.serverThread) {
-                 return;
-diff --git a/src/main/java/net/minecraft/server/commands/ReloadCommand.java b/src/main/java/net/minecraft/server/commands/ReloadCommand.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/commands/ReloadCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/ReloadCommand.java
-@@ -0,0 +0,0 @@ public class ReloadCommand {
-     public ReloadCommand() {}
- 
-     public static void reloadPacks(Collection<String> dataPacks, CommandSourceStack source) {
-        source.getServer().reloadResources(dataPacks).exceptionally((throwable) -> {
-+        source.getServer().reloadResources(dataPacks, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.COMMAND).exceptionally((throwable) -> {
-             ReloadCommand.LOGGER.warn("Failed to execute reload", throwable);
-             source.sendFailure(Component.translatable("commands.reload.failure"));
-             return null;
-@@ -0,0 +0,0 @@ public class ReloadCommand {
-         WorldData savedata = minecraftserver.getWorldData();
-         Collection<String> collection = resourcepackrepository.getSelectedIds();
-         Collection<String> collection1 = ReloadCommand.discoverNewPacks(resourcepackrepository, savedata, collection);
-        minecraftserver.reloadResources(collection1);
-+        minecraftserver.reloadResources(collection1, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.PLUGIN); // Paper
-     }
-     // CraftBukkit end
- 
--- a/patches/unapplied/server/Added-WorldGameRuleChangeEvent.patch
+++ b/patches/unapplied/server/Added-WorldGameRuleChangeEvent.patch
@@ -1,98 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 20 Dec 2020 16:41:44 -0800
-Subject: [PATCH] Added WorldGameRuleChangeEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/commands/GameRuleCommand.java b/src/main/java/net/minecraft/server/commands/GameRuleCommand.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/commands/GameRuleCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/GameRuleCommand.java
-@@ -0,0 +0,0 @@ public class GameRuleCommand {
-         CommandSourceStack commandlistenerwrapper = (CommandSourceStack) context.getSource();
-         T t0 = commandlistenerwrapper.getLevel().getGameRules().getRule(key); // CraftBukkit
- 
-        t0.setFromArgument(context, "value");
-+        t0.setFromArgument(context, "value", key); // Paper
-         commandlistenerwrapper.sendSuccess(Component.translatable("commands.gamerule.set", key.getId(), t0.toString()), true);
-         return t0.getCommandResult();
-     }
-diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/GameRules.java
-+++ b/src/main/java/net/minecraft/world/level/GameRules.java
-@@ -0,0 +0,0 @@ public class GameRules {
-             this.type = type;
-         }
- 
-        protected abstract void updateFromArgument(CommandContext<CommandSourceStack> context, String name);
-+        protected abstract void updateFromArgument(CommandContext<CommandSourceStack> context, String name, GameRules.Key<T> gameRuleKey); // Paper
- 
-        public void setFromArgument(CommandContext<CommandSourceStack> context, String name) {
-            this.updateFromArgument(context, name);
-+        public void setFromArgument(CommandContext<CommandSourceStack> context, String name, GameRules.Key<T> gameRuleKey) { // Paper
-+            this.updateFromArgument(context, name, gameRuleKey); // Paper
-             this.onChanged(((CommandSourceStack) context.getSource()).getServer());
-         }
- 
-@@ -0,0 +0,0 @@ public class GameRules {
-         }
- 
-         @Override
-        protected void updateFromArgument(CommandContext<CommandSourceStack> context, String name) {
-            this.value = BoolArgumentType.getBool(context, name);
-+        protected void updateFromArgument(CommandContext<CommandSourceStack> context, String name, GameRules.Key<BooleanValue> gameRuleKey) { // Paper start
-+            io.papermc.paper.event.world.WorldGameRuleChangeEvent event = new io.papermc.paper.event.world.WorldGameRuleChangeEvent(context.getSource().getBukkitWorld(), context.getSource().getBukkitSender(), (org.bukkit.GameRule<Boolean>) org.bukkit.GameRule.getByName(gameRuleKey.toString()), String.valueOf(BoolArgumentType.getBool(context, name)));
-+            if (!event.callEvent()) return;
-+            this.value = Boolean.parseBoolean(event.getValue());
-+            // Paper end
-         }
- 
-         public boolean get() {
-@@ -0,0 +0,0 @@ public class GameRules {
-         }
- 
-         @Override
-        protected void updateFromArgument(CommandContext<CommandSourceStack> context, String name) {
-            this.value = IntegerArgumentType.getInteger(context, name);
-+        protected void updateFromArgument(CommandContext<CommandSourceStack> context, String name, GameRules.Key<IntegerValue> gameRuleKey) { // Paper start
-+            io.papermc.paper.event.world.WorldGameRuleChangeEvent event = new io.papermc.paper.event.world.WorldGameRuleChangeEvent(context.getSource().getBukkitWorld(), context.getSource().getBukkitSender(), (org.bukkit.GameRule<Integer>) org.bukkit.GameRule.getByName(gameRuleKey.toString()), String.valueOf(IntegerArgumentType.getInteger(context, name)));
-+            if (!event.callEvent()) return;
-+            this.value = Integer.parseInt(event.getValue());
-+            // Paper end
-         }
- 
-         public int get() {
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World {
- 
-         if (!this.isGameRule(rule)) return false;
- 
-+        // Paper start
-+        GameRule<?> gameRule = GameRule.getByName(rule);
-+        io.papermc.paper.event.world.WorldGameRuleChangeEvent event = new io.papermc.paper.event.world.WorldGameRuleChangeEvent(this, null, gameRule, value);
-+        if (!event.callEvent()) return false;
-+        // Paper end
-         GameRules.Value<?> handle = this.getHandle().getGameRules().getRule(CraftWorld.getGameRulesNMS().get(rule));
-        handle.deserialize(value);
-+        handle.deserialize(event.getValue()); // Paper
-         handle.onChanged(this.getHandle().getServer());
-         return true;
-     }
-@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World {
- 
-         if (!this.isGameRule(rule.getName())) return false;
- 
-+        // Paper start
-+        io.papermc.paper.event.world.WorldGameRuleChangeEvent event = new io.papermc.paper.event.world.WorldGameRuleChangeEvent(this, null, rule, String.valueOf(newValue));
-+        if (!event.callEvent()) return false;
-+        // Paper end
-         GameRules.Value<?> handle = this.getHandle().getGameRules().getRule(CraftWorld.getGameRulesNMS().get(rule.getName()));
-        handle.deserialize(newValue.toString());
-+        handle.deserialize(event.getValue()); // Paper
-         handle.onChanged(this.getHandle().getServer());
-         return true;
-     }
--- a/patches/unapplied/server/Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/unapplied/server/Added-firing-of-PlayerChangeBeaconEffectEvent.patch
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 24 Jun 2020 15:14:51 -0600
-Subject: [PATCH] Added firing of PlayerChangeBeaconEffectEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
-@@ -0,0 +0,0 @@ public class BeaconMenu extends AbstractContainerMenu {
-     public MobEffect getSecondaryEffect() {
-         return MobEffect.byId(this.beaconData.get(2));
-     }
-+    // Paper start
-+    private static @Nullable org.bukkit.potion.PotionEffectType convert(Optional<MobEffect> effect) {
-+        return effect.flatMap(net.minecraft.core.Registry.MOB_EFFECT::getResourceKey).map(key -> {
-+            return org.bukkit.potion.PotionEffectType.getByKey(org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(key.location()));
-+        }).orElse(null);
-+    }
-+    // Paper end
- 
-     public void updateEffects(Optional<MobEffect> primary, Optional<MobEffect> secondary) {
-         if (this.paymentSlot.hasItem()) {
-            this.beaconData.set(1, (Integer) primary.map(MobEffect::getId).orElse(-1));
-            this.beaconData.set(2, (Integer) secondary.map(MobEffect::getId).orElse(-1));
-+            // Paper start
-+            io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent event = new io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent((org.bukkit.entity.Player) this.player.player.getBukkitEntity(), convert(primary), convert(secondary), this.access.getLocation().getBlock());
-+            if (event.callEvent()) {
-+            this.beaconData.set(1, event.getPrimary() == null ? -1 : event.getPrimary().getId());
-+            this.beaconData.set(2, event.getSecondary() == null ? -1 : event.getSecondary().getId());
-+            if (event.willConsumeItem()) {
-+            // Paper end
-             this.paymentSlot.remove(1);
-+            }
-             this.access.execute(Level::blockEntityChanged);
-+            } // Paper end
-         }
- 
-     }
--- a/patches/unapplied/server/Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/unapplied/server/Added-world-settings-for-mobs-picking-up-loot.patch
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 28 Nov 2020 18:43:52 -0800
-Subject: [PATCH] Added world settings for mobs picking up loot
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -0,0 +0,0 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
-         this.populateDefaultEquipmentSlots(randomsource, difficulty);
-         this.populateDefaultEquipmentEnchantments(randomsource, difficulty);
-         this.reassessWeaponGoal();
-        this.setCanPickUpLoot(randomsource.nextFloat() < 0.55F * difficulty.getSpecialMultiplier());
-+        this.setCanPickUpLoot(this.level.paperConfig().entities.behavior.mobsCanAlwaysPickUpLoot.skeletons || randomsource.nextFloat() < 0.55F * difficulty.getSpecialMultiplier()); // Paper
-         if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {
-             LocalDate localdate = LocalDate.now();
-             int i = localdate.get(ChronoField.DAY_OF_MONTH);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -0,0 +0,0 @@ public class Zombie extends Monster {
-         Object object = super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityNbt);
-         float f = difficulty.getSpecialMultiplier();
- 
-        this.setCanPickUpLoot(randomsource.nextFloat() < 0.55F * f);
-+        this.setCanPickUpLoot(this.level.paperConfig().entities.behavior.mobsCanAlwaysPickUpLoot.zombies || randomsource.nextFloat() < 0.55F * f); // Paper
-         if (object == null) {
-             object = new Zombie.ZombieGroupData(Zombie.getSpawnAsBabyOdds(randomsource), true);
-         }
--- a/patches/unapplied/server/Additional-Block-Material-API-s.patch
+++ b/patches/unapplied/server/Additional-Block-Material-API-s.patch
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 30 Dec 2020 19:43:01 -0500
-Subject: [PATCH] Additional Block Material API's
-
-Faster version for isSolid() that utilizes NMS's state for isSolid instead of the slower
-process to do this in the Bukkit API
-
-Adds API for buildable, replaceable, burnable too.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -0,0 +0,0 @@ public class CraftBlock implements Block {
-         return this.getNMS().getMaterial().isLiquid();
-     }
- 
-+    // Paper start
-+    @Override
-+    public boolean isBuildable() {
-+        return getNMS().getMaterial().isSolid(); // This is in fact isSolid, despite the fact that isSolid below returns blocksMotion
-+    }
-+    @Override
-+    public boolean isBurnable() {
-+        return getNMS().getMaterial().isFlammable();
-+    }
-+    @Override
-+    public boolean isReplaceable() {
-+        return getNMS().getMaterial().isReplaceable();
-+    }
-+    @Override
-+    public boolean isSolid() {
-+        return getNMS().getMaterial().blocksMotion();
-+    }
-+    // Paper end
-+
-     @Override
-     public PistonMoveReaction getPistonMoveReaction() {
-         return PistonMoveReaction.getById(this.getNMS().getPistonPushReaction().ordinal());
--- a/patches/unapplied/server/Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/unapplied/server/Allow-adding-items-to-BlockDropItemEvent.patch
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Wed, 20 Jan 2021 14:23:37 -0600
-Subject: [PATCH] Allow adding items to BlockDropItemEvent
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -0,0 +0,0 @@ public class CraftEventFactory {
-     }
- 
-     public static void handleBlockDropItemEvent(Block block, BlockState state, ServerPlayer player, List<ItemEntity> items) {
-        BlockDropItemEvent event = new BlockDropItemEvent(block, state, player.getBukkitEntity(), Lists.transform(items, (item) -> (org.bukkit.entity.Item) item.getBukkitEntity()));
-+        // Paper start
-+        List<Item> list = new ArrayList<>();
-+        for (ItemEntity item : items) {
-+            list.add((Item) item.getBukkitEntity());
-+        }
-+        BlockDropItemEvent event = new BlockDropItemEvent(block, state, player.getBukkitEntity(), list);
-+        // Paper end
-         Bukkit.getPluginManager().callEvent(event);
- 
-         if (!event.isCancelled()) {
-            for (ItemEntity item : items) {
-                item.level.addFreshEntity(item);
-+            // Paper start
-+            for (Item bukkit : list) {
-+                if (!bukkit.isValid()) {
-+                    Entity item = ((org.bukkit.craftbukkit.entity.CraftItem) bukkit).getHandle();
-+                    item.level.addFreshEntity(item);
-+                }
-+            }
-+        } else {
-+            for (Item bukkit : list) {
-+                if (bukkit.isValid()) {
-+                    bukkit.remove();
-+                }
-             }
-+            // Paper end
-         }
-     }
- 
--- a/patches/unapplied/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/unapplied/server/Allow-disabling-mob-spawner-spawn-egg-transformation.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BrodyBeckwith <brody@beckwith.dev>
-Date: Fri, 9 Oct 2020 20:30:12 -0400
-Subject: [PATCH] Allow disabling mob spawner spawn egg transformation
-
-
-diff --git a/src/main/java/net/minecraft/world/item/SpawnEggItem.java b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-+++ b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-@@ -0,0 +0,0 @@ public class SpawnEggItem extends Item {
-             Direction enumdirection = context.getClickedFace();
-             BlockState iblockdata = world.getBlockState(blockposition);
- 
-            if (iblockdata.is(Blocks.SPAWNER)) {
-+            if (!world.paperConfig().entities.spawning.disableMobSpawnerSpawnEggTransformation && iblockdata.is(Blocks.SPAWNER)) { // Paper
-                 BlockEntity tileentity = world.getBlockEntity(blockposition);
- 
-                 if (tileentity instanceof SpawnerBlockEntity) {
--- a/patches/unapplied/server/Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/unapplied/server/Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
@@ -1,133 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Thu, 1 Apr 2021 00:34:02 -0700
-Subject: [PATCH] Allow for Component suggestion tooltips in
- AsyncTabCompleteEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
- 
-         // Paper start - async tab completion
-         com.destroystokyo.paper.event.server.AsyncTabCompleteEvent event;
-        java.util.List<String> completions = new java.util.ArrayList<>();
-         String buffer = packet.getCommand();
-        event = new com.destroystokyo.paper.event.server.AsyncTabCompleteEvent(this.getCraftPlayer(), completions,
-+        event = new com.destroystokyo.paper.event.server.AsyncTabCompleteEvent(this.getCraftPlayer(),
-                 buffer, true, null);
-         event.callEvent();
-        completions = event.isCancelled() ? com.google.common.collect.ImmutableList.of() : event.getCompletions();
-+        java.util.List<com.destroystokyo.paper.event.server.AsyncTabCompleteEvent.Completion> completions = event.isCancelled() ? com.google.common.collect.ImmutableList.of() : event.completions();
-         // If the event isn't handled, we can assume that we have no completions, and so we'll ask the server
-         if (!event.isHandled()) {
-             if (!event.isCancelled()) {
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
-                 });
-             }
-         } else if (!completions.isEmpty()) {
-            com.mojang.brigadier.suggestion.SuggestionsBuilder builder = new com.mojang.brigadier.suggestion.SuggestionsBuilder(packet.getCommand(), stringreader.getTotalLength());
-+            com.mojang.brigadier.suggestion.SuggestionsBuilder builder0 = new com.mojang.brigadier.suggestion.SuggestionsBuilder(packet.getCommand(), stringreader.getTotalLength());
- 
-            builder = builder.createOffset(builder.getInput().lastIndexOf(' ') + 1);
-            completions.forEach(builder::suggest);
-+            final com.mojang.brigadier.suggestion.SuggestionsBuilder builder = builder0.createOffset(builder0.getInput().lastIndexOf(' ') + 1);
-+            completions.forEach(completion -> {
-+                final Integer intSuggestion = com.google.common.primitives.Ints.tryParse(completion.suggestion());
-+                if (intSuggestion != null) {
-+                    builder.suggest(intSuggestion, PaperAdventure.asVanilla(completion.tooltip()));
-+                } else {
-+                    builder.suggest(completion.suggestion(), PaperAdventure.asVanilla(completion.tooltip()));
-+                }
-+            });
-             com.mojang.brigadier.suggestion.Suggestions suggestions = builder.buildFuture().join();
-             com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent suggestEvent = new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent(this.getCraftPlayer(), suggestions, buffer);
-             suggestEvent.setCancelled(suggestions.isEmpty());
-diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-+++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-@@ -0,0 +0,0 @@ public class ConsoleCommandCompleter implements Completer {
-         final CraftServer server = this.server.server;
-         final String buffer = line.line();
-         // Async Tab Complete
-        com.destroystokyo.paper.event.server.AsyncTabCompleteEvent event;
-        java.util.List<String> completions = new java.util.ArrayList<>();
-        event = new com.destroystokyo.paper.event.server.AsyncTabCompleteEvent(server.getConsoleSender(), completions,
-            buffer, true, null);
-+        final com.destroystokyo.paper.event.server.AsyncTabCompleteEvent event =
-+            new com.destroystokyo.paper.event.server.AsyncTabCompleteEvent(server.getConsoleSender(), buffer, true, null);
-         event.callEvent();
-        completions = event.isCancelled() ? com.google.common.collect.ImmutableList.of() : event.getCompletions();
-+        final List<com.destroystokyo.paper.event.server.AsyncTabCompleteEvent.Completion> completions = event.isCancelled() ? com.google.common.collect.ImmutableList.of() : event.completions();
- 
-         if (event.isCancelled() || event.isHandled()) {
-             // Still fire sync event with the provided completions, if someone is listening
-             if (!event.isCancelled() && TabCompleteEvent.getHandlerList().getRegisteredListeners().length > 0) {
-                List<String> finalCompletions = completions;
-+                List<com.destroystokyo.paper.event.server.AsyncTabCompleteEvent.Completion> finalCompletions = new java.util.ArrayList<>(completions);
-                 Waitable<List<String>> syncCompletions = new Waitable<List<String>>() {
-                     @Override
-                     protected List<String> evaluate() {
-                        org.bukkit.event.server.TabCompleteEvent syncEvent = new org.bukkit.event.server.TabCompleteEvent(server.getConsoleSender(), buffer, finalCompletions);
-+                        org.bukkit.event.server.TabCompleteEvent syncEvent = new org.bukkit.event.server.TabCompleteEvent(server.getConsoleSender(), buffer,
-+                            finalCompletions.stream()
-+                                .map(com.destroystokyo.paper.event.server.AsyncTabCompleteEvent.Completion::suggestion)
-+                                .collect(java.util.stream.Collectors.toList()));
-                         return syncEvent.callEvent() ? syncEvent.getCompletions() : com.google.common.collect.ImmutableList.of();
-                     }
-                 };
-                 server.getServer().processQueue.add(syncCompletions);
-                 try {
-                    completions = syncCompletions.get();
-+                    final List<String> legacyCompletions = syncCompletions.get();
-+                    completions.removeIf(it -> !legacyCompletions.contains(it.suggestion())); // remove any suggestions that were removed
-+                    // add any new suggestions
-+                    for (final String completion : legacyCompletions) {
-+                        if (notNewSuggestion(completions, completion)) {
-+                            continue;
-+                        }
-+                        completions.add(com.destroystokyo.paper.event.server.AsyncTabCompleteEvent.Completion.completion(completion));
-+                    }
-                 } catch (InterruptedException | ExecutionException e1) {
-                     e1.printStackTrace();
-                 }
-             }
- 
-             if (!completions.isEmpty()) {
-                candidates.addAll(completions.stream().map(Candidate::new).collect(java.util.stream.Collectors.toList()));
-+                for (final com.destroystokyo.paper.event.server.AsyncTabCompleteEvent.Completion completion : completions) {
-+                    if (completion.suggestion().isEmpty()) {
-+                        continue;
-+                    }
-+                    candidates.add(new Candidate(
-+                        completion.suggestion(),
-+                        completion.suggestion(),
-+                        null,
-+                        io.papermc.paper.adventure.PaperAdventure.PLAIN.serializeOr(completion.tooltip(), null),
-+                        null,
-+                        null,
-+                        false
-+                    ));
-+                }
-             }
-             return;
-         }
-@@ -0,0 +0,0 @@ public class ConsoleCommandCompleter implements Completer {
-             Thread.currentThread().interrupt();
-         }
-     }
-+
-+    // Paper start
-+    private boolean notNewSuggestion(final List<com.destroystokyo.paper.event.server.AsyncTabCompleteEvent.Completion> completions, final String completion) {
-+        for (final com.destroystokyo.paper.event.server.AsyncTabCompleteEvent.Completion it : completions) {
-+            if (it.suggestion().equals(completion)) {
-+                return true;
-+            }
-+        }
-+        return false;
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/unapplied/server/Allow-using-signs-inside-spawn-protection.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Anton Lindroth <ntoonio@gmail.com>
-Date: Wed, 15 Apr 2020 01:54:02 +0200
-Subject: [PATCH] Allow using signs inside spawn protection
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
-                 int i = this.player.level.getMaxBuildHeight();
- 
-                 if (blockposition.getY() < i) {
-                    if (this.awaitingPositionFromClient == null && this.player.distanceToSqr((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && worldserver.mayInteract(this.player, blockposition)) {
-+                    if (this.awaitingPositionFromClient == null && this.player.distanceToSqr((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && (worldserver.mayInteract(this.player, blockposition)  || (worldserver.paperConfig().spawn.allowUsingSignsInsideSpawnProtection && worldserver.getBlockState(blockposition).getBlock() instanceof net.minecraft.world.level.block.SignBlock))) { // Paper - sign check
-                         this.player.stopUsingItem(); // CraftBukkit - SPIGOT-4706
-                         InteractionResult enuminteractionresult = this.player.gameMode.useItemOn(this.player, worldserver, itemstack, enumhand, movingobjectpositionblock);
- 
--- a/patches/unapplied/server/Cache-burn-durations.patch
+++ b/patches/unapplied/server/Cache-burn-durations.patch
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: lukas <lukasalt98@gmail.com>
-Date: Sun, 27 Dec 2020 16:47:00 +0100
-Subject: [PATCH] Cache burn durations
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-@@ -0,0 +0,0 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
-         this.recipeType = recipeType; // Paper
-     }
- 
-+    private static Map<Item, Integer> cachedBurnDurations = null; // Paper - cache burn durations
-     public static Map<Item, Integer> getFuel() {
-+        // Paper start - cache burn durations
-+        if(cachedBurnDurations != null) {
-+            return cachedBurnDurations;
-+        }
-+        // Paper end
-         Map<Item, Integer> map = Maps.newLinkedHashMap();
- 
-         AbstractFurnaceBlockEntity.add(map, (ItemLike) Items.LAVA_BUCKET, 20000);
-@@ -0,0 +0,0 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
-         AbstractFurnaceBlockEntity.add(map, (ItemLike) Blocks.AZALEA, 100);
-         AbstractFurnaceBlockEntity.add(map, (ItemLike) Blocks.FLOWERING_AZALEA, 100);
-         AbstractFurnaceBlockEntity.add(map, (ItemLike) Blocks.MANGROVE_ROOTS, 300);
-        return map;
-+        // Paper start - cache burn durations
-+        cachedBurnDurations = com.google.common.collect.ImmutableMap.copyOf(map);
-+        return cachedBurnDurations;
-+        // Paper end
-     }
- 
-     // CraftBukkit start - add fields and methods
--- a/patches/unapplied/server/Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/unapplied/server/Collision-option-for-requiring-a-player-participant.patch
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mariell Hoversholm <proximyst@proximyst.com>
-Date: Sat, 14 Nov 2020 16:48:37 +0100
-Subject: [PATCH] Collision option for requiring a player participant
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     public void push(Entity entity) {
-         if (!this.isPassengerOfSameVehicle(entity)) {
-             if (!entity.noPhysics && !this.noPhysics) {
-+                if (this.level.paperConfig().collisions.onlyPlayersCollide && !(entity instanceof ServerPlayer || this instanceof ServerPlayer)) return; // Paper
-                 double d0 = entity.getX() - this.getX();
-                 double d1 = entity.getZ() - this.getZ();
-                 double d2 = Mth.absMax(d0, d1);
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-@@ -0,0 +0,0 @@ public abstract class AbstractMinecart extends Entity {
-     public void push(Entity entity) {
-         if (!this.level.isClientSide) {
-             if (!entity.noPhysics && !this.noPhysics) {
-+                if (!this.level.paperConfig().collisions.allowVehicleCollisions && this.level.paperConfig().collisions.onlyPlayersCollide && !(entity instanceof Player)) return; // Paper
-                 if (!this.hasPassenger(entity)) {
-                     // CraftBukkit start
-                     VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent((Vehicle) this.getBukkitEntity(), entity.getBukkitEntity());
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-@@ -0,0 +0,0 @@ public class Boat extends Entity {
- 
-     @Override
-     public void push(Entity entity) {
-+        if (!this.level.paperConfig().collisions.allowVehicleCollisions && this.level.paperConfig().collisions.onlyPlayersCollide && !(entity instanceof Player)) return; // Paper
-         if (entity instanceof Boat) {
-             if (entity.getBoundingBox().minY < this.getBoundingBox().maxY) {
-                 // CraftBukkit start
--- a/patches/unapplied/server/Configurable-door-breaking-difficulty.patch
+++ b/patches/unapplied/server/Configurable-door-breaking-difficulty.patch
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 3 Jan 2021 22:27:43 -0800
-Subject: [PATCH] Configurable door breaking difficulty
-
-Co-authored-by: Doc <nachito94@msn.com>
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-@@ -0,0 +0,0 @@ public class Vindicator extends AbstractIllager {
- 
-     static class VindicatorBreakDoorGoal extends BreakDoorGoal {
-         public VindicatorBreakDoorGoal(Mob mob) {
-            super(mob, 6, Vindicator.DOOR_BREAKING_PREDICATE);
-+            super(mob, 6, com.google.common.base.Predicates.in(mob.level.paperConfig().entities.behavior.doorBreakingDifficulty.getOrDefault(mob.getType(), mob.level.paperConfig().entities.behavior.doorBreakingDifficulty.get(EntityType.VINDICATOR)))); // Paper
-             this.setFlags(EnumSet.of(Goal.Flag.MOVE));
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -0,0 +0,0 @@ public class Zombie extends Monster {
- 
-     public Zombie(EntityType<? extends Zombie> type, Level world) {
-         super(type, world);
-        this.breakDoorGoal = new BreakDoorGoal(this, Zombie.DOOR_BREAKING_PREDICATE);
-+        this.breakDoorGoal = new BreakDoorGoal(this, com.google.common.base.Predicates.in(world.paperConfig().entities.behavior.doorBreakingDifficulty.getOrDefault(type, world.paperConfig().entities.behavior.doorBreakingDifficulty.get(EntityType.ZOMBIE)))); // Paper
-     }
- 
-     public Zombie(Level world) {
--- a/patches/unapplied/server/Configurable-max-leash-distance.patch
+++ b/patches/unapplied/server/Configurable-max-leash-distance.patch
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 3 Jan 2021 21:04:03 -0800
-Subject: [PATCH] Configurable max leash distance
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/PathfinderMob.java b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/PathfinderMob.java
-+++ b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
-@@ -0,0 +0,0 @@ public abstract class PathfinderMob extends Mob {
-             float f = this.distanceTo(entity);
- 
-             if (this instanceof TamableAnimal && ((TamableAnimal) this).isInSittingPose()) {
-                if (f > 10.0F) {
-+                if (f > entity.level.paperConfig().misc.maxLeashDistance) { // Paper
-                     this.level.getCraftServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE)); // CraftBukkit
-                     this.dropLeash(true, true);
-                 }
-@@ -0,0 +0,0 @@ public abstract class PathfinderMob extends Mob {
-             }
- 
-             this.onLeashDistance(f);
-            if (f > 10.0F) {
-+            if (f > entity.level.paperConfig().misc.maxLeashDistance) { // Paper
-                 this.level.getCraftServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE)); // CraftBukkit
-                 this.dropLeash(true, true);
-                 this.goalSelector.disableControlFlag(Goal.Flag.MOVE);
--- a/patches/unapplied/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
+++ b/patches/unapplied/server/Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 27 Dec 2020 11:31:06 +0000
-Subject: [PATCH] Do not crash from invalid ingredient lists in
- VillagerAcquireTradeEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-@@ -0,0 +0,0 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
-                     Bukkit.getPluginManager().callEvent(event);
-                 }
-                 if (!event.isCancelled()) {
-                    recipeList.add(CraftMerchantRecipe.fromBukkit(event.getRecipe()).toMinecraft());
-+                    // Paper start
-+                    final CraftMerchantRecipe craftMerchantRecipe = CraftMerchantRecipe.fromBukkit(event.getRecipe());
-+                    if (craftMerchantRecipe.getIngredients().isEmpty()) return;
-+                    recipeList.add(craftMerchantRecipe.toMinecraft());
-+                    // Paper end
-                 }
-                 // CraftBukkit end
-             }
--- a/patches/unapplied/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/unapplied/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Mon, 5 Apr 2021 18:35:15 -0700
-Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
-         }
- 
-         itemstack.addTagElement("pages", nbttaglist);
-        CraftEventFactory.handleEditBookEvent(player, slot, handItem, itemstack); // CraftBukkit
-+        this.player.getInventory().setItem(slot, CraftEventFactory.handleEditBookEvent(player, slot, handItem, itemstack)); // CraftBukkit // Paper - Don't ignore result (see other callsite for handleEditBookEvent)
-     }
- 
-     @Override
--- a/patches/unapplied/server/Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/unapplied/server/Drop-carried-item-when-player-has-disconnected.patch
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dmitry Sidorov <jonmagon@gmail.com>
-Date: Thu, 4 Feb 2021 20:32:01 +0300
-Subject: [PATCH] Drop carried item when player has disconnected
-
-Fixes disappearance of held items, when a player gets disconnected and PlayerDropItemEvent is cancelled.
-Closes #5036
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
-         }
-         // Paper end
- 
-+        // Paper - Drop carried item when player has disconnected
-+        if (!entityplayer.containerMenu.getCarried().isEmpty()) {
-+            net.minecraft.world.item.ItemStack carried = entityplayer.containerMenu.getCarried();
-+            entityplayer.containerMenu.setCarried(net.minecraft.world.item.ItemStack.EMPTY);
-+            entityplayer.drop(carried, false);
-+        }
-+        // Paper end
-+
-         this.save(entityplayer);
-         if (entityplayer.isPassenger()) {
-             Entity entity = entityplayer.getRootVehicle();
--- a/patches/unapplied/server/Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/unapplied/server/Empty-commands-shall-not-be-dispatched.patch
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mariell Hoversholm <proximyst@proximyst.com>
-Date: Wed, 6 Jan 2021 23:38:43 +0100
-Subject: [PATCH] Empty commands shall not be dispatched
-
-
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -0,0 +0,0 @@ public class Commands {
-         command = event.getCommand();
- 
-         String[] args = command.split(" ");
-+        if (args.length == 0) return 0; // Paper - empty commands shall not be dispatched
- 
-         String cmd = args[0];
-         if (cmd.startsWith("minecraft:")) cmd = cmd.substring("minecraft:".length());
--- a/patches/unapplied/server/Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/unapplied/server/Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -1,285 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Tue, 30 Mar 2021 16:06:08 -0700
-Subject: [PATCH] Enhance console tab completions for brigadier commands
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-+++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-@@ -0,0 +0,0 @@ public final class PaperConsole extends SimpleTerminalConsole {
- 
-     @Override
-     protected LineReader buildReader(LineReaderBuilder builder) {
-        return super.buildReader(builder
-+        builder
-                 .appName("Paper")
-                 .variable(LineReader.HISTORY_FILE, java.nio.file.Paths.get(".console_history"))
-                 .completer(new ConsoleCommandCompleter(this.server))
-        );
-+                .option(LineReader.Option.COMPLETE_IN_WORD, true);
-+        if (io.papermc.paper.configuration.GlobalConfiguration.get().console.enableBrigadierHighlighting) {
-+            builder.highlighter(new io.papermc.paper.console.BrigadierCommandHighlighter(this.server, this.server.createCommandSourceStack()));
-+        }
-+        return super.buildReader(builder);
-     }
- 
-     @Override
-diff --git a/src/main/java/io/papermc/paper/console/BrigadierCommandCompleter.java b/src/main/java/io/papermc/paper/console/BrigadierCommandCompleter.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/console/BrigadierCommandCompleter.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.console;
-+
-+import com.destroystokyo.paper.event.server.AsyncTabCompleteEvent.Completion;
-+import com.mojang.brigadier.CommandDispatcher;
-+import com.mojang.brigadier.ParseResults;
-+import com.mojang.brigadier.StringReader;
-+import com.mojang.brigadier.suggestion.Suggestion;
-+import io.papermc.paper.adventure.PaperAdventure;
-+import net.minecraft.commands.CommandSourceStack;
-+import net.minecraft.network.chat.ComponentUtils;
-+import net.minecraft.server.dedicated.DedicatedServer;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.jline.reader.Candidate;
-+import org.jline.reader.LineReader;
-+import org.jline.reader.ParsedLine;
-+
-+import java.util.ArrayList;
-+import java.util.Collections;
-+import java.util.List;
-+
-+import static com.destroystokyo.paper.event.server.AsyncTabCompleteEvent.Completion.completion;
-+
-+public final class BrigadierCommandCompleter {
-+    private final CommandSourceStack commandSourceStack;
-+    private final DedicatedServer server;
-+
-+    public BrigadierCommandCompleter(final @NonNull DedicatedServer server, final @NonNull CommandSourceStack commandSourceStack) {
-+        this.server = server;
-+        this.commandSourceStack = commandSourceStack;
-+    }
-+
-+    public void complete(final @NonNull LineReader reader, final @NonNull ParsedLine line, final @NonNull List<Candidate> candidates, final @NonNull List<Completion> existing) {
-+        if (!io.papermc.paper.configuration.GlobalConfiguration.get().console.enableBrigadierCompletions) {
-+            this.addCandidates(candidates, Collections.emptyList(), existing);
-+            return;
-+        }
-+        final CommandDispatcher<CommandSourceStack> dispatcher = this.server.getCommands().getDispatcher();
-+        final ParseResults<CommandSourceStack> results = dispatcher.parse(prepareStringReader(line.line()), this.commandSourceStack);
-+        this.addCandidates(
-+            candidates,
-+            dispatcher.getCompletionSuggestions(results, line.cursor()).join().getList(),
-+            existing
-+        );
-+    }
-+
-+    private void addCandidates(
-+        final @NonNull List<Candidate> candidates,
-+        final @NonNull List<Suggestion> brigSuggestions,
-+        final @NonNull List<Completion> existing
-+    ) {
-+        final List<Completion> completions = new ArrayList<>();
-+        brigSuggestions.forEach(it -> completions.add(toCompletion(it)));
-+        for (final Completion completion : existing) {
-+            if (completion.suggestion().isEmpty() || brigSuggestions.stream().anyMatch(it -> it.getText().equals(completion.suggestion()))) {
-+                continue;
-+            }
-+            completions.add(completion);
-+        }
-+        for (final Completion completion : completions) {
-+            if (completion.suggestion().isEmpty()) {
-+                continue;
-+            }
-+            candidates.add(toCandidate(completion));
-+        }
-+    }
-+
-+    private static @NonNull Candidate toCandidate(final @NonNull Completion completion) {
-+        final String suggestionText = completion.suggestion();
-+        final String suggestionTooltip = PaperAdventure.PLAIN.serializeOr(completion.tooltip(), null);
-+        return new Candidate(
-+            suggestionText,
-+            suggestionText,
-+            null,
-+            suggestionTooltip,
-+            null,
-+            null,
-+            false
-+        );
-+    }
-+
-+    private static @NonNull Completion toCompletion(final @NonNull Suggestion suggestion) {
-+        if (suggestion.getTooltip() == null) {
-+            return completion(suggestion.getText());
-+        }
-+        return completion(suggestion.getText(), PaperAdventure.asAdventure(ComponentUtils.fromMessage(suggestion.getTooltip())));
-+    }
-+
-+    static @NonNull StringReader prepareStringReader(final @NonNull String line) {
-+        final StringReader stringReader = new StringReader(line);
-+        if (stringReader.canRead() && stringReader.peek() == '/') {
-+            stringReader.skip();
-+        }
-+        return stringReader;
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/console/BrigadierCommandHighlighter.java b/src/main/java/io/papermc/paper/console/BrigadierCommandHighlighter.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/console/BrigadierCommandHighlighter.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.console;
-+
-+import com.mojang.brigadier.ParseResults;
-+import com.mojang.brigadier.context.ParsedCommandNode;
-+import com.mojang.brigadier.tree.LiteralCommandNode;
-+import java.util.regex.Pattern;
-+import net.minecraft.commands.CommandSourceStack;
-+import net.minecraft.server.dedicated.DedicatedServer;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.jline.reader.Highlighter;
-+import org.jline.reader.LineReader;
-+import org.jline.utils.AttributedString;
-+import org.jline.utils.AttributedStringBuilder;
-+import org.jline.utils.AttributedStyle;
-+
-+public final class BrigadierCommandHighlighter implements Highlighter {
-+    private static final int[] COLORS = {AttributedStyle.CYAN, AttributedStyle.YELLOW, AttributedStyle.GREEN, AttributedStyle.MAGENTA, /* Client uses GOLD here, not BLUE, however there is no GOLD AttributedStyle. */ AttributedStyle.BLUE};
-+    private final CommandSourceStack commandSourceStack;
-+    private final DedicatedServer server;
-+
-+    public BrigadierCommandHighlighter(final @NonNull DedicatedServer server, final @NonNull CommandSourceStack commandSourceStack) {
-+        this.server = server;
-+        this.commandSourceStack = commandSourceStack;
-+    }
-+
-+    @Override
-+    public AttributedString highlight(final @NonNull LineReader reader, final @NonNull String buffer) {
-+        final AttributedStringBuilder builder = new AttributedStringBuilder();
-+        final ParseResults<CommandSourceStack> results = this.server.getCommands().getDispatcher().parse(BrigadierCommandCompleter.prepareStringReader(buffer), this.commandSourceStack);
-+        int pos = 0;
-+        if (buffer.startsWith("/")) {
-+            builder.append("/", AttributedStyle.DEFAULT);
-+            pos = 1;
-+        }
-+        int component = -1;
-+        for (final ParsedCommandNode<CommandSourceStack> node : results.getContext().getLastChild().getNodes()) {
-+            if (node.getRange().getStart() >= buffer.length()) {
-+                break;
-+            }
-+            final int start = node.getRange().getStart();
-+            final int end = Math.min(node.getRange().getEnd(), buffer.length());
-+            builder.append(buffer.substring(pos, start), AttributedStyle.DEFAULT);
-+            if (node.getNode() instanceof LiteralCommandNode) {
-+                builder.append(buffer.substring(start, end), AttributedStyle.DEFAULT);
-+            } else {
-+                if (++component >= COLORS.length) {
-+                    component = 0;
-+                }
-+                builder.append(buffer.substring(start, end), AttributedStyle.DEFAULT.foreground(COLORS[component]));
-+            }
-+            pos = end;
-+        }
-+        if (pos < buffer.length()) {
-+            builder.append((buffer.substring(pos)), AttributedStyle.DEFAULT.foreground(AttributedStyle.RED));
-+        }
-+        return builder.toAttributedString();
-+    }
-+
-+    @Override
-+    public void setErrorPattern(final Pattern errorPattern) {}
-+
-+    @Override
-+    public void setErrorIndex(final int errorIndex) {}
-+}
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
- 
-         thread.setDaemon(true);
-         thread.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(DedicatedServer.LOGGER));
-        thread.start();
-+        // thread.start(); // Paper - moved down
-         DedicatedServer.LOGGER.info("Starting minecraft server version {}", SharedConstants.getCurrentVersion().getName());
-         if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
-             DedicatedServer.LOGGER.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
-@@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         this.getPlayerList().loadAndSaveFiles(); // Must be after convertNames
-         // Paper end - moved up
-         org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash);
-+        thread.start(); // Paper - start console thread after MinecraftServer.console & PaperConfig are initialized
-         io.papermc.paper.command.PaperCommands.registerCommands(this);
-         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
-         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
-diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-+++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-@@ -0,0 +0,0 @@ import org.bukkit.event.server.TabCompleteEvent;
- 
- public class ConsoleCommandCompleter implements Completer {
-     private final DedicatedServer server; // Paper - CraftServer -> DedicatedServer
-+    private final io.papermc.paper.console.BrigadierCommandCompleter brigadierCompleter; // Paper
- 
-     public ConsoleCommandCompleter(DedicatedServer server) { // Paper - CraftServer -> DedicatedServer
-         this.server = server;
-+        this.brigadierCompleter = new io.papermc.paper.console.BrigadierCommandCompleter(this.server, this.server.createCommandSourceStack()); // Paper
-     }
- 
-     // Paper start - Change method signature for JLine update
-@@ -0,0 +0,0 @@ public class ConsoleCommandCompleter implements Completer {
-                 }
-             }
- 
-            if (!completions.isEmpty()) {
-+            if (false && !completions.isEmpty()) {
-                 for (final com.destroystokyo.paper.event.server.AsyncTabCompleteEvent.Completion completion : completions) {
-                     if (completion.suggestion().isEmpty()) {
-                         continue;
-@@ -0,0 +0,0 @@ public class ConsoleCommandCompleter implements Completer {
-                     ));
-                 }
-             }
-+            this.addCompletions(reader, line, candidates, completions);
-             return;
-         }
- 
-@@ -0,0 +0,0 @@ public class ConsoleCommandCompleter implements Completer {
-         try {
-             List<String> offers = waitable.get();
-             if (offers == null) {
-+                this.addCompletions(reader, line, candidates, Collections.emptyList()); // Paper
-                 return; // Paper - Method returns void
-             }
- 
-             // Paper start - JLine update
-+            /*
-             for (String completion : offers) {
-                 if (completion.isEmpty()) {
-                     continue;
-@@ -0,0 +0,0 @@ public class ConsoleCommandCompleter implements Completer {
- 
-                 candidates.add(new Candidate(completion));
-             }
-+             */
-+            this.addCompletions(reader, line, candidates, offers.stream().map(com.destroystokyo.paper.event.server.AsyncTabCompleteEvent.Completion::completion).collect(java.util.stream.Collectors.toList()));
-             // Paper end
- 
-             // Paper start - JLine handles cursor now
-@@ -0,0 +0,0 @@ public class ConsoleCommandCompleter implements Completer {
-         }
-         return false;
-     }
-+
-+    private void addCompletions(final LineReader reader, final ParsedLine line, final List<Candidate> candidates, final List<com.destroystokyo.paper.event.server.AsyncTabCompleteEvent.Completion> existing) {
-+        this.brigadierCompleter.complete(reader, line, candidates, existing);
-+    }
-     // Paper end
- }
--- a/patches/unapplied/server/Entity-load-save-limit-per-chunk.patch
+++ b/patches/unapplied/server/Entity-load-save-limit-per-chunk.patch
@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Wed, 18 Nov 2020 20:52:25 -0800
-Subject: [PATCH] Entity load/save limit per chunk
-
-Adds a config option to limit the number of entities saved and loaded
-to a chunk. The default values of -1 disable the limit. Although
-defaults are only included for certain entites, this allows setting
-limits for any entity type.
-
-diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java
-+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -0,0 +0,0 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
-         final Spliterator<? extends Tag> spliterator = entityNbtList.spliterator();
- 
-         return StreamSupport.stream(new Spliterator<Entity>() {
-+            final java.util.Map<EntityType<?>, Integer> loadedEntityCounts = new java.util.HashMap<>(); // Paper
-             public boolean tryAdvance(Consumer<? super Entity> consumer) {
-                 return spliterator.tryAdvance((nbtbase) -> {
-                     EntityType.loadEntityRecursive((CompoundTag) nbtbase, world, (entity) -> {
-+                        // Paper start
-+                        final EntityType<?> entityType = entity.getType();
-+                        final int saveLimit = world.paperConfig().chunks.entityPerChunkSaveLimit.getOrDefault(entityType, -1);
-+                        if (saveLimit > -1) {
-+                            if (this.loadedEntityCounts.getOrDefault(entityType, 0) >= saveLimit) {
-+                                return null;
-+                            }
-+                            this.loadedEntityCounts.merge(entityType, 1, Integer::sum);
-+                        }
-+                        // Paper end
-                         consumer.accept(entity);
-                         return entity;
-                     });
-diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-@@ -0,0 +0,0 @@ public class EntityStorage implements EntityPersistentStorage<Entity> {
- 
-         } else {
-             ListTag listTag = new ListTag();
-+            final java.util.Map<net.minecraft.world.entity.EntityType<?>, Integer> savedEntityCounts = new java.util.HashMap<>(); // Paper
-             dataList.getEntities().forEach((entity) -> {
-+                // Paper start
-+                final EntityType<?> entityType = entity.getType();
-+                final int saveLimit = this.level.paperConfig().chunks.entityPerChunkSaveLimit.getOrDefault(entityType, -1);
-+                if (saveLimit > -1) {
-+                    if (savedEntityCounts.getOrDefault(entityType, 0) >= saveLimit) {
-+                        return;
-+                    }
-+                    savedEntityCounts.merge(entityType, 1, Integer::sum);
-+                }
-+                // Paper end
-                 CompoundTag compoundTag = new CompoundTag();
-                 if (entity.save(compoundTag)) {
-                     listTag.add(compoundTag);
--- a/patches/unapplied/server/EntityMoveEvent.patch
+++ b/patches/unapplied/server/EntityMoveEvent.patch
@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Tue, 11 Feb 2020 21:56:48 -0600
-Subject: [PATCH] EntityMoveEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         while (iterator.hasNext()) {
-             ServerLevel worldserver = (ServerLevel) iterator.next();
-             worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
-+            worldserver.hasEntityMoveEvent =  io.papermc.paper.event.entity.EntityMoveEvent.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
- 
-             this.profiler.push(() -> {
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel {
-     public final LevelStorageSource.LevelStorageAccess convertable;
-     public final UUID uuid;
-     public boolean hasPhysicsEvent = true; // Paper
-+    public boolean hasEntityMoveEvent = false; // Paper
-     public static Throwable getAddToWorldStackTrace(Entity entity) {
-         return new Throwable(entity + " Added to world at " + new java.util.Date());
-     }
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity {
- 
-         this.pushEntities();
-         this.level.getProfiler().pop();
-+        // Paper start
-+        if (((ServerLevel) this.level).hasEntityMoveEvent && !(this instanceof net.minecraft.world.entity.player.Player)) {
-+            if (this.xo != getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
-+                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());
-+                if (!event.callEvent()) {
-+                    absMoveTo(from.getX(), from.getY(), from.getZ(), from.getYaw(), from.getPitch());
-+                } else if (!to.equals(event.getTo())) {
-+                    absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
-+                }
-+            }
-+        }
-+        // Paper end
-         if (!this.level.isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
-             this.hurt(DamageSource.DROWN, 1.0F);
-         }
--- a/patches/unapplied/server/Expand-world-key-API.patch
+++ b/patches/unapplied/server/Expand-world-key-API.patch
@@ -1,84 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 6 Jan 2021 00:34:04 -0800
-Subject: [PATCH] Expand world key API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -0,0 +0,0 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
-     public io.papermc.paper.world.MoonPhase getMoonPhase() {
-         return io.papermc.paper.world.MoonPhase.getPhase(this.getHandle().dayTime() / 24000L);
-     }
-+
-+    @Override
-+    public org.bukkit.NamespacedKey getKey() {
-+        return org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(this.getHandle().getLevel().dimension().location());
-+    }
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-         File folder = new File(this.getWorldContainer(), name);
-         World world = this.getWorld(name);
- 
-        if (world != null) {
-            return world;
-+        // Paper start
-+        World worldByKey = this.getWorld(creator.key());
-+        if (world != null || worldByKey != null) {
-+            if (world == worldByKey) {
-+                return world;
-+            }
-+            throw new IllegalArgumentException("Cannot create a world with key " + creator.key() + " and name " + name + " one (or both) already match a world that exists");
-         }
-+        // Paper end
- 
-         if ((folder.exists()) && (!folder.isDirectory())) {
-             throw new IllegalArgumentException("File exists with the name '" + name + "' and isn't a folder");
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-         } else if (name.equals(levelName + "_the_end")) {
-             worldKey = net.minecraft.world.level.Level.END;
-         } else {
-            worldKey = ResourceKey.create(net.minecraft.core.Registry.DIMENSION_REGISTRY, new ResourceLocation(name.toLowerCase(java.util.Locale.ENGLISH)));
-+            worldKey = ResourceKey.create(net.minecraft.core.Registry.DIMENSION_REGISTRY, new net.minecraft.resources.ResourceLocation(creator.key().getNamespace().toLowerCase(java.util.Locale.ENGLISH), creator.key().getKey().toLowerCase(java.util.Locale.ENGLISH))); // Paper
-         }
- 
-         ServerLevel internal = (ServerLevel) new ServerLevel(this.console, console.executor, worldSession, worlddata, worldKey, worlddimension, this.getServer().progressListenerFactory.create(11),
-@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
-         return null;
-     }
- 
-+    // Paper start
-+    @Override
-+    public World getWorld(NamespacedKey worldKey) {
-+        ServerLevel worldServer = console.getLevel(ResourceKey.create(net.minecraft.core.Registry.DIMENSION_REGISTRY, CraftNamespacedKey.toMinecraft(worldKey)));
-+        if (worldServer == null) return null;
-+        return worldServer.getWorld();
-+    }
-+    // Paper end
-+
-     public void addWorld(World world) {
-         // Check if a World already exists with the UID.
-         if (this.getWorld(world.getUID()) != null) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     public <T extends org.bukkit.Keyed> Registry<T> registryFor(Class<T> classOfT) {
-         return io.papermc.paper.registry.PaperRegistry.getRegistry(classOfT);
-     }
-+
-+    @Override
-+    public String getMainLevelName() {
-+        return ((net.minecraft.server.dedicated.DedicatedServer) net.minecraft.server.MinecraftServer.getServer()).getProperties().levelName;
-+    }
-     // Paper end
- 
-     /**
--- a/patches/unapplied/server/Expose-LivingEntity-hurt-direction.patch
+++ b/patches/unapplied/server/Expose-LivingEntity-hurt-direction.patch
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
-Date: Sun, 13 Dec 2020 05:32:05 +0200
-Subject: [PATCH] Expose LivingEntity hurt direction
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     public void playPickupItemAnimation(org.bukkit.entity.Item item, int quantity) {
-         getHandle().take(((CraftItem) item).getHandle(), quantity);
-     }
-+
-+    @Override
-+    public float getHurtDirection() {
-+        return getHandle().hurtDir;
-+    }
-+
-+    @Override
-+    public void setHurtDirection(float hurtDirection) {
-+        getHandle().hurtDir = hurtDirection;
-+    }
-     // Paper end
- }
--- a/patches/unapplied/server/Expose-Tracked-Players.patch
+++ b/patches/unapplied/server/Expose-Tracked-Players.patch
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tom <cryptite@gmail.com>
-Date: Fri, 26 Feb 2021 16:24:25 -0600
-Subject: [PATCH] Expose Tracked Players
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-     public boolean isTicking() {
-         return getHandle().isTicking();
-     }
-+
-+    @Override
-+    public Set<org.bukkit.entity.Player> getTrackedPlayers() {
-+        if (this.entity.tracker == null) {
-+            return java.util.Collections.emptySet();
-+        }
-+
-+        Set<org.bukkit.entity.Player> set = new java.util.HashSet<>(this.entity.tracker.seenBy.size());
-+        for (net.minecraft.server.network.ServerPlayerConnection connection : this.entity.tracker.seenBy) {
-+            set.add(connection.getPlayer().getBukkitEntity().getPlayer());
-+        }
-+        return set;
-+    }
-     // Paper end
- }
--- a/patches/unapplied/server/Expose-protocol-version.patch
+++ b/patches/unapplied/server/Expose-protocol-version.patch
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <nassim@njahnke.dev>
-Date: Fri, 26 Mar 2021 11:23:17 +0100
-Subject: [PATCH] Expose protocol version
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     public io.papermc.paper.inventory.ItemRarity getItemStackRarity(org.bukkit.inventory.ItemStack itemStack) {
-         return io.papermc.paper.inventory.ItemRarity.values()[getItem(itemStack.getType()).getRarity(CraftItemStack.asNMSCopy(itemStack)).ordinal()];
-     }
-+
-+    @Override
-+    public int getProtocolVersion() {
-+        return net.minecraft.SharedConstants.getCurrentVersion().getProtocolVersion();
-+    }
-     // Paper end
- 
-     /**
--- a/patches/unapplied/server/Fix-CraftPotionBrewer-cache.patch
+++ b/patches/unapplied/server/Fix-CraftPotionBrewer-cache.patch
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sceri <scerimail@gmail.com>
-Date: Fri, 14 May 2021 19:06:51 +0500
-Subject: [PATCH] Fix CraftPotionBrewer cache
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java
-@@ -0,0 +0,0 @@ import org.bukkit.potion.PotionEffectType;
- import org.bukkit.potion.PotionType;
- 
- public class CraftPotionBrewer implements PotionBrewer {
-    private static final Map<PotionType, Collection<PotionEffect>> cache = Maps.newHashMap();
-+    private static final Map<Integer, Collection<PotionEffect>> cache = Maps.newHashMap(); // Paper
- 
-     @Override
-     public Collection<PotionEffect> getEffects(PotionType damage, boolean upgraded, boolean extended) {
-        if (CraftPotionBrewer.cache.containsKey(damage))
-            return CraftPotionBrewer.cache.get(damage);
-+        // Paper start
-+        int key = damage.ordinal() << 2;
-+        key |= (upgraded ? 1 : 0) << 1;
-+        key |= extended ? 1 : 0;
-+
-+        if (CraftPotionBrewer.cache.containsKey(key))
-+            return CraftPotionBrewer.cache.get(key);
-+        // Paper end
- 
-         List<MobEffectInstance> mcEffects = Potion.byName(CraftPotionUtil.fromBukkit(new PotionData(damage, extended, upgraded))).getEffects();
- 
-@@ -0,0 +0,0 @@ public class CraftPotionBrewer implements PotionBrewer {
-             builder.add(CraftPotionUtil.toBukkit(effect));
-         }
- 
-        CraftPotionBrewer.cache.put(damage, builder.build());
-+        CraftPotionBrewer.cache.put(key, builder.build()); // Paper
- 
-        return CraftPotionBrewer.cache.get(damage);
-+        return CraftPotionBrewer.cache.get(key); // Paper
-     }
- 
-     @Override
--- a/patches/unapplied/server/Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/unapplied/server/Fix-CraftSound-backwards-compatibility.patch
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Thu, 17 Dec 2020 15:25:49 -0600
-Subject: [PATCH] Fix CraftSound backwards compatibility
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-@@ -0,0 +0,0 @@ public class CraftSound {
-     public static Sound getBukkit(SoundEvent soundEffect) {
-         return Registry.SOUNDS.get(CraftNamespacedKey.fromMinecraft(net.minecraft.core.Registry.SOUND_EVENT.getKey(soundEffect)));
-     }
-+
-+    // Paper start
-+    public static String getSound(Sound sound) {
-+        return sound.getKey().getKey();
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/unapplied/server/Fix-Not-a-string-Map-Conversion-spam.patch
@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 8 Oct 2020 00:00:25 -0400
-Subject: [PATCH] Fix "Not a string" Map Conversion spam
-
-The maps did convert successfully, but had noisy logs due to Spigot
-implementing this logic incorrectly.
-
-This stops the spam by converting the old format to new before
-requesting the world.
-
-Track spigot issue to see when fixed: https://hub.spigotmc.org/jira/browse/SPIGOT-6181
-
-diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-+++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-@@ -0,0 +0,0 @@ import net.minecraft.core.BlockPos;
- import net.minecraft.nbt.CompoundTag;
- import net.minecraft.nbt.ListTag;
- import net.minecraft.nbt.NbtOps;
-+import net.minecraft.nbt.NumericTag;
-+import net.minecraft.nbt.StringTag;
- import net.minecraft.nbt.Tag;
- import net.minecraft.network.chat.Component;
- import net.minecraft.network.protocol.Packet;
-@@ -0,0 +0,0 @@ public class MapItemSavedData extends SavedData {
-     }
- 
-     public static MapItemSavedData load(CompoundTag nbt) {
-        DataResult<ResourceKey<Level>> dataresult = DimensionType.parseLegacy(new Dynamic(NbtOps.INSTANCE, nbt.get("dimension"))); // CraftBukkit - decompile error
-+        // Paper start - fix "Not a string" spam
-+        Tag dimension = nbt.get("dimension");
-+        if (dimension instanceof NumericTag && ((NumericTag) dimension).getAsInt() >= CraftWorld.CUSTOM_DIMENSION_OFFSET) {
-+            long least = nbt.getLong("UUIDLeast");
-+            long most = nbt.getLong("UUIDMost");
-+
-+            if (least != 0L && most != 0L) {
-+                UUID uuid = new UUID(most, least);
-+                CraftWorld world = (CraftWorld) Bukkit.getWorld(uuid);
-+                if (world != null) {
-+                    dimension = StringTag.valueOf("minecraft:" + world.getName().toLowerCase(java.util.Locale.ENGLISH));
-+                } else {
-+                    dimension = StringTag.valueOf("bukkit:_invalidworld_");
-+                }
-+            } else {
-+                dimension = StringTag.valueOf("bukkit:_invalidworld_");
-+            }
-+        }
-+        DataResult<ResourceKey<Level>> dataresult = DimensionType.parseLegacy(new Dynamic(NbtOps.INSTANCE, dimension)); // CraftBukkit - decompile error
-+        // Paper end - fix "Not a string" spam
-         Logger logger = MapItemSavedData.LOGGER;
- 
-         Objects.requireNonNull(logger);
--- a/patches/unapplied/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/unapplied/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: chickeneer <emcchickeneer@gmail.com>
-Date: Fri, 19 Mar 2021 00:33:15 -0500
-Subject: [PATCH] Fix PlayerItemConsumeEvent cancelling properly
-
-When the active item is not cleared, the item is still readied
-for use and will repeatedly trigger the PlayerItemConsumeEvent
-till their item is switched.
-This patch clears the active item when the event is cancelled
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity {
-                         level.getCraftServer().getPluginManager().callEvent(event);
- 
-                         if (event.isCancelled()) {
-+                        this.stopUsingItem(); // Paper - event is using an item, clear active item to reset its use
-                             // Update client
-                             ((ServerPlayer) this).getBukkitEntity().updateInventory();
-                             ((ServerPlayer) this).getBukkitEntity().updateScaledHealth();
--- a/patches/unapplied/server/Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/unapplied/server/Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: HexedHero <6012891+HexedHero@users.noreply.github.com>
-Date: Fri, 23 Apr 2021 22:42:42 +0100
-Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end
- portal
-
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
- 
-         // Paper start
-         boolean isBedSpawn = false;
-+        boolean isAnchorSpawn = false;
-         boolean isRespawn = false;
-         boolean isLocAltered = false; // Paper - Fix SPIGOT-5989
-         // Paper end
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
-                 if (optional.isPresent()) {
-                     BlockState iblockdata = worldserver1.getBlockState(blockposition);
-                     boolean flag3 = iblockdata.is(Blocks.RESPAWN_ANCHOR);
-+                    isAnchorSpawn = flag3; // Paper - Fix anchor respawn acting as a bed respawn from the end portal
-                     Vec3 vec3d = (Vec3) optional.get();
-                     float f1;
- 
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
-             }
- 
-             Player respawnPlayer = entityplayer1.getBukkitEntity();
-            PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !flag2, flag2);
-+            PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !isAnchorSpawn, isAnchorSpawn); // Paper - Fix anchor respawn acting as a bed respawn from the end portal
-             this.cserver.getPluginManager().callEvent(respawnEvent);
-             // Spigot Start
-             if (entityplayer.connection.isDisconnected()) {
--- a/patches/unapplied/server/Fix-checkReach-check-for-Shulker-boxes.patch
+++ b/patches/unapplied/server/Fix-checkReach-check-for-Shulker-boxes.patch
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Sun, 4 Apr 2021 14:25:04 -0400
-Subject: [PATCH] Fix checkReach check for Shulker boxes
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/ShulkerBoxMenu.java b/src/main/java/net/minecraft/world/inventory/ShulkerBoxMenu.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/ShulkerBoxMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/ShulkerBoxMenu.java
-@@ -0,0 +0,0 @@ public class ShulkerBoxMenu extends AbstractContainerMenu {
- 
-     @Override
-     public boolean stillValid(Player player) {
-+        if (!this.checkReachable) return true; // Paper - Add reachable override for ContainerShulkerBox
-         return this.container.stillValid(player);
-     }
- 
--- a/patches/unapplied/server/Fix-harming-potion-dupe.patch
+++ b/patches/unapplied/server/Fix-harming-potion-dupe.patch
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>
-Date: Thu, 23 Jul 2020 14:25:07 -0700
-Subject: [PATCH] Fix harming potion dupe
-
-EntityLiving#applyInstantEffect() immediately kills the player and drops their inventory.
-Before this patch, instant effects would be applied before the potion ItemStack is removed and replaced with a glass bottle. This caused the potion ItemStack to be dropped before it was supposed to be removed from the inventory. It also caused the glass bottle to be put into a dead player's inventory.
-This patch makes it so that instant effects are applied after the potion ItemStack is removed, and the glass bottle is only put into the player's inventory if the player is not dead. Otherwise, the glass bottle is dropped on the ground.
-
-diff --git a/src/main/java/net/minecraft/world/item/PotionItem.java b/src/main/java/net/minecraft/world/item/PotionItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/PotionItem.java
-+++ b/src/main/java/net/minecraft/world/item/PotionItem.java
-@@ -0,0 +0,0 @@ public class PotionItem extends Item {
-             CriteriaTriggers.CONSUME_ITEM.trigger((ServerPlayer) entityhuman, stack);
-         }
- 
-+        List<MobEffectInstance> instantLater = new java.util.ArrayList<>(); // Paper - Fix harming potion dupe
-         if (!world.isClientSide) {
-             List<MobEffectInstance> list = PotionUtils.getMobEffects(stack);
-             Iterator iterator = list.iterator();
-@@ -0,0 +0,0 @@ public class PotionItem extends Item {
-                 MobEffectInstance mobeffect = (MobEffectInstance) iterator.next();
- 
-                 if (mobeffect.getEffect().isInstantenous()) {
-                    mobeffect.getEffect().applyInstantenousEffect(entityhuman, entityhuman, user, mobeffect.getAmplifier(), 1.0D);
-+                    instantLater.add(mobeffect); // Paper - Fix harming potion dupe
-                 } else {
-                     user.addEffect(new MobEffectInstance(mobeffect), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.POTION_DRINK); // CraftBukkit
-                 }
-@@ -0,0 +0,0 @@ public class PotionItem extends Item {
-             }
-         }
- 
-+        // Paper start - Fix harming potion dupe
-+        for (MobEffectInstance mobeffect : instantLater) {
-+            mobeffect.getEffect().applyInstantenousEffect(entityhuman, entityhuman, user, mobeffect.getAmplifier(), 1.0D);
-+        }
-+        // Paper end
-         if (entityhuman == null || !entityhuman.getAbilities().instabuild) {
-+            // Paper start - Fix harming potion dupe
-+            if (user.getHealth() <= 0 && !user.level.getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_KEEPINVENTORY)) {
-+                user.spawnAtLocation(new ItemStack(Items.GLASS_BOTTLE), 0);
-+                return ItemStack.EMPTY;
-+            }
-+            // Paper end
-             if (stack.isEmpty()) {
-                 return new ItemStack(Items.GLASS_BOTTLE);
-             }
--- a/patches/unapplied/server/Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/unapplied/server/Fix-interact-event-not-being-called-in-adventure.patch
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: TheMolkaPL <themolkapl@gmail.com>
-Date: Sun, 21 Jun 2020 17:21:46 +0200
-Subject: [PATCH] Fix interact event not being called in adventure
-
-Call PlayerInteractEvent when left-clicking on a block in adventure mode
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
-                             MutableComponent ichatmutablecomponent = Component.translatable("build.tooHigh", i - 1).withStyle(ChatFormatting.RED);
- 
-                             this.player.sendSystemMessage(ichatmutablecomponent, ChatType.GAME_INFO);
-                        } else if (enuminteractionresult.shouldSwing()) {
-+                        } else if (enuminteractionresult.shouldSwing() && !this.player.gameMode.interactResult) { // Paper
-                             this.player.swing(enumhand, true);
-                         }
-                     }
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
-         Vec3 vec3d1 = vec3d.add((double) f7 * d3, (double) f6 * d3, (double) f8 * d3);
-         HitResult movingobjectposition = this.player.level.clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, this.player));
- 
-        if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK) {
-+        if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK || this.player.gameMode.getGameModeForPlayer() == GameType.ADVENTURE) { // Paper - call PlayerInteractEvent when left-clicking on a block in adventure mode
-             CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_AIR, this.player.getInventory().getSelected(), InteractionHand.MAIN_HAND);
-         }
- 
--- a/patches/unapplied/server/Fix-nerfed-slime-when-splitting.patch
+++ b/patches/unapplied/server/Fix-nerfed-slime-when-splitting.patch
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 24 Aug 2020 08:39:06 -0700
-Subject: [PATCH] Fix nerfed slime when splitting
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-@@ -0,0 +0,0 @@ public class Slime extends Mob implements Enemy {
-                     entityslime.setPersistenceRequired();
-                 }
- 
-+                entityslime.aware = this.aware; // Paper
-                 entityslime.setCustomName(ichatbasecomponent);
-                 entityslime.setNoAi(flag);
-                 entityslime.setInvulnerable(this.isInvulnerable());
--- a/patches/unapplied/server/Fix-villager-boat-exploit.patch
+++ b/patches/unapplied/server/Fix-villager-boat-exploit.patch
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Mon, 11 Jan 2021 12:43:51 -0800
-Subject: [PATCH] Fix villager boat exploit
-
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
-                 PlayerList.LOGGER.debug("Removing player mount");
-                 entityplayer.stopRiding();
-                 entity.getPassengersAndSelf().forEach((entity1) -> {
-+                    // Paper start
-+                    if (entity1 instanceof net.minecraft.world.entity.npc.AbstractVillager villager) {
-+                        final net.minecraft.world.entity.player.Player human = villager.getTradingPlayer();
-+                        if (human != null) {
-+                            villager.setTradingPlayer(null);
-+                        }
-+                    }
-+                    // Paper end
-                     entity1.setRemoved(Entity.RemovalReason.UNLOADED_WITH_PLAYER);
-                 });
-             }
--- a/patches/unapplied/server/Guardian-beam-workaround.patch
+++ b/patches/unapplied/server/Guardian-beam-workaround.patch
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Gabscap <git@gabscap.de>
-Date: Sat, 19 Mar 2016 22:25:11 +0100
-Subject: [PATCH] Guardian beam workaround
-
-This patch is a workaround for MC-165595
-
-diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
-@@ -0,0 +0,0 @@ public class ClientboundSetTimePacket implements Packet<ClientGamePacketListener
-     private final long dayTime;
- 
-     public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
-        this.gameTime = time;
-+        this.gameTime = time % 192000; // Paper - fix guardian beam
-         long l = timeOfDay;
-         if (!doDaylightCycle) {
-             l = -timeOfDay;
--- a/patches/unapplied/server/Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/unapplied/server/Implement-API-to-expose-exact-interaction-point.patch
@@ -1,59 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Madeline Miller <mnmiller1@me.com>
-Date: Mon, 4 Jan 2021 16:40:27 +1000
-Subject: [PATCH] Implement API to expose exact interaction point
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -0,0 +0,0 @@ public class ServerPlayerGameMode {
-             cancelledBlock = true;
-         }
- 
-        PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, hand);
-+        PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, hand, hitResult.getLocation()); // Paper
-         this.firedInteract = true;
-         this.interactResult = event.useItemInHand() == Event.Result.DENY;
-         this.interactPosition = blockposition.immutable();
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -0,0 +0,0 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
- import net.minecraft.world.phys.BlockHitResult;
- import net.minecraft.world.phys.EntityHitResult;
- import net.minecraft.world.phys.HitResult;
-+import net.minecraft.world.phys.Vec3;
- import org.bukkit.Bukkit;
-+import org.bukkit.Location; // Paper
- import org.bukkit.Material;
- import org.bukkit.NamespacedKey;
- import org.bukkit.Server;
-@@ -0,0 +0,0 @@ public class CraftEventFactory {
-         return CraftEventFactory.callPlayerInteractEvent(who, action, position, direction, itemstack, false, hand);
-     }
- 
-+    // Paper start - Add interactionPoint
-     public static PlayerInteractEvent callPlayerInteractEvent(net.minecraft.world.entity.player.Player who, Action action, BlockPos position, Direction direction, ItemStack itemstack, boolean cancelledBlock, InteractionHand hand) {
-+        return callPlayerInteractEvent(who, action, position, direction, itemstack, cancelledBlock, hand, null);
-+    }
-+
-+    public static PlayerInteractEvent callPlayerInteractEvent(net.minecraft.world.entity.player.Player who, Action action, BlockPos position, Direction direction, ItemStack itemstack, boolean cancelledBlock, InteractionHand hand, Vec3 hitVec) {
-+        // Paper end
-         Player player = (who == null) ? null : (Player) who.getBukkitEntity();
-         CraftItemStack itemInHand = CraftItemStack.asCraftMirror(itemstack);
- 
-@@ -0,0 +0,0 @@ public class CraftEventFactory {
-             itemInHand = null;
-         }
- 
-        PlayerInteractEvent event = new PlayerInteractEvent(player, action, itemInHand, blockClicked, blockFace, (hand == null) ? null : ((hand == InteractionHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND));
-+        // Paper start
-+        Location interactionPoint =  hitVec == null ? null : new Location(craftWorld, hitVec.x, hitVec.y, hitVec.z);
-+        PlayerInteractEvent event = new PlayerInteractEvent(player, action, itemInHand, blockClicked, blockFace, (hand == null) ? null : ((hand == InteractionHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND), interactionPoint);
-+        // Paper end
-         if (cancelledBlock) {
-             event.setUseInteractedBlock(Event.Result.DENY);
-         }
--- a/patches/unapplied/server/Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/unapplied/server/Implement-API-to-get-Material-from-Boats-and-Minecar.patch
@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Madeline Miller <mnmiller1@me.com>
-Date: Thu, 31 Dec 2020 12:48:19 +1000
-Subject: [PATCH] Implement API to get Material from Boats and Minecarts
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
-@@ -0,0 +0,0 @@ public class CraftBoat extends CraftVehicle implements Boat {
-         this.getHandle().landBoats = workOnLand;
-     }
- 
-+    // Paper start
-+    @Override
-+    public org.bukkit.Material getBoatMaterial() {
-+        return this.getBoatType().getMaterial();
-+    }
-+    // Paper end
-+
-     @Override
-     public Status getStatus() {
-         return CraftBoat.boatStatusFromNms(this.getHandle().status);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
-@@ -0,0 +0,0 @@
- package org.bukkit.craftbukkit.entity;
- 
- import net.minecraft.world.entity.vehicle.AbstractMinecart;
-+import net.minecraft.world.item.Items; // Paper
- import net.minecraft.world.level.block.Blocks;
- import net.minecraft.world.level.block.state.BlockState;
-+import org.bukkit.Material; // Paper
- import org.bukkit.block.data.BlockData;
- import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.craftbukkit.block.data.CraftBlockData;
-@@ -0,0 +0,0 @@ public abstract class CraftMinecart extends CraftVehicle implements Minecart {
-         this.getHandle().setDerailedVelocityMod(derailed);
-     }
- 
-+    // Paper start
-+    @Override
-+    public Material getMinecartMaterial() {
-+         net.minecraft.world.item.Item minecartItem = switch (getHandle().getMinecartType()) {
-+            case CHEST -> Items.CHEST_MINECART;
-+            case FURNACE ->  Items.FURNACE_MINECART;
-+            case TNT ->  Items.TNT_MINECART;
-+            case HOPPER ->  Items.HOPPER_MINECART;
-+            case COMMAND_BLOCK ->  Items.COMMAND_BLOCK_MINECART;
-+            case RIDEABLE, SPAWNER ->  Items.MINECART;
-+        };
-+
-+        return CraftMagicNumbers.getMaterial(minecartItem);
-+    }
-+    // Paper end
-+
-     @Override
-     public AbstractMinecart getHandle() {
-         return (AbstractMinecart) entity;
--- a/patches/unapplied/server/Implement-BlockPreDispenseEvent.patch
+++ b/patches/unapplied/server/Implement-BlockPreDispenseEvent.patch
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Madeline Miller <mnmiller1@me.com>
-Date: Sun, 17 Jan 2021 13:16:09 +1000
-Subject: [PATCH] Implement BlockPreDispenseEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-@@ -0,0 +0,0 @@ public class DispenserBlock extends BaseEntityBlock {
-             DispenseItemBehavior idispensebehavior = this.getDispenseMethod(itemstack);
- 
-             if (idispensebehavior != DispenseItemBehavior.NOOP) {
-+                if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockPreDispenseEvent(world, pos, itemstack, i)) return; // Paper - BlockPreDispenseEvent is called here
-                 DispenserBlock.eventFired = false; // CraftBukkit - reset event status
-                 tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack));
-             }
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -0,0 +0,0 @@ public class CraftEventFactory {
-         io.papermc.paper.event.block.BlockFailedDispenseEvent event = new io.papermc.paper.event.block.BlockFailedDispenseEvent(block);
-         return event.callEvent();
-     }
-+
-+    public static boolean handleBlockPreDispenseEvent(ServerLevel serverLevel, BlockPos pos, ItemStack itemStack, int slot) {
-+        org.bukkit.block.Block block = serverLevel.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
-+        io.papermc.paper.event.block.BlockPreDispenseEvent event = new io.papermc.paper.event.block.BlockPreDispenseEvent(block, org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), slot);
-+        return event.callEvent();
-+    }
-     // Paper end
- }
--- a/patches/unapplied/server/Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/unapplied/server/Implement-PlayerFlowerPotManipulateEvent.patch
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MisterVector <whizkid3000@hotmail.com>
-Date: Tue, 13 Aug 2019 19:45:06 -0700
-Subject: [PATCH] Implement PlayerFlowerPotManipulateEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java b/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java
-@@ -0,0 +0,0 @@ public class FlowerPotBlock extends Block {
-         boolean bl = blockState.is(Blocks.AIR);
-         boolean bl2 = this.isEmpty();
-         if (bl != bl2) {
-+            // Paper start
-+            org.bukkit.entity.Player player1 = (org.bukkit.entity.Player) player.getBukkitEntity();
-+            boolean placing = bl2;
-+            org.bukkit.block.Block bukkitblock = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
-+            org.bukkit.inventory.ItemStack bukkititemstack = org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(itemStack);
-+            org.bukkit.Material mat = org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(content);
-+            org.bukkit.inventory.ItemStack bukkititemstack1 = new org.bukkit.inventory.ItemStack(mat, 1);
-+            org.bukkit.inventory.ItemStack whichitem = placing ? bukkititemstack : bukkititemstack1;
-+
-+            io.papermc.paper.event.player.PlayerFlowerPotManipulateEvent event = new io.papermc.paper.event.player.PlayerFlowerPotManipulateEvent(player1, bukkitblock, whichitem, placing);
-+            player1.getServer().getPluginManager().callEvent(event);
-+
-+            if (event.isCancelled()) {
-+                // Update client
-+                player1.sendBlockChange(bukkitblock.getLocation(), bukkitblock.getBlockData());
-+                player1.updateInventory();
-+
-+                return InteractionResult.PASS;
-+            }
-+            // Paper end
-             if (bl2) {
-                 world.setBlock(pos, blockState, 3);
-                 player.awardStat(Stats.POT_FLOWER);
--- a/patches/unapplied/server/Implement-TargetHitEvent.patch
+++ b/patches/unapplied/server/Implement-TargetHitEvent.patch
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Wed, 25 Nov 2020 23:20:44 -0800
-Subject: [PATCH] Implement TargetHitEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/TargetBlock.java b/src/main/java/net/minecraft/world/level/block/TargetBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/TargetBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/TargetBlock.java
-@@ -0,0 +0,0 @@ public class TargetBlock extends Block {
-     @Override
-     public void onProjectileHit(Level world, BlockState state, BlockHitResult hit, Projectile projectile) {
-         int i = updateRedstoneOutput(world, state, hit, projectile);
-+        // Paper start
-+    }
-+    private static void awardTargetHitCriteria(Projectile projectile, BlockHitResult hit, int i) {
-+        // Paper end
-         Entity entity = projectile.getOwner();
-         if (entity instanceof ServerPlayer serverPlayer) {
-             serverPlayer.awardStat(Stats.TARGET_HIT);
-@@ -0,0 +0,0 @@ public class TargetBlock extends Block {
-     private static int updateRedstoneOutput(LevelAccessor world, BlockState state, BlockHitResult hitResult, Entity entity) {
-         int i = getRedstoneStrength(hitResult, hitResult.getLocation());
-         int j = entity instanceof AbstractArrow ? 20 : 8;
-+        // Paper start
-+        if (entity instanceof Projectile) {
-+            final Projectile projectile = (Projectile) entity;
-+            final org.bukkit.craftbukkit.block.CraftBlock craftBlock = org.bukkit.craftbukkit.block.CraftBlock.at(world, hitResult.getBlockPos());
-+            final org.bukkit.block.BlockFace blockFace = org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(hitResult.getDirection());
-+            final io.papermc.paper.event.block.TargetHitEvent targetHitEvent = new io.papermc.paper.event.block.TargetHitEvent((org.bukkit.entity.Projectile) projectile.getBukkitEntity(), craftBlock, blockFace, i);
-+            if (targetHitEvent.callEvent()) {
-+                i = targetHitEvent.getSignalStrength();
-+                awardTargetHitCriteria(projectile, hitResult, i);
-+            } else {
-+                return i;
-+            }
-+        }
-+        // Paper end
-         if (!world.getBlockTicks().hasScheduledTick(hitResult.getBlockPos(), state.getBlock())) {
-             setOutputPower(world, state, i, hitResult.getBlockPos(), j);
-         }
--- a/patches/unapplied/server/Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/unapplied/server/Implement-methods-to-convert-between-Component-and-B.patch
@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Sat, 24 Apr 2021 02:09:32 -0700
-Subject: [PATCH] Implement methods to convert between Component and
- Brigadier's Message
-
-
-diff --git a/src/main/java/io/papermc/paper/brigadier/PaperBrigadierProviderImpl.java b/src/main/java/io/papermc/paper/brigadier/PaperBrigadierProviderImpl.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/brigadier/PaperBrigadierProviderImpl.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.brigadier;
-+
-+import com.mojang.brigadier.Message;
-+import io.papermc.paper.adventure.PaperAdventure;
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.ComponentLike;
-+import net.minecraft.network.chat.ComponentUtils;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+
-+import static java.util.Objects.requireNonNull;
-+
-+public enum PaperBrigadierProviderImpl implements PaperBrigadierProvider {
-+    INSTANCE;
-+
-+    PaperBrigadierProviderImpl() {
-+        PaperBrigadierProvider.initialize(this);
-+    }
-+
-+    @Override
-+    public @NonNull Message message(final @NonNull ComponentLike componentLike) {
-+        requireNonNull(componentLike, "componentLike");
-+        return PaperAdventure.asVanilla(componentLike.asComponent());
-+    }
-+
-+    @Override
-+    public @NonNull Component componentFromMessage(final @NonNull Message message) {
-+        requireNonNull(message, "message");
-+        return PaperAdventure.asAdventure(ComponentUtils.fromMessage(message));
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         io.papermc.paper.command.PaperCommands.registerCommands(this);
-         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
-         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
-+        io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
-         // Paper end
- 
-         this.setPvpAllowed(dedicatedserverproperties.pvp);
--- a/patches/unapplied/server/Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/unapplied/server/Implemented-BlockFailedDispenseEvent.patch
@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: TheViperShow <29604693+TheViperShow@users.noreply.github.com>
-Date: Wed, 22 Apr 2020 09:40:38 +0200
-Subject: [PATCH] Implemented BlockFailedDispenseEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java
-@@ -0,0 +0,0 @@ public class DispenserBlock extends BaseEntityBlock {
-         int i = tileentitydispenser.getRandomSlot(world.random);
- 
-         if (i < 0) {
-+            if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFailedDispenseEvent(world, pos)) {// Paper - BlockFailedDispenseEvent is called here
-             world.levelEvent(1001, pos, 0);
-             world.gameEvent((Entity) null, GameEvent.DISPENSE_FAIL, pos);
-+            } // Paper
-         } else {
-             ItemStack itemstack = tileentitydispenser.getItem(i);
-             DispenseItemBehavior idispensebehavior = this.getDispenseMethod(itemstack);
-diff --git a/src/main/java/net/minecraft/world/level/block/DropperBlock.java b/src/main/java/net/minecraft/world/level/block/DropperBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/DropperBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/DropperBlock.java
-@@ -0,0 +0,0 @@ public class DropperBlock extends DispenserBlock {
-         int i = tileentitydispenser.getRandomSlot(world.random);
- 
-         if (i < 0) {
-+            if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFailedDispenseEvent(world, pos)) // Paper - BlockFailedDispenseEvent is called here
-             world.levelEvent(1001, pos, 0);
-         } else {
-             ItemStack itemstack = tileentitydispenser.getItem(i);
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -0,0 +0,0 @@ public class CraftEventFactory {
-         EntitiesUnloadEvent event = new EntitiesUnloadEvent(new CraftChunk((ServerLevel) world, coords.x, coords.z), bukkitEntities);
-         Bukkit.getPluginManager().callEvent(event);
-     }
-+
-+    // Paper start
-+    public static boolean handleBlockFailedDispenseEvent(ServerLevel serverLevel, BlockPos blockposition) {
-+        org.bukkit.block.Block block = serverLevel.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
-+        io.papermc.paper.event.block.BlockFailedDispenseEvent event = new io.papermc.paper.event.block.BlockFailedDispenseEvent(block);
-+        return event.callEvent();
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/Improve-ServerGUI.patch
+++ b/patches/unapplied/server/Improve-ServerGUI.patch
@@ -1,377 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlexProgrammerDE <40795980+AlexProgrammerDE@users.noreply.github.com>
-Date: Sat, 3 Oct 2020 08:27:40 +0200
-Subject: [PATCH] Improve ServerGUI
-
- Added logo to server frame
- Show tps in the server stats
-
-diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
-+++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
-@@ -0,0 +0,0 @@ public class RAMDetails extends JList<String> {
-     public void update() {
-         GraphData data = RAMGraph.DATA.peekLast();
-         Vector<String> vector = new Vector<>();
-+
-+        double[] tps = new double[] {server.tps1.getAverage(), server.tps5.getAverage(), server.tps15.getAverage()};
-+        String[] tpsAvg = new String[tps.length];
-+
-+        for ( int g = 0; g < tps.length; g++) {
-+            tpsAvg[g] = format( tps[g] );
-+        }
-         vector.add("Memory use: " + (data.getUsedMem() / 1024L / 1024L) + " mb (" + (data.getFree() * 100L / data.getMax()) + "% free)");
-         vector.add("Heap: " + (data.getTotal() / 1024L / 1024L) + " / " + (data.getMax() / 1024L / 1024L) + " mb");
-         vector.add("Avg tick: " + DECIMAL_FORMAT.format(getAverage(server.tickTimes)) + " ms");
-+        vector.add("TPS from last 1m, 5m, 15m: " + String.join(", ", tpsAvg));
-+
-         setListData(vector);
-     }
- 
-@@ -0,0 +0,0 @@ public class RAMDetails extends JList<String> {
-         }
-         return ((double) total / (double) tickTimes.length) * 1.0E-6D;
-     }
-+
-+    private static String format(double tps) {
-+        return ( ( tps > 21.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-+++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-@@ -0,0 +0,0 @@ public class MinecraftServerGui extends JComponent {
-         jframe.pack();
-         jframe.setLocationRelativeTo((Component) null);
-         jframe.setVisible(true);
-+        jframe.setName("Minecraft server"); // Paper
-+
-+        // Paper start - Add logo as frame image
-+        try {
-+            jframe.setIconImage(javax.imageio.ImageIO.read(Objects.requireNonNull(MinecraftServerGui.class.getClassLoader().getResourceAsStream("logo.png"))));
-+        } catch (java.io.IOException ignore) {
-+        }
-+        // Paper end
-+
-         jframe.addWindowListener(new WindowAdapter() {
-             public void windowClosing(WindowEvent windowevent) {
-                 if (!servergui.isClosing.getAndSet(true)) {
-diff --git a/src/main/java/net/minecraft/server/gui/StatsComponent.java b/src/main/java/net/minecraft/server/gui/StatsComponent.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/gui/StatsComponent.java
-+++ b/src/main/java/net/minecraft/server/gui/StatsComponent.java
-@@ -0,0 +0,0 @@ public class StatsComponent extends JComponent {
- 
-     private void tick() {
-         long l = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
-+        // Paper start - Add tps entry
-+        double[] tps = org.bukkit.Bukkit.getTPS();
-+        String[] tpsAvg = new String[tps.length];
-+
-+        for ( int g = 0; g < tps.length; g++) {
-+            tpsAvg[g] = format( tps[g] );
-+        }
-         this.msgs[0] = "Memory use: " + l / 1024L / 1024L + " mb (" + Runtime.getRuntime().freeMemory() * 100L / Runtime.getRuntime().maxMemory() + "% free)";
-         this.msgs[1] = "Avg tick: " + DECIMAL_FORMAT.format(this.getAverage(this.server.tickTimes) * 1.0E-6D) + " ms";
-+        this.msgs[2] = "TPS from last 1m, 5m, 15m: " + String.join(", ", tpsAvg);
-+        // Paper end
-         this.values[this.vp++ & 255] = (int)(l * 100L / Runtime.getRuntime().maxMemory());
-         this.repaint();
-     }
-@@ -0,0 +0,0 @@ public class StatsComponent extends JComponent {
-     public void close() {
-         this.timer.stop();
-     }
-+
-+    // Paper - start Add tps entry
-+    private static String format(double tps) {
-+        return (( tps > 21.0 ) ? "*" : "") + Math.min(Math.round(tps * 100.0) / 100.0, 20.0); // only print * at 21, we commonly peak to 20.02 as the tick sleep is not accurate enough, stop the noise
-+    }
-+    // Paper end
- }
-diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
-GIT binary patch
-literal 14310
-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%0ABLt+m?son?j
-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
-WX&3$!%>|s_1IbA#OV)^+1pg1OmmZn`
-
-literal 0
-HcmV?d00001
-
--- a/patches/unapplied/server/Inline-shift-direction-fields.patch
+++ b/patches/unapplied/server/Inline-shift-direction-fields.patch
@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Andrew Steinborn <git@steinborn.me>
-Date: Mon, 18 Jan 2021 20:45:25 -0500
-Subject: [PATCH] Inline shift direction fields
-
-Removes a layer of indirection for EnumDirection.getAdjacent(X|Y|Z)(), which is in the
-critical section for much of the server, including the lighting engine.
-
-diff --git a/src/main/java/net/minecraft/core/Direction.java b/src/main/java/net/minecraft/core/Direction.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/core/Direction.java
-+++ b/src/main/java/net/minecraft/core/Direction.java
-@@ -0,0 +0,0 @@ public enum Direction implements StringRepresentable {
-     }, (direction1, direction2) -> {
-         throw new IllegalArgumentException("Duplicate keys");
-     }, Long2ObjectOpenHashMap::new));
-+    // Paper start
-+    private final int adjX;
-+    private final int adjY;
-+    private final int adjZ;
-+    // Paper end
- 
-     private Direction(int id, int idOpposite, int idHorizontal, String name, Direction.AxisDirection direction, Direction.Axis axis, Vec3i vector) {
-         this.data3d = id;
-@@ -0,0 +0,0 @@ public enum Direction implements StringRepresentable {
-         this.axis = axis;
-         this.axisDirection = direction;
-         this.normal = vector;
-+        // Paper start
-+        this.adjX = vector.getX();
-+        this.adjY = vector.getY();
-+        this.adjZ = vector.getZ();
-+        // Paper end
-     }
- 
-     public static Direction[] orderedByNearest(Entity entity) {
-@@ -0,0 +0,0 @@ public enum Direction implements StringRepresentable {
-     }
- 
-     public int getStepX() {
-        return this.normal.getX();
-+        return this.adjX; // Paper
-     }
- 
-     public int getStepY() {
-        return this.normal.getY();
-+        return this.adjY; // Paper
-     }
- 
-     public int getStepZ() {
-        return this.normal.getZ();
-+        return this.adjZ; // Paper
-     }
- 
-     public Vector3f step() {
--- a/patches/unapplied/server/Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/unapplied/server/Introduce-beacon-activation-deactivation-events.patch
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spyridon Pagkalos <spyridon@ender.gr>
-Date: Thu, 25 Mar 2021 20:28:04 +0200
-Subject: [PATCH] Introduce beacon activation/deactivation events
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-@@ -0,0 +0,0 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
-                 BeaconBlockEntity.playSound(world, pos, SoundEvents.BEACON_AMBIENT);
-             }
-         }
-+        // Paper start - beacon activation/deactivation events
-+        if (i1 <= 0 && blockEntity.levels > 0) {
-+            org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
-+            new io.papermc.paper.event.block.BeaconActivatedEvent(block).callEvent();
-+        } else if (i1 > 0 && blockEntity.levels <= 0) {
-+            org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
-+            new io.papermc.paper.event.block.BeaconDeactivatedEvent(block).callEvent();
-+        }
-+        // Paper end
- 
-         if (blockEntity.lastCheckY >= l) {
-             blockEntity.lastCheckY = world.getMinBuildHeight() - 1;
-@@ -0,0 +0,0 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
- 
-     @Override
-     public void setRemoved() {
-+        // Paper start - BeaconDeactivatedEvent
-+        org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(level, worldPosition);
-+        new io.papermc.paper.event.block.BeaconDeactivatedEvent(block).callEvent();
-+        // Paper end
-         BeaconBlockEntity.playSound(this.level, this.worldPosition, SoundEvents.BEACON_DEACTIVATE);
-         super.setRemoved();
-     }
--- a/patches/unapplied/server/Inventory-close.patch
+++ b/patches/unapplied/server/Inventory-close.patch
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Tue, 11 May 2021 14:54:56 -0700
-Subject: [PATCH] Inventory#close
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-@@ -0,0 +0,0 @@ public class CraftInventory implements Inventory {
-             this.clear(i);
-         }
-     }
-+    // Paper start
-+    @Override
-+    public int close() {
-+        int count = this.inventory.getViewers().size();
-+        com.google.common.collect.Lists.newArrayList(this.inventory.getViewers()).forEach(HumanEntity::closeInventory);
-+        return count;
-+    }
-+    // Paper end
- 
-     @Override
-     public ListIterator<ItemStack> iterator() {
--- a/patches/unapplied/server/Item-Rarity-API.patch
+++ b/patches/unapplied/server/Item-Rarity-API.patch
@@ -1,61 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Fri, 12 Mar 2021 17:09:42 -0800
-Subject: [PATCH] Item Rarity API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     public String getMainLevelName() {
-         return ((net.minecraft.server.dedicated.DedicatedServer) net.minecraft.server.MinecraftServer.getServer()).getProperties().levelName;
-     }
-+
-+    @Override
-+    public io.papermc.paper.inventory.ItemRarity getItemRarity(org.bukkit.Material material) {
-+        Item item = getItem(material);
-+        if (item == null) {
-+            throw new IllegalArgumentException(material + " is not an item, and rarity does not apply to blocks");
-+        }
-+        return io.papermc.paper.inventory.ItemRarity.values()[item.rarity.ordinal()];
-+    }
-+
-+    @Override
-+    public io.papermc.paper.inventory.ItemRarity getItemStackRarity(org.bukkit.inventory.ItemStack itemStack) {
-+        return io.papermc.paper.inventory.ItemRarity.values()[getItem(itemStack.getType()).getRarity(CraftItemStack.asNMSCopy(itemStack)).ordinal()];
-+    }
-     // Paper end
- 
-     /**
-diff --git a/src/test/java/io/papermc/paper/inventory/ItemRarityTest.java b/src/test/java/io/papermc/paper/inventory/ItemRarityTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/test/java/io/papermc/paper/inventory/ItemRarityTest.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.inventory;
-+
-+import io.papermc.paper.adventure.PaperAdventure;
-+import net.minecraft.world.item.Rarity;
-+import org.junit.Test;
-+
-+import static org.junit.Assert.assertEquals;
-+
-+public class ItemRarityTest {
-+
-+    @Test
-+    public void testConvertFromNmsToBukkit() {
-+        for (Rarity nmsRarity : Rarity.values()) {
-+            assertEquals("rarity names are mis-matched", ItemRarity.values()[nmsRarity.ordinal()].name(), nmsRarity.name());
-+        }
-+    }
-+
-+    @Test
-+    public void testRarityFormatting() {
-+        for (Rarity nmsRarity : Rarity.values()) {
-+            assertEquals("rarity formatting is mis-matched", nmsRarity.color, PaperAdventure.asVanilla(ItemRarity.values()[nmsRarity.ordinal()].color));
-+        }
-+    }
-+}
--- a/patches/unapplied/server/ItemStack-repair-check-API.patch
+++ b/patches/unapplied/server/ItemStack-repair-check-API.patch
@@ -1,79 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 15 May 2021 22:11:11 -0700
-Subject: [PATCH] ItemStack repair check API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
-         return io.papermc.paper.inventory.ItemRarity.values()[getItem(itemStack.getType()).getRarity(CraftItemStack.asNMSCopy(itemStack)).ordinal()];
-     }
- 
-+    @Override
-+    public boolean isValidRepairItemStack(org.bukkit.inventory.ItemStack itemToBeRepaired, org.bukkit.inventory.ItemStack repairMaterial) {
-+        if (!itemToBeRepaired.getType().isItem() || !repairMaterial.getType().isItem()) {
-+            return false;
-+        }
-+        return CraftMagicNumbers.getItem(itemToBeRepaired.getType()).isValidRepairItem(CraftItemStack.asNMSCopy(itemToBeRepaired), CraftItemStack.asNMSCopy(repairMaterial));
-+    }
-+
-     @Override
-     public int getProtocolVersion() {
-         return net.minecraft.SharedConstants.getCurrentVersion().getProtocolVersion();
-diff --git a/src/test/java/io/papermc/paper/util/ItemStackRepairCheckTest.java b/src/test/java/io/papermc/paper/util/ItemStackRepairCheckTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/test/java/io/papermc/paper/util/ItemStackRepairCheckTest.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.util;
-+
-+import org.bukkit.Material;
-+import org.bukkit.inventory.ItemStack;
-+import org.bukkit.support.AbstractTestingBase;
-+import org.junit.Test;
-+
-+import static org.junit.Assert.assertFalse;
-+import static org.junit.Assert.assertThrows;
-+import static org.junit.Assert.assertTrue;
-+
-+public class ItemStackRepairCheckTest extends AbstractTestingBase {
-+
-+    @Test
-+    public void testIsRepariableBy() {
-+        ItemStack diamondPick = new ItemStack(Material.DIAMOND_PICKAXE);
-+
-+        assertTrue("diamond pick isn't repairable by a diamond", diamondPick.isRepairableBy(new ItemStack(Material.DIAMOND)));
-+    }
-+
-+    @Test
-+    public void testCanRepair() {
-+        ItemStack diamond = new ItemStack(Material.DIAMOND);
-+
-+        assertTrue("diamond can't repair a diamond axe", diamond.canRepair(new ItemStack(Material.DIAMOND_AXE)));
-+    }
-+
-+    @Test
-+    public void testIsNotRepairableBy() {
-+        ItemStack notDiamondPick = new ItemStack(Material.ACACIA_SAPLING);
-+
-+        assertFalse("acacia sapling is repairable by a diamond", notDiamondPick.isRepairableBy(new ItemStack(Material.DIAMOND)));
-+    }
-+
-+    @Test
-+    public void testCanNotRepair() {
-+        ItemStack diamond = new ItemStack(Material.DIAMOND);
-+
-+        assertFalse("diamond can repair oak button", diamond.canRepair(new ItemStack(Material.OAK_BUTTON)));
-+    }
-+
-+    @Test
-+    public void testInvalidItem() {
-+        ItemStack badItemStack = new ItemStack(Material.ACACIA_WALL_SIGN);
-+
-+        assertFalse("acacia wall sign is repairable by diamond", badItemStack.isRepairableBy(new ItemStack(Material.DIAMOND)));
-+    }
-+}
--- a/patches/unapplied/server/MC-4-Fix-item-position-desync.patch
+++ b/patches/unapplied/server/MC-4-Fix-item-position-desync.patch
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Tue, 8 Dec 2020 20:24:52 -0600
-Subject: [PATCH] MC-4: Fix item position desync
-
-This fixes item position desync (MC-4) by running the item coordinates
-through the encode/decode methods of the packet that causes the precision
-loss, which forces the server to lose the same precision as the client
-keeping them in sync.
-
-diff --git a/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java b/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java
-@@ -0,0 +0,0 @@ public class VecDeltaCodec {
-     public Vec3 base = Vec3.ZERO; // Paper
- 
-     private static long encode(double value) {
-        return Mth.lfloor(value * 4096.0D);
-+        return Mth.lfloor(value * 4096.0D); // Paper - check ItemEntity#setPosRaw on update
-     }
- 
-     private static double decode(long value) {
-        return (double)value / 4096.0D;
-+        return (double)value / 4096.0D; // Paper - check ItemEntity#setPosRaw on update
-     }
- 
-     public Vec3 decode(long x, long y, long z) {
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     }
-     public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) {
-         // Paper end
-+        // Paper start - fix MC-4
-+        if (this instanceof ItemEntity) {
-+            if (io.papermc.paper.configuration.GlobalConfiguration.get().misc.fixEntityPositionDesync) {
-+                // encode/decode from ClientboundMoveEntityPacket
-+                x = Mth.lfloor(x * 4096.0D) * (1 / 4096.0D);
-+                y = Mth.lfloor(y * 4096.0D) * (1 / 4096.0D);
-+                z = Mth.lfloor(z * 4096.0D) * (1 / 4096.0D);
-+            }
-+        }
-+        // Paper end - fix MC-4
-         if (this.position.x != x || this.position.y != y || this.position.z != z) {
-             this.position = new Vec3(x, y, z);
-             int i = Mth.floor(x);
--- a/patches/unapplied/server/Make-schedule-command-per-world.patch
+++ b/patches/unapplied/server/Make-schedule-command-per-world.patch
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Mon, 4 Jan 2021 19:52:44 -0800
-Subject: [PATCH] Make schedule command per-world
-
-
-diff --git a/src/main/java/net/minecraft/server/commands/ScheduleCommand.java b/src/main/java/net/minecraft/server/commands/ScheduleCommand.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/commands/ScheduleCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/ScheduleCommand.java
-@@ -0,0 +0,0 @@ public class ScheduleCommand {
-         return Component.translatable("commands.schedule.cleared.failure", object);
-     });
-     private static final SuggestionProvider<CommandSourceStack> SUGGEST_SCHEDULE = (commandcontext, suggestionsbuilder) -> {
-        return SharedSuggestionProvider.suggest((Iterable) ((CommandSourceStack) commandcontext.getSource()).getServer().getWorldData().overworldData().getScheduledEvents().getEventsIds(), suggestionsbuilder);
-+        return SharedSuggestionProvider.suggest((Iterable) ((net.minecraft.commands.CommandSourceStack) commandcontext.getSource()).getLevel().serverLevelData.getScheduledEvents().getEventsIds(), suggestionsbuilder); // Paper
-     };
- 
-     public ScheduleCommand() {}
-@@ -0,0 +0,0 @@ public class ScheduleCommand {
-     }
- 
-     private static int remove(CommandSourceStack source, String eventName) throws CommandSyntaxException {
-        int i = source.getServer().getWorldData().overworldData().getScheduledEvents().remove(eventName);
-+        int i = source.getLevel().serverLevelData.getScheduledEvents().remove(eventName); // Paper
- 
-         if (i == 0) {
-             throw ScheduleCommand.ERROR_CANT_REMOVE.create(eventName);
--- a/patches/unapplied/server/Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/unapplied/server/Merchant-getRecipes-should-return-an-immutable-list.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Wed, 10 Feb 2021 14:53:36 -0800
-Subject: [PATCH] Merchant#getRecipes should return an immutable list
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchant.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchant.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchant.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchant.java
-@@ -0,0 +0,0 @@ public class CraftMerchant implements Merchant {
- 
-     @Override
-     public List<MerchantRecipe> getRecipes() {
-        return Collections.unmodifiableList(Lists.transform(this.merchant.getOffers(), new Function<net.minecraft.world.item.trading.MerchantOffer, MerchantRecipe>() {
-+        return List.copyOf(Lists.transform(this.merchant.getOffers(), new Function<net.minecraft.world.item.trading.MerchantOffer, MerchantRecipe>() { // Paper - javadoc says 'an immutable list of trades' - not 'an unmodifiable view of a list of trades'. fixes issue with setRecipes(getRecipes())
-             @Override
-             public MerchantRecipe apply(net.minecraft.world.item.trading.MerchantOffer recipe) {
-                 return recipe.asBukkit();
--- a/patches/unapplied/server/More-Enchantment-API.patch
+++ b/patches/unapplied/server/More-Enchantment-API.patch
@@ -1,155 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 6 May 2021 19:57:58 -0700
-Subject: [PATCH] More Enchantment API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-+++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-@@ -0,0 +0,0 @@ public class CraftEnchantment extends Enchantment {
- 
-     @Override
-     public boolean isCursed() {
-        return this.target instanceof BindingCurseEnchantment || this.target instanceof VanishingCurseEnchantment;
-+        return this.target.isCurse(); // Paper
-     }
- 
-     @Override
-@@ -0,0 +0,0 @@ public class CraftEnchantment extends Enchantment {
-     public String translationKey() {
-         return this.target.getDescriptionId();
-     }
-+
-+    @Override
-+    public boolean isTradeable() {
-+        return target.isTradeable();
-+    }
-+
-+    @Override
-+    public boolean isDiscoverable() {
-+        return target.isDiscoverable();
-+    }
-+
-+    @Override
-+    public io.papermc.paper.enchantments.EnchantmentRarity getRarity() {
-+        return fromNMSRarity(target.getRarity());
-+    }
-+
-+    @Override
-+    public float getDamageIncrease(int level, org.bukkit.entity.EntityCategory entityCategory) {
-+        return target.getDamageBonus(level, org.bukkit.craftbukkit.entity.CraftLivingEntity.fromBukkitEntityCategory(entityCategory));
-+    }
-+
-+    @Override
-+    public java.util.Set<org.bukkit.inventory.EquipmentSlot> getActiveSlots() {
-+        return java.util.stream.Stream.of(target.slots).map(org.bukkit.craftbukkit.CraftEquipmentSlot::getSlot).collect(java.util.stream.Collectors.toSet());
-+    }
-+
-+    public static io.papermc.paper.enchantments.EnchantmentRarity fromNMSRarity(net.minecraft.world.item.enchantment.Enchantment.Rarity nmsRarity) {
-+        if (nmsRarity == net.minecraft.world.item.enchantment.Enchantment.Rarity.COMMON) {
-+            return io.papermc.paper.enchantments.EnchantmentRarity.COMMON;
-+        } else if (nmsRarity == net.minecraft.world.item.enchantment.Enchantment.Rarity.UNCOMMON) {
-+            return io.papermc.paper.enchantments.EnchantmentRarity.UNCOMMON;
-+        } else if (nmsRarity == net.minecraft.world.item.enchantment.Enchantment.Rarity.RARE) {
-+            return io.papermc.paper.enchantments.EnchantmentRarity.RARE;
-+        } else if (nmsRarity == net.minecraft.world.item.enchantment.Enchantment.Rarity.VERY_RARE) {
-+            return io.papermc.paper.enchantments.EnchantmentRarity.VERY_RARE;
-+        }
-+
-+        throw new IllegalArgumentException(String.format("Unable to convert %s to a enum value of %s.", nmsRarity, io.papermc.paper.enchantments.EnchantmentRarity.class));
-+    }
-     // Paper end
- 
-     public net.minecraft.world.item.enchantment.Enchantment getHandle() {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     public void setHurtDirection(float hurtDirection) {
-         getHandle().hurtDir = hurtDirection;
-     }
-+
-+    public static MobType fromBukkitEntityCategory(EntityCategory entityCategory) {
-+        switch (entityCategory) {
-+            case NONE:
-+                return MobType.UNDEFINED;
-+            case UNDEAD:
-+                return MobType.UNDEAD;
-+            case ARTHROPOD:
-+                return MobType.ARTHROPOD;
-+            case ILLAGER:
-+                return MobType.ILLAGER;
-+            case WATER:
-+                return MobType.WATER;
-+        }
-+        throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
-+    }
-     // Paper end
- }
-diff --git a/src/test/java/io/papermc/paper/enchantments/EnchantmentRarityTest.java b/src/test/java/io/papermc/paper/enchantments/EnchantmentRarityTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/test/java/io/papermc/paper/enchantments/EnchantmentRarityTest.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.enchantments;
-+
-+import net.minecraft.world.item.enchantment.Enchantment.Rarity;
-+import org.bukkit.craftbukkit.enchantments.CraftEnchantment;
-+import org.junit.Test;
-+
-+import static org.junit.Assert.assertNotNull;
-+
-+public class EnchantmentRarityTest {
-+
-+    @Test
-+    public void test() {
-+        for (Rarity nmsRarity : Rarity.values()) {
-+            // Will throw exception if a bukkit counterpart is not found
-+            CraftEnchantment.fromNMSRarity(nmsRarity);
-+        }
-+    }
-+}
-diff --git a/src/test/java/io/papermc/paper/entity/EntityCategoryTest.java b/src/test/java/io/papermc/paper/entity/EntityCategoryTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
--- /dev/null
-+++ b/src/test/java/io/papermc/paper/entity/EntityCategoryTest.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.entity;
-+
-+import com.google.common.base.Joiner;
-+import com.google.common.collect.Maps;
-+import com.google.common.collect.Sets;
-+import net.minecraft.world.entity.MobType;
-+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
-+import org.bukkit.entity.EntityCategory;
-+import org.junit.Test;
-+
-+import java.lang.reflect.Field;
-+import java.util.Map;
-+import java.util.Set;
-+
-+import static org.junit.Assert.assertTrue;
-+
-+public class EntityCategoryTest {
-+
-+    @Test
-+    public void test() throws IllegalAccessException {
-+
-+        Map<MobType, String> enumMonsterTypeFieldMap = Maps.newHashMap();
-+        for (Field field : MobType.class.getDeclaredFields()) {
-+            if (field.getType() == MobType.class) {
-+                enumMonsterTypeFieldMap.put( (MobType) field.get(null), field.getName());
-+            }
-+        }
-+
-+        for (EntityCategory entityCategory : EntityCategory.values()) {
-+            enumMonsterTypeFieldMap.remove(CraftLivingEntity.fromBukkitEntityCategory(entityCategory));
-+        }
-+        assertTrue(MobType.class.getName() + " instance(s): " + Joiner.on(", ").join(enumMonsterTypeFieldMap.values()) + " do not have bukkit equivalents", enumMonsterTypeFieldMap.size() == 0);
-+    }
-+}
--- a/patches/unapplied/server/More-World-API.patch
+++ b/patches/unapplied/server/More-World-API.patch
@@ -1,94 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Tue, 7 Jul 2020 10:52:34 -0700
-Subject: [PATCH] More World API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-         return new CraftStructureSearchResult(CraftStructure.minecraftToBukkit(found.getSecond().value(), this.getHandle().registryAccess()), new Location(this, found.getFirst().getX(), found.getFirst().getY(), found.getFirst().getZ()));
-     }
- 
-+    // Paper start
-+    @Override
-+    public Location locateNearestBiome(Location origin, Biome biome, int radius) {
-+        return this.locateNearestBiome(origin, biome, radius, 8);
-+    }
-+
-+    @Override
-+    public Location locateNearestBiome(Location origin, Biome biome, int radius, int step) {
-+        BlockPos originPos = new BlockPos(origin.getX(), origin.getY(), origin.getZ());
-+        BlockPos nearest = getHandle().findClosestBiome3d( holder -> holder.is(CraftNamespacedKey.toMinecraft(biome.getKey())), originPos, radius, step, step).getFirst();
-+        return (nearest == null) ? null : new Location(this, nearest.getX(), nearest.getY(), nearest.getZ());
-+    }
-+
-+    @Override
-+    public boolean isUltrawarm() {
-+        return getHandle().dimensionType().ultraWarm();
-+    }
-+
-+    @Override
-+    public double getCoordinateScale() {
-+        return getHandle().dimensionType().coordinateScale();
-+    }
-+
-+    @Override
-+    public boolean hasSkylight() {
-+        return getHandle().dimensionType().hasSkyLight();
-+    }
-+
-+    @Override
-+    public boolean hasBedrockCeiling() {
-+        return getHandle().dimensionType().hasSkyLight();
-+    }
-+
-+    @Override
-+    public boolean doesBedWork() {
-+        return getHandle().dimensionType().bedWorks();
-+    }
-+
-+    @Override
-+    public boolean doesRespawnAnchorWork() {
-+        return getHandle().dimensionType().respawnAnchorWorks();
-+    }
-+
-+    @Override
-+    public boolean isFixedTime() {
-+        return getHandle().dimensionType().hasFixedTime();
-+    }
-+
-+    @Override
-+    public Collection<org.bukkit.Material> getInfiniburn() {
-+        return com.google.common.collect.Sets.newHashSet(com.google.common.collect.Iterators.transform(net.minecraft.core.Registry.BLOCK.getTagOrEmpty(this.getHandle().dimensionType().infiniburn()).iterator(), blockHolder -> CraftMagicNumbers.getMaterial(blockHolder.value())));
-+    }
-+
-+    @Override
-+    public void sendGameEvent(Entity sourceEntity, org.bukkit.GameEvent gameEvent, Vector position) {
-+        getHandle().gameEvent(sourceEntity != null ? ((CraftEntity) sourceEntity).getHandle(): null, net.minecraft.core.Registry.GAME_EVENT.get(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(gameEvent.getKey())), org.bukkit.craftbukkit.util.CraftVector.toBlockPos(position));
-+    }
-+    // Paper end
-+
-     @Override
-     public Raid locateNearestRaid(Location location, int radius) {
-         Validate.notNull(location, "Location cannot be null");
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftVector.java b/src/main/java/org/bukkit/craftbukkit/util/CraftVector.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftVector.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftVector.java
-@@ -0,0 +0,0 @@ public final class CraftVector {
-     public static net.minecraft.world.phys.Vec3 toNMS(org.bukkit.util.Vector bukkit) {
-         return new net.minecraft.world.phys.Vec3(bukkit.getX(), bukkit.getY(), bukkit.getZ());
-     }
-+    // Paper start
-+    public static org.bukkit.util.Vector toBukkit(net.minecraft.core.BlockPos blockPosition) {
-+        return new org.bukkit.util.Vector(blockPosition.getX(), blockPosition.getY(), blockPosition.getZ());
-+    }
-+
-+    public static net.minecraft.core.BlockPos toBlockPos(org.bukkit.util.Vector bukkit) {
-+        return new net.minecraft.core.BlockPos(bukkit.getX(), bukkit.getY(), bukkit.getZ());
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/unapplied/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Fri, 19 Mar 2021 16:07:21 -0700
-Subject: [PATCH] Only set despawnTimer for Wandering Traders spawned by
- MobSpawnerTrader
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java
-+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -0,0 +0,0 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
- 
-     @Nullable
-     public T spawn(ServerLevel worldserver, @Nullable CompoundTag nbttagcompound, @Nullable Component ichatbasecomponent, @Nullable Player entityhuman, BlockPos blockposition, MobSpawnType enummobspawn, boolean flag, boolean flag1, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason) {
-+        // Paper start - add consumer to modify entity before spawn
-+        return this.spawn(worldserver, nbttagcompound, ichatbasecomponent, entityhuman, blockposition, enummobspawn, flag, flag1, spawnReason, null);
-+    }
-+    @Nullable
-+    public T spawn(ServerLevel worldserver, @Nullable CompoundTag nbttagcompound, @Nullable Component ichatbasecomponent, @Nullable Player entityhuman, BlockPos blockposition, MobSpawnType enummobspawn, boolean flag, boolean flag1, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason, @Nullable java.util.function.Consumer<T> op) {
-+        // Paper end
-         // Paper start - Call PreCreatureSpawnEvent
-         org.bukkit.entity.EntityType type = org.bukkit.entity.EntityType.fromName(EntityType.getKey(this).getPath());
-         if (type != null) {
-@@ -0,0 +0,0 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
-         }
-         // Paper end
-         T t0 = this.create(worldserver, nbttagcompound, ichatbasecomponent, entityhuman, blockposition, enummobspawn, flag, flag1);
-+        if (t0 != null && op != null) op.accept(t0); // Paper
- 
-         if (t0 != null) {
-             worldserver.addFreshEntityWithPassengers(t0, spawnReason);
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -0,0 +0,0 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
- 
-     public WanderingTrader(EntityType<? extends WanderingTrader> type, Level world) {
-         super(type, world);
-        this.setDespawnDelay(48000); // CraftBukkit - set default from MobSpawnerTrader
-+        //this.setDespawnDelay(48000); // CraftBukkit - set default from MobSpawnerTrader // Paper - move back to MobSpawnerTrader - Vanilla behavior is that only traders spawned by it have this value set.
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-@@ -0,0 +0,0 @@ public class WanderingTraderSpawner implements CustomSpawner {
-                     return false;
-                 }
- 
-                WanderingTrader entityvillagertrader = (WanderingTrader) EntityType.WANDERING_TRADER.spawn(world, (CompoundTag) null, (Component) null, (Player) null, blockposition2, MobSpawnType.EVENT, false, false, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
-+                WanderingTrader entityvillagertrader = (WanderingTrader) EntityType.WANDERING_TRADER.spawn(world, (CompoundTag) null, (Component) null, (Player) null, blockposition2, MobSpawnType.EVENT, false, false, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL, trader -> trader.setDespawnDelay(48000)); // CraftBukkit // Paper - set despawnTimer before spawn events called
- 
-                 if (entityvillagertrader != null) {
-                     for (int i = 0; i < 2; ++i) {
--- a/patches/unapplied/server/Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/unapplied/server/Optimize-Dynamic-get-Missing-Keys.patch
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 21 Dec 2020 11:01:42 -0500
-Subject: [PATCH] Optimize Dynamic#get Missing Keys
-
-get was calling toString() on every NBT object that was ever asked for an optional
-key from the object to build a string for the error text.
-
-When done on large NBT objects, this was using a ton of computation time building the
-JSON representation of the NBT object.
-
-Now we will just skip the value when 99.9999% of the time the text is never even printed.
-
-diff --git a/src/main/java/com/mojang/serialization/Dynamic.java b/src/main/java/com/mojang/serialization/Dynamic.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/com/mojang/serialization/Dynamic.java
-+++ b/src/main/java/com/mojang/serialization/Dynamic.java
-@@ -0,0 +0,0 @@ import java.util.stream.Stream;
- 
- @SuppressWarnings("unused")
- public class Dynamic<T> extends DynamicLike<T> {
-+    private static final boolean DEBUG_MISSING_KEYS = Boolean.getBoolean("Paper.debugDynamicMissingKeys"); // Paper
-     private final T value;
- 
-     public Dynamic(final DynamicOps<T> ops) {
-@@ -0,0 +0,0 @@ public class Dynamic<T> extends DynamicLike<T> {
-         return new OptionalDynamic<>(ops, ops.getMap(value).flatMap(m -> {
-             final T value = m.get(key);
-             if (value == null) {
-                return DataResult.error("key missing: " + key + " in " + this.value);
-+                return DataResult.error(DEBUG_MISSING_KEYS ? "key missing: " + key + " in " + this.value : "key missing: " + key); // Paper
-             }
-             return DataResult.success(new Dynamic<>(ops, value));
-         }));
--- a/patches/unapplied/server/Player-Chunk-Load-Unload-Events.patch
+++ b/patches/unapplied/server/Player-Chunk-Load-Unload-Events.patch
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: ysl3000 <yannicklamprecht@live.de>
-Date: Mon, 5 Oct 2020 21:25:16 +0200
-Subject: [PATCH] Player Chunk Load/Unload Events
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -0,0 +0,0 @@ public class ServerPlayer extends Player {
- 
-     public void trackChunk(ChunkPos chunkPos, Packet<?> chunkDataPacket) {
-         this.connection.send(chunkDataPacket);
-+        // Paper start
-+        if(io.papermc.paper.event.packet.PlayerChunkLoadEvent.getHandlerList().getRegisteredListeners().length > 0){
-+            new io.papermc.paper.event.packet.PlayerChunkLoadEvent(this.getBukkitEntity().getWorld().getChunkAt(chunkPos.longKey), this.getBukkitEntity()).callEvent();
-+        }
-+        // Paper end
-     }
- 
-     public void untrackChunk(ChunkPos chunkPos) {
-         if (this.isAlive()) {
-             this.connection.send(new ClientboundForgetLevelChunkPacket(chunkPos.x, chunkPos.z));
-+            // Paper start
-+            if(io.papermc.paper.event.packet.PlayerChunkUnloadEvent.getHandlerList().getRegisteredListeners().length > 0){
-+                new io.papermc.paper.event.packet.PlayerChunkUnloadEvent(this.getBukkitEntity().getWorld().getChunkAt(chunkPos.longKey), this.getBukkitEntity()).callEvent();
-+            }
-+            // Paper end
-         }
- 
-     }
--- a/patches/unapplied/server/Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/unapplied/server/Prevent-grindstones-from-overstacking-items.patch
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: chickeneer <emcchickeneer@gmail.com>
-Date: Tue, 16 Feb 2021 21:37:51 -0600
-Subject: [PATCH] Prevent grindstones from overstacking items
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-@@ -0,0 +0,0 @@ public class GrindstoneMenu extends AbstractContainerMenu {
-                 i = Math.max(item.getMaxDamage() - l, 0);
-                 itemstack2 = this.mergeEnchants(itemstack, itemstack1);
-                 if (!itemstack2.isDamageableItem()) {
-                    if (!ItemStack.matches(itemstack, itemstack1)) {
-+                    if (!ItemStack.matches(itemstack, itemstack1) || itemstack2.getMaxStackSize() == 1) { // Paper - add max stack size check
-                         this.resultSlots.setItem(0, ItemStack.EMPTY);
-                         this.broadcastChanges();
-                         return;
-                     }
- 
-                    b0 = 2;
-+                    b0 = 2; // Paper - the problem line for above change, causing over-stacking
-                 }
-             } else {
-                 boolean flag3 = !itemstack.isEmpty();
--- a/patches/unapplied/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/unapplied/server/Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 16 Jan 2021 14:30:12 -0500
-Subject: [PATCH] Remove ProjectileHitEvent call when fireballs dead
-
-The duplicate ProjectileHitEvent in EntityFireball was removed. The
-event was always called before the duplicate call.
-
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
-@@ -0,0 +0,0 @@ public abstract class AbstractHurtingProjectile extends Projectile {
- 
-                 // CraftBukkit start - Fire ProjectileHitEvent
-                 if (this.isRemoved()) {
-                    CraftEventFactory.callProjectileHitEvent(this, movingobjectposition);
-+                    // CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); // Paper - this is an undesired duplicate event
-                 }
-                 // CraftBukkit end
-             }
--- a/patches/unapplied/server/Remove-stale-POIs.patch
+++ b/patches/unapplied/server/Remove-stale-POIs.patch
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sat, 9 Jan 2021 14:17:07 +0100
-Subject: [PATCH] Remove stale POIs
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel {
-             });
-             optional1.ifPresent((holder) -> {
-                 this.getServer().execute(() -> {
-+                    // Paper start
-+                    if (optional.isEmpty() && this.getPoiManager().exists(blockposition1, poiType -> true)) {
-+                        this.getPoiManager().remove(blockposition1);
-+                    }
-+                    // Paper end
-                     this.getPoiManager().add(blockposition1, holder);
-                     DebugPackets.sendPoiAddedPacket(this, blockposition1);
-                 });
--- a/patches/unapplied/server/Remove-streams-from-SensorNearest.patch
+++ b/patches/unapplied/server/Remove-streams-from-SensorNearest.patch
@@ -1,88 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Bjarne Koll <git@lynxplay.dev>
-Date: Wed, 3 Mar 2021 12:48:48 +0100
-Subject: [PATCH] Remove streams from SensorNearest
-
-The behavioural nearby sensors are validated every tick on the entities
-that registered the respective sensors and are therefore a good subject
-to performance improvements.
-
-More specifically this commit replaces the Stream#filter usage with
-ArrayList#removeIf as the removeIf method on an array list is heavily
-optimized towards a single internal array re-allocation without any
-further overhead on the removeIf call.
-
-The only negative of this change is the rather agressive diff these
-patches introduce as the methods are basically being reimplemented
-compared to the previous stream-based implementation.
-
-See: https://nipafx.dev/java-stream-performance/
-
-diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java
-@@ -0,0 +0,0 @@ public class NearestItemSensor extends Sensor<Mob> {
-             return true;
-         });
-         list.sort(Comparator.comparingDouble(entity::distanceToSqr));
-        Optional<ItemEntity> optional = list.stream().filter((itemEntity) -> {
-            return entity.wantsToPickUp(itemEntity.getItem());
-        }).filter((itemEntity) -> {
-            return itemEntity.closerThan(entity, 32.0D);
-        }).filter(entity::hasLineOfSight).findFirst();
-        brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, optional);
-+        // Paper start - remove streams in favour of lists
-+        ItemEntity nearest = null;
-+        for (ItemEntity entityItem : list) {
-+            if (entity.wantsToPickUp(entityItem.getItem()) && entityItem.closerThan(entity, 32.0D) && entity.hasLineOfSight(entityItem)) {
-+                nearest = entityItem;
-+                break;
-+            }
-+        }
-+        brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, Optional.ofNullable(nearest));
-+        // Paper end
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java
-@@ -0,0 +0,0 @@ public class PlayerSensor extends Sensor<LivingEntity> {
- 
-     @Override
-     protected void doTick(ServerLevel world, LivingEntity entity) {
-        List<Player> list = world.players().stream().filter(EntitySelector.NO_SPECTATORS).filter((player) -> {
-            return entity.closerThan(player, 16.0D);
-        }).sorted(Comparator.comparingDouble(entity::distanceToSqr)).collect(Collectors.toList());
-+        List<Player> players = new java.util.ArrayList<>(world.players());
-+        players.removeIf(player -> !EntitySelector.NO_SPECTATORS.test(player) || !entity.closerThan(player, 16.0D));
-+        players.sort(Comparator.comparingDouble(entity::distanceTo));
-         Brain<?> brain = entity.getBrain();
-        brain.setMemory(MemoryModuleType.NEAREST_PLAYERS, list);
-        List<Player> list2 = list.stream().filter((player) -> {
-            return isEntityTargetable(entity, player);
-        }).collect(Collectors.toList());
-        brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER, list2.isEmpty() ? null : list2.get(0));
-        Optional<Player> optional = list2.stream().filter((player) -> {
-            return isEntityAttackable(entity, player);
-        }).findFirst();
-        brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_ATTACKABLE_PLAYER, optional);
-+
-+        brain.setMemory(MemoryModuleType.NEAREST_PLAYERS, players);
-+
-+        Player nearest = null, nearestTargetable = null;
-+        for (Player player : players) {
-+            if (Sensor.isEntityTargetable(entity, player)) {
-+                if (nearest == null) nearest = player;
-+                if (Sensor.isEntityAttackable(entity, player)) {
-+                    nearestTargetable = player;
-+                    break; // Both variables are assigned, no reason to loop further
-+                }
-+            }
-+        }
-+        brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER, nearest);
-+        brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_ATTACKABLE_PLAYER, nearestTargetable);
-+        // Paper end
-     }
- }
--- a/patches/unapplied/server/Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/unapplied/server/Reset-shield-blocking-on-dimension-change.patch
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Yive <admin@yive.me>
-Date: Sun, 24 Jan 2021 08:55:19 -0800
-Subject: [PATCH] Reset shield blocking on dimension change
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -0,0 +0,0 @@ public class ServerPlayer extends Player {
-                 this.level.getCraftServer().getPluginManager().callEvent(changeEvent);
-                 // CraftBukkit end
-             }
-+            // Paper start
-+            if (this.isBlocking()) {
-+                this.stopUsingItem();
-+            }
-+            // Paper end
- 
-             return this;
-         }
--- a/patches/unapplied/server/Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/unapplied/server/Return-chat-component-with-empty-text-instead-of-thr.patch
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: CDFN <codefun@protonmail.com>
-Date: Tue, 7 Jul 2020 17:53:23 +0200
-Subject: [PATCH] Return chat component with empty text instead of throwing
- exception
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-@@ -0,0 +0,0 @@ public abstract class AbstractContainerMenu {
-     }
-     private Component title;
-     public final Component getTitle() {
-        Preconditions.checkState(this.title != null, "Title not set");
-+        // Paper start - return chat component with empty text instead of throwing error
-+        // Preconditions.checkState(this.title != null, "Title not set");
-+        if(this.title == null){
-+            return Component.literal("");
-+        }
-+        // Paper end
-         return this.title;
-     }
-     public final void setTitle(Component title) {
--- a/patches/unapplied/server/Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/unapplied/server/Send-empty-commands-if-tab-completion-is-disabled.patch
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Mon, 26 Apr 2021 01:27:08 +0100
-Subject: [PATCH] Send empty commands if tab completion is disabled
-
-
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -0,0 +0,0 @@ public class Commands {
-     }
- 
-     public void sendCommands(ServerPlayer player) {
-        if ( org.spigotmc.SpigotConfig.tabComplete < 0 ) return; // Spigot
-+        // Paper start - Send empty commands if tab completion is disabled
-+        if ( org.spigotmc.SpigotConfig.tabComplete < 0 ) { //return; // Spigot
-+            player.connection.send(new ClientboundCommandsPacket(new RootCommandNode<>()));
-+            return;
-+        }
-+        // Paper end
-         // CraftBukkit start
-         // Register Vanilla commands into builtRoot as before
-         // Paper start - Async command map building
--- a/patches/unapplied/server/Set-area-affect-cloud-rotation.patch
+++ b/patches/unapplied/server/Set-area-affect-cloud-rotation.patch
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Mon, 5 Apr 2021 16:58:20 -0400
-Subject: [PATCH] Set area affect cloud rotation
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -0,0 +0,0 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
-             entity.moveTo(location.getX(), location.getY(), location.getZ());
-         } else if (AreaEffectCloud.class.isAssignableFrom(clazz)) {
-             entity = new net.minecraft.world.entity.AreaEffectCloud(world, x, y, z);
-+            entity.moveTo(x, y, z, yaw, pitch); // Paper - Set area effect cloud Rotation
-         } else if (EvokerFangs.class.isAssignableFrom(clazz)) {
-             entity = new net.minecraft.world.entity.projectile.EvokerFangs(world, x, y, z, (float) Math.toRadians(yaw), 0, null);
-         } else if (Marker.class.isAssignableFrom(clazz)) {
--- a/patches/unapplied/server/Throw-proper-exception-on-empty-JsonList-file.patch
+++ b/patches/unapplied/server/Throw-proper-exception-on-empty-JsonList-file.patch
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mariell Hoversholm <proximyst@proximyst.com>
-Date: Sun, 1 Nov 2020 16:43:11 +0100
-Subject: [PATCH] Throw proper exception on empty JsonList file
-
-
-diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/players/StoredUserList.java
-+++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
-@@ -0,0 +0,0 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
- 
-             try {
-                 JsonArray jsonarray = (JsonArray) StoredUserList.GSON.fromJson(bufferedreader, JsonArray.class);
-+                com.google.common.base.Preconditions.checkState(jsonarray != null, "The file \"" + this.file.getName() + "\" is either empty or corrupt"); // Paper
- 
-                 this.map.clear();
-                 Iterator iterator = jsonarray.iterator();
--- a/patches/unapplied/server/Zombie-API-breaking-doors.patch
+++ b/patches/unapplied/server/Zombie-API-breaking-doors.patch
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 18 Nov 2020 11:32:46 -0800
-Subject: [PATCH] Zombie API - breaking doors
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-@@ -0,0 +0,0 @@ public class CraftZombie extends CraftMonster implements Zombie {
-     public void setShouldBurnInDay(boolean shouldBurnInDay) {
-         getHandle().setShouldBurnInDay(shouldBurnInDay);
-     }
-+
-+    @Override
-+    public boolean supportsBreakingDoors() {
-+        return getHandle().supportsBreakDoorGoal();
-+    }
-     // Paper end
- 
-     @Override
--- a/patches/unapplied/server/add-DragonEggFormEvent.patch
+++ b/patches/unapplied/server/add-DragonEggFormEvent.patch
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Trigary <trigary0@gmail.com>
-Date: Mon, 25 Jan 2021 14:53:57 +0100
-Subject: [PATCH] add DragonEggFormEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-+++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-@@ -0,0 +0,0 @@ public class EndDragonFight {
-             this.dragonEvent.setVisible(false);
-             this.spawnExitPortal(true);
-             this.spawnNewGateway();
-+            // Paper start - DragonEggFormEvent
-+            BlockPos eggPosition = this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, EndPodiumFeature.END_PODIUM_LOCATION);
-+            org.bukkit.craftbukkit.block.CraftBlockState eggState = org.bukkit.craftbukkit.block.CraftBlockStates.getBlockState(this.level, eggPosition);
-+            eggState.setData(Blocks.DRAGON_EGG.defaultBlockState());
-+            io.papermc.paper.event.block.DragonEggFormEvent eggEvent = new io.papermc.paper.event.block.DragonEggFormEvent(org.bukkit.craftbukkit.block.CraftBlock.at(this.level, eggPosition), eggState,
-+                new org.bukkit.craftbukkit.boss.CraftDragonBattle(this));
-+            // Paper end - DragonEggFormEvent
-             if (this.level.paperConfig().entities.behavior.enderDragonsDeathAlwaysPlacesDragonEgg || !this.previouslyKilled) { // Paper - always place dragon egg
-                this.level.setBlockAndUpdate(this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, EndPodiumFeature.END_PODIUM_LOCATION), Blocks.DRAGON_EGG.defaultBlockState());
-+                // Paper start - DragonEggFormEvent
-+                //this.level.setBlockAndUpdate(this.level.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, EndPodiumFeature.END_PODIUM_LOCATION), Blocks.DRAGON_EGG.defaultBlockState());
-+            } else {
-+                eggEvent.setCancelled(true);
-+            }
-+            if (eggEvent.callEvent()) {
-+                eggEvent.getNewState().update(true);
-             }
-+            // Paper end - DragonEggFormEvent
- 
-             this.previouslyKilled = true;
-             this.dragonKilled = true;
--- a/patches/unapplied/server/add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/unapplied/server/add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 22 Apr 2021 17:17:47 -0700
-Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
-             case PERFORM_RESPAWN:
-                 if (this.player.wonGame) {
-                     this.player.wonGame = false;
-                    this.player = this.server.getPlayerList().respawn(this.player, true);
-+                    this.player = this.server.getPlayerList().respawn(this.player, this.server.getLevel(this.player.getRespawnDimension()), true, null, true, org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag.END_PORTAL); // Paper - add isEndCreditsRespawn argument
-                     CriteriaTriggers.CHANGED_DIMENSION.trigger(this.player, Level.END, Level.OVERWORLD);
-                 } else {
-                     if (this.player.getHealth() > 0.0F) {
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
-     }
- 
-     public ServerPlayer respawn(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation) {
-+        // Paper start
-+        return respawn(entityplayer, worldserver, flag, location, avoidSuffocation, new org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag[0]);
-+    }
-+
-+    public ServerPlayer respawn(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation, org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag...respawnFlags) {
-+        // Paper end
-         entityplayer.stopRiding(); // CraftBukkit
-         this.players.remove(entityplayer);
-         this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
-             }
- 
-             Player respawnPlayer = entityplayer1.getBukkitEntity();
-            PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !isAnchorSpawn, isAnchorSpawn); // Paper - Fix anchor respawn acting as a bed respawn from the end portal
-+            PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !isAnchorSpawn, isAnchorSpawn, com.google.common.collect.ImmutableSet.<org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag>builder().add(respawnFlags)); // Paper - Fix anchor respawn acting as a bed respawn from the end portal
-             this.cserver.getPluginManager().callEvent(respawnEvent);
-             // Spigot Start
-             if (entityplayer.connection.isDisconnected()) {
--- a/patches/unapplied/server/add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/unapplied/server/add-consumeFuel-to-FurnaceBurnEvent.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 22 Apr 2021 16:45:28 -0700
-Subject: [PATCH] add consumeFuel to FurnaceBurnEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-@@ -0,0 +0,0 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
-                 if (blockEntity.isLit() && furnaceBurnEvent.isBurning()) {
-                     // CraftBukkit end
-                     flag1 = true;
-                    if (flag3) {
-+                    if (flag3 && furnaceBurnEvent.willConsumeFuel()) { // Paper
-                         Item item = itemstack.getItem();
- 
-                         itemstack.shrink(1);
--- a/patches/unapplied/server/add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/unapplied/server/add-get-set-drop-chance-to-EntityEquipment.patch
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 22 Apr 2021 00:28:11 -0700
-Subject: [PATCH] add get-set drop chance to EntityEquipment
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
-@@ -0,0 +0,0 @@ public class CraftEntityEquipment implements EntityEquipment {
-     public void setBootsDropChance(float chance) {
-         this.setDropChance(net.minecraft.world.entity.EquipmentSlot.FEET, chance);
-     }
-+    // Paper start
-+    @Override
-+    public float getDropChance(EquipmentSlot slot) {
-+        return getDropChance(CraftEquipmentSlot.getNMS(slot));
-+    }
-+
-+    @Override
-+    public void setDropChance(EquipmentSlot slot, float chance) {
-+        setDropChance(CraftEquipmentSlot.getNMS(slot), chance);
-+    }
-+    // Paper end
- 
-     private void setDropChance(net.minecraft.world.entity.EquipmentSlot slot, float chance) {
-         Preconditions.checkArgument(this.entity.getHandle() instanceof Mob, "Cannot set drop chance for non-Mob entity");
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-@@ -0,0 +0,0 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
-     public void setBootsDropChance(float chance) {
-         throw new UnsupportedOperationException("Cannot set drop chance for PlayerInventory");
-     }
-+    // Paper start
-+    @Override
-+    public float getDropChance(EquipmentSlot slot) {
-+        return 1;
-+    }
-+
-+    @Override
-+    public void setDropChance(EquipmentSlot slot, float chance) {
-+        throw new UnsupportedOperationException("Cannot set drop chance for PlayerInventory");
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/unapplied/server/add-isDeeplySleeping-to-HumanEntity.patch
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 8 Apr 2021 17:36:10 -0700
-Subject: [PATCH] add isDeeplySleeping to HumanEntity
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -0,0 +0,0 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
-         }
-     }
- 
-+    // Paper start
-+    @Override
-+    public boolean isDeeplySleeping() {
-+        return getHandle().isSleepingLongEnough();
-+    }
-+    // Paper end
-+
-     @Override
-     public int getSleepTicks() {
-         return this.getHandle().sleepCounter;
--- a/patches/unapplied/server/added-PlayerNameEntityEvent.patch
+++ b/patches/unapplied/server/added-PlayerNameEntityEvent.patch
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 5 Jul 2020 00:33:54 -0700
-Subject: [PATCH] added PlayerNameEntityEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/item/NameTagItem.java b/src/main/java/net/minecraft/world/item/NameTagItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/item/NameTagItem.java
-+++ b/src/main/java/net/minecraft/world/item/NameTagItem.java
-@@ -0,0 +0,0 @@
- package net.minecraft.world.item;
- 
-+// Paper start
-+import io.papermc.paper.adventure.PaperAdventure;
-+import io.papermc.paper.event.player.PlayerNameEntityEvent;
-+// Paper end
- import net.minecraft.world.InteractionHand;
- import net.minecraft.world.InteractionResult;
- import net.minecraft.world.entity.LivingEntity;
-@@ -0,0 +0,0 @@ public class NameTagItem extends Item {
-     public InteractionResult interactLivingEntity(ItemStack stack, Player user, LivingEntity entity, InteractionHand hand) {
-         if (stack.hasCustomHoverName() && !(entity instanceof Player)) {
-             if (!user.level.isClientSide && entity.isAlive()) {
-                entity.setCustomName(stack.getHoverName());
-                if (entity instanceof Mob) {
-                    ((Mob)entity).setPersistenceRequired();
-+                // Paper start
-+                PlayerNameEntityEvent event = new PlayerNameEntityEvent(((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity(), entity.getBukkitLivingEntity(), PaperAdventure.asAdventure(stack.getHoverName()), true);
-+                if (!event.callEvent()) return InteractionResult.PASS;
-+                LivingEntity newEntityLiving = ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getEntity()).getHandle();
-+                newEntityLiving.setCustomName(event.getName() != null ? PaperAdventure.asVanilla(event.getName()) : null);
-+                if (event.isPersistent() && newEntityLiving instanceof Mob) {
-+                    ((Mob) newEntityLiving).setPersistenceRequired();
-+                // Paper end
-                 }
- 
-                 stack.shrink(1);
--- a/Show More
+++ b/Show More