bale o' patches

2022-06-08 01:00:56 -07:00 · 2022-06-08 01:00:56 -07:00 · cc7979a6e0
commit cc7979a6e0
parent aabbfcdf8d
31 changed files with 70 additions and 70 deletions
--- a/patches/unapplied/server/0621-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/unapplied/server/0621-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 30d79e006f22a6cc7652b111b9307f9f1634ba60..b079f9cd9dd3c818b859010df74172a84eee544d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3719,6 +3719,7 @@ 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/0622-Add-bypass-host-check.patch
+++ b/patches/unapplied/server/0622-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 8060d6461835d5b5b4429e9b280d08eae4e435e9..f74b6d2110e51c76eeb1aea7665153509b6e6371 100644
--- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-@@ -30,6 +30,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
-     private static final Component IGNORE_STATUS_REASON = new TextComponent("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;
-@@ -118,7 +119,7 @@ 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/0623-Set-area-affect-cloud-rotation.patch
+++ b/patches/unapplied/server/0623-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 cd359e6576e69184935b0852ffc6b9fb57181730..57b8c02dc8466dfc572719d72c9ff1fdefbbca4c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -894,6 +894,7 @@ 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/0624-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/unapplied/server/0624-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 61665989cf24484509766619db95247ef40b3e1e..83c5314ed3a3f09162bca47902c4e749fab940a0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -121,6 +121,13 @@ 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/0625-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/unapplied/server/0625-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 18eff3a00ae5137ec71c31bc3466a864c60d9fde..888e1f2bc6ea4ddbbcc5466f177233f25b290459 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
-@@ -348,7 +348,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
-                 if (blockEntity.isLit() && furnaceBurnEvent.isBurning()) {
-                     // CraftBukkit end
-                     flag1 = true;
-                    if (!itemstack.isEmpty()) {
-+                    if (!itemstack.isEmpty() && furnaceBurnEvent.willConsumeFuel()) { // Paper
-                         Item item = itemstack.getItem();
- 
-                         itemstack.shrink(1);
--- a/patches/unapplied/server/0626-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/unapplied/server/0626-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 cb704cef3845727c465fe3ea7210a11545da56c8..6827979a5b270ced53b46ecb9eff548727dadb81 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
-@@ -244,6 +244,17 @@ 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 8bca88f7b7d310b29bdc851125e4cd03718a4fb9..d6a228473ca6f425757683a4b17b035a53ab117f 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-@@ -354,4 +354,15 @@ 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/0627-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/unapplied/server/0627-fix-PigZombieAngerEvent-cancellation.patch
@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Trigary <trigary0@gmail.com>
-Date: Thu, 18 Mar 2021 21:38:01 +0100
-Subject: [PATCH] fix PigZombieAngerEvent cancellation
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index 31595c3a225c14f7cab4ab1b50c9905f8dae09a3..6fe49abb9d9a273787828e72061e16a7b053e50a 100644
--- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-@@ -52,6 +52,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
-     private static final int ALERT_RANGE_Y = 10;
-     private static final UniformInt ALERT_INTERVAL = TimeUtil.rangeOfSeconds(4, 6);
-     private int ticksUntilNextAlert;
-+    private HurtByTargetGoal pathfinderGoalHurtByTarget; // Paper
- 
-     public ZombifiedPiglin(EntityType<? extends ZombifiedPiglin> type, Level world) {
-         super(type, world);
-@@ -72,7 +73,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
-     protected void addBehaviourGoals() {
-         this.goalSelector.addGoal(2, new ZombieAttackGoal(this, 1.0D, false));
-         this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0D));
-        this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
-+        this.targetSelector.addGoal(1, pathfinderGoalHurtByTarget = (new HurtByTargetGoal(this, new Class[0])).setAlertOthers()); // Paper - assign field
-         this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt));
-         this.targetSelector.addGoal(3, new ResetUniversalAngerTargetGoal<>(this, true));
-     }
-@@ -175,6 +176,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
-         this.level.getCraftServer().getPluginManager().callEvent(event);
-         if (event.isCancelled()) {
-             this.setPersistentAngerTarget(null);
-+            pathfinderGoalHurtByTarget.stop(); // Paper - clear goalTargets to fix cancellation
-             return;
-         }
-         this.setRemainingPersistentAngerTime(event.getNewAnger());
--- a/patches/unapplied/server/0628-Fix-checkReach-check-for-Shulker-boxes.patch
+++ b/patches/unapplied/server/0628-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 e9cf1ebdfdd363b588b0f7679f1533bc9c2eb844..3991ef6319030e155cb3363f73e67a2bb6ab384f 100644
--- a/src/main/java/net/minecraft/world/inventory/ShulkerBoxMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/ShulkerBoxMenu.java
-@@ -66,6 +66,7 @@ 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/0629-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/unapplied/server/0629-fix-PlayerItemHeldEvent-firing-twice.patch
@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: chickeneer <emcchickeneer@gmail.com>
-Date: Thu, 22 Apr 2021 19:02:07 -0700
-Subject: [PATCH] fix PlayerItemHeldEvent firing twice
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bd40af954458ec9ff0ccbf30cb943a1b0a3054fa..94829dd595147b2f251094835d9a7ba3b87484c0 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1964,6 +1964,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
-         if (this.player.isImmobile()) return; // CraftBukkit
-         if (packet.getSlot() >= 0 && packet.getSlot() < Inventory.getSelectionSize()) {
-+            if (packet.getSlot() == this.player.getInventory().selected) { return; } // Paper - don't fire itemheldevent when there wasn't a slot change
-             PlayerItemHeldEvent event = new PlayerItemHeldEvent(this.getCraftPlayer(), this.player.getInventory().selected, packet.getSlot());
-             this.cserver.getPluginManager().callEvent(event);
-             if (event.isCancelled()) {
--- a/patches/unapplied/server/0630-Added-PlayerDeepSleepEvent.patch
+++ b/patches/unapplied/server/0630-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 49648e258c6e72ac921f69114e1e36a926749d46..de0b885ebafecb37ef8be127362f76d487ff92ae 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -246,6 +246,11 @@ 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/0631-More-World-API.patch
+++ b/patches/unapplied/server/0631-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 6777b678efebc5eee72b2aa368309aea3191157f..07c90f6a98819c835b2341bd5c144609655b33e7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1967,6 +1967,65 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-         return (nearest == null) ? null : new Location(this, nearest.getX(), nearest.getY(), nearest.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().findNearestBiome( holder -> holder.is(CraftNamespacedKey.toMinecraft(biome.getKey())), originPos, radius, 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 3071ac1ac0e733d73dade49597a39f7d156bbc04..60c4afd5cad66ffb0cfb5c1fa9857def593813ae 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftVector.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftVector.java
-@@ -12,4 +12,13 @@ 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/0632-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/unapplied/server/0632-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 67b677af9a798b4889d1e231c3af448a087eb3d8..20c0030d566012146021613325c6a979f392740e 100644
--- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-@@ -110,14 +110,23 @@ 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 != 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/0633-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/unapplied/server/0633-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..dd6012b6a097575b2d1471be5069eccee4537c0a
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/brigadier/PaperBrigadierProviderImpl.java
-@@ -0,0 +1,30 @@
-+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 a97e4ac808ed746c5e6bbcbe90839beb00c57c52..fa6adf12e8272c90c3376bc93350dc57eb1cd461 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -223,6 +223,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         com.destroystokyo.paper.PaperConfig.registerCommands();
-         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
-         io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc.
-+        io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
-         // Paper end
- 
-         this.setPvpAllowed(dedicatedserverproperties.pvp);
--- a/patches/unapplied/server/0634-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/unapplied/server/0634-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 7eafebf167e4060c73ba77636eb11e7f346f040a..3e6f38e9b42f086c3f8b020628683f06ba1d28cb 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -851,6 +851,7 @@ public abstract class PlayerList {
- 
-         // Paper start
-         boolean isBedSpawn = false;
-+        boolean isAnchorSpawn = false;
-         boolean isRespawn = false;
-         boolean isLocAltered = false; // Paper - Fix SPIGOT-5989
-         // Paper end
-@@ -871,6 +872,7 @@ 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;
- 
-@@ -899,7 +901,7 @@ 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/0635-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/unapplied/server/0635-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 82976b3675f581a9f3ccb9e23048bd44864203f8..8d5c9813010a0256bd2712a1eabbc91f0f473a41 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
-@@ -204,6 +204,15 @@ 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;
-@@ -261,6 +270,10 @@ 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/0636-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/unapplied/server/0636-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 94829dd595147b2f251094835d9a7ba3b87484c0..f80a39acd2df8181523549d53664d7008638122d 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2502,7 +2502,7 @@ 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 3e6f38e9b42f086c3f8b020628683f06ba1d28cb..6dfca5731966084efce3997898a6ebe9c0c6ea0d 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -810,6 +810,12 @@ 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
-@@ -901,7 +907,7 @@ 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/0637-Add-Channel-initialization-listeners.patch
+++ b/patches/unapplied/server/0637-Add-Channel-initialization-listeners.patch
@ -1,119 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
-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..88099df34c2d74daba9645aadf65b446ca795a91
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/network/ChannelInitializeListener.java
-@@ -0,0 +1,15 @@
-+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..30e62719e0a83525daa33cf41cb61df360c0e046
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/network/ChannelInitializeListenerHolder.java
-@@ -0,0 +1,74 @@
-+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/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 888e863b6d605bf587d0c071795a43d2157afa4d..c36089ead51d2e7dc3369d5f9a1869f58ff5391c 100644
--- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-+++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -112,6 +112,7 @@ 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/0638-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/unapplied/server/0638-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 e195ef979984ea7ffe4558c42ebabadf2a00950a..8f51b814c5b1c2c14378565363119df45af25726 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -345,7 +345,12 @@ 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/0639-Add-more-WanderingTrader-API.patch
+++ b/patches/unapplied/server/0639-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 abb2c5c4ac481c7529aa29322babb1929235e15a..86e1ba898d6b92735258419fa74352e5116226dc 100644
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -56,6 +56,10 @@ 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);
-@@ -66,10 +70,10 @@ 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 65b052567d1d855021d7273672b4354aba0a42a4..fa7107593b20e0151d8d67104e4a92dcc697d461 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
-@@ -34,4 +34,26 @@ 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/0640-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/unapplied/server/0640-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 e4e879cdfe7d257161bf8e98305c0f2e9b9539f9..19127ec5d89235ea9af549810b24783e0af85a3d 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
-@@ -138,6 +138,11 @@ 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 ee4d7f5558ed76e8d8b56133da729a5303d1d823..e00210950cbf005b0e65aed68dfbb7c281aefd87 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
-@@ -80,4 +80,10 @@ 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/0641-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/unapplied/server/0641-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 8096f01fa7f1ed73e4812912fc9b21bafdd212c8..b16287a47870978706734b928b87f2357e91e3a1 100644
--- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
-+++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-@@ -290,10 +290,18 @@ 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(new TranslatableComponent("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.broadcastMessage(new TranslatableComponent("chat.type.advancement." + advancement.getDisplay().getFrame().getName(), new Object[]{this.player.getDisplayName(), advancement.getChatComponent()}), ChatType.SYSTEM, Util.NIL_UUID);
-+                // Paper start - Add Adventure message to PlayerAdvancementDoneEvent
-+                if (message != null && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
-+                    this.playerList.broadcastMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), ChatType.SYSTEM, Util.NIL_UUID);
-+                    // Paper end
-                 }
-             }
-         }
--- a/patches/unapplied/server/0642-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/unapplied/server/0642-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 ab21f25a3eb0575d08aeac717ba2b74160f54fa9..4e23e9ac3579dd0cedf0dfdbb231f6fae111745c 100644
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -355,12 +355,13 @@ 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/0643-Inventory-close.patch
+++ b/patches/unapplied/server/0643-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 b17dab9e5c06d8789553b104602d7da35d926dd1..30ac442049088200e9ab77a561c59cbc58aaa28f 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-@@ -448,6 +448,14 @@ 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/0644-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/unapplied/server/0644-call-PortalCreateEvent-players-and-end-platform.patch
@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 12 May 2021 03:21:22 -0700
-Subject: [PATCH] call PortalCreateEvent players and end platform
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d5df57d0692f26420fba8ca25c302dfcd9078e20..c9d70d5d1b53fe92ca7d895f1ed0d82fe4b06dab 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1200,15 +1200,21 @@ public class ServerPlayer extends Player {
-     private void createEndPlatform(ServerLevel world, BlockPos centerPos) {
-         BlockPos.MutableBlockPos blockposition_mutableblockposition = centerPos.mutable();
- 
-+        org.bukkit.craftbukkit.util.BlockStateListPopulator blockList = new org.bukkit.craftbukkit.util.BlockStateListPopulator(world); // Paper
-         for (int i = -2; i <= 2; ++i) {
-             for (int j = -2; j <= 2; ++j) {
-                 for (int k = -1; k < 3; ++k) {
-                     BlockState iblockdata = k == -1 ? Blocks.OBSIDIAN.defaultBlockState() : Blocks.AIR.defaultBlockState();
- 
-                    world.setBlockAndUpdate(blockposition_mutableblockposition.set(centerPos).move(j, k, i), iblockdata);
-+                    blockList.setBlock(blockposition_mutableblockposition.set(centerPos).move(j, k, i), iblockdata, 3); // Paper
-                 }
-             }
-         }
-+        // Paper start
-+        if (new org.bukkit.event.world.PortalCreateEvent((List< org.bukkit.block.BlockState>) (List) blockList.getList(), world.getWorld(), this.getBukkitEntity(), org.bukkit.event.world.PortalCreateEvent.CreateReason.END_PLATFORM).callEvent()) {
-+            blockList.updateList();
-+        }
-+        // Paper end
- 
-     }
- 
--- a/patches/unapplied/server/0645-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/unapplied/server/0645-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 ecf12ed5014202181e78af051e4a9ca88a275794..e23fe546291e670f89447398507d08a0a07efa85 100644
--- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -96,9 +96,15 @@ 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);
-@@ -222,7 +228,20 @@ 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 ca9324381a60fc3072719c39918a1c16ac88799b..b55640ed068becd40cbb7d7507b4e67ae9ee792a 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -144,7 +144,7 @@ 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);
-         }
- 
-@@ -175,6 +175,9 @@ 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
-     }
- 
-@@ -189,6 +192,7 @@ public class Phantom extends FlyingMob implements Enemy {
-         if (this.spawningEntity != null) {
-             nbt.putUUID("Paper.SpawningEntity", this.spawningEntity);
-         }
-+        nbt.putBoolean("Paper.ShouldBurnInDay", shouldBurnInDay);
-         // Paper end
-     }
- 
-@@ -248,6 +252,10 @@ 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 5ff566186431440c25a26900aba14e4adb642031..5beaa2bb0d58fe477ce8d2de8b77600d3b416d8c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java
-@@ -20,4 +20,15 @@ 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 c9dab70b0b284fe1c1daafd3c1f5bd08b14fa35d..dce23f3878b1588c26b6116d80e597d08070edbc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-@@ -40,5 +40,15 @@ 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/0646-Fix-CraftPotionBrewer-cache.patch
+++ b/patches/unapplied/server/0646-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 1e4bc0d9f9d2e45157929af685f116988cbb8c03..8fdc9a3bb2f1b6bdc6c2c96f8ade7e9cd88ea4e0 100644
--- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java
-@@ -15,12 +15,18 @@ 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();
- 
-@@ -29,9 +35,9 @@ 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/0647-Add-basic-Datapack-API.patch
+++ b/patches/unapplied/server/0647-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..9b7dd8a0fba4547f5268b3f99e21ddbe6b5bf566
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/datapack/PaperDatapack.java
-@@ -0,0 +1,50 @@
-+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..cf4374493c11057451a62a655514415cf6b298e0
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/datapack/PaperDatapackManager.java
-@@ -0,0 +1,25 @@
-+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 6fa21f806567bc41bacd2949d7171979bc34ac6e..90b0673411d33f46ac959c31f0608c489d41c3bb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -281,6 +281,7 @@ 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 {
-@@ -362,6 +363,7 @@ public final class CraftServer implements Server {
-         TicketType.PLUGIN.timeout = Math.min(20, this.configuration.getInt("chunk-gc.period-in-ticks")); // Paper - cap plugin loads to 1 second
-         this.minimumAPI = this.configuration.getString("settings.minimum-api");
-         this.loadIcon();
-+        datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
-     }
- 
-     public boolean getCommandBlockOverride(String command) {
-@@ -2749,5 +2751,11 @@ 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/0648-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/unapplied/server/0648-Add-environment-variable-to-disable-server-gui.patch
@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Riley Park <riley.park@meino.net>
-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 11ed386c6358e55fe5c0e5e8496fa7f7c663a7e2..69dc1271be0a3f3f2fb4ce15981ed25d24dce785 100644
--- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -272,6 +272,7 @@ 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/0649-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/unapplied/server/0649-additions-to-PlayerGameModeChangeEvent.patch
@ -1,153 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 15 May 2021 10:04:43 -0700
-Subject: [PATCH] additions to PlayerGameModeChangeEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/commands/DefaultGameModeCommands.java b/src/main/java/net/minecraft/server/commands/DefaultGameModeCommands.java
-index d25a27f3a6775ca86092ea8bdeab4abdd8909d35..7d9ec435f3821f95d3bed893c4e46d5a2531cd58 100644
--- a/src/main/java/net/minecraft/server/commands/DefaultGameModeCommands.java
-+++ b/src/main/java/net/minecraft/server/commands/DefaultGameModeCommands.java
-@@ -31,9 +31,13 @@ public class DefaultGameModeCommands {
-         GameType gameType = minecraftServer.getForcedGameType();
-         if (gameType != null) {
-             for(ServerPlayer serverPlayer : minecraftServer.getPlayerList().getPlayers()) {
-                if (serverPlayer.setGameMode(gameType)) {
-                    ++i;
-+                // Paper start - extend PlayerGameModeChangeEvent
-+                org.bukkit.event.player.PlayerGameModeChangeEvent event = serverPlayer.setGameMode(gameType, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.DEFAULT_GAMEMODE, net.kyori.adventure.text.Component.empty());
-+                if (event != null && event.isCancelled()) {
-+                    source.sendSuccess(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.cancelMessage()), false);
-                 }
-+                // Paper end
-+                    ++i;
-             }
-         }
- 
-diff --git a/src/main/java/net/minecraft/server/commands/GameModeCommand.java b/src/main/java/net/minecraft/server/commands/GameModeCommand.java
-index d75f78d2e3fb1376e8f6a8668c98a04a693c99e1..79f6089b934124c3309c6bee2e48b36b937252e0 100644
--- a/src/main/java/net/minecraft/server/commands/GameModeCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/GameModeCommand.java
-@@ -52,9 +52,14 @@ public class GameModeCommand {
-         int i = 0;
- 
-         for(ServerPlayer serverPlayer : targets) {
-            if (serverPlayer.setGameMode(gameMode)) {
-+            // Paper start - extend PlayerGameModeChangeEvent
-+            org.bukkit.event.player.PlayerGameModeChangeEvent event = serverPlayer.setGameMode(gameMode, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.COMMAND, net.kyori.adventure.text.Component.empty());
-+            if (event != null && !event.isCancelled()) {
-                 logGamemodeChange(context.getSource(), serverPlayer, gameMode);
-                 ++i;
-+            } else if (event != null && event.cancelMessage() != null) {
-+                context.getSource().sendSuccess(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.cancelMessage()), true);
-+                // Paper end
-             }
-         }
- 
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c9d70d5d1b53fe92ca7d895f1ed0d82fe4b06dab..045729440899e59bd023b3e84ef11f4d6682d10b 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1809,8 +1809,15 @@ public class ServerPlayer extends Player {
-     }
- 
-     public boolean setGameMode(GameType gameMode) {
-        if (!this.gameMode.changeGameModeForPlayer(gameMode)) {
-            return false;
-+        // Paper start - Add cause and nullable message to event
-+        org.bukkit.event.player.PlayerGameModeChangeEvent event = this.setGameMode(gameMode, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.UNKNOWN, null);
-+        return event == null ? false : event.isCancelled();
-+    }
-+    public org.bukkit.event.player.PlayerGameModeChangeEvent setGameMode(GameType gameMode, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause cause, net.kyori.adventure.text.Component message) {
-+        org.bukkit.event.player.PlayerGameModeChangeEvent event = this.gameMode.changeGameModeForPlayer(gameMode, cause, message);
-+        if (event == null || event.isCancelled()) {
-+            // Paper end
-+            return null;
-         } else {
-             this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId()));
-             if (gameMode == GameType.SPECTATOR) {
-@@ -1822,7 +1829,7 @@ public class ServerPlayer extends Player {
- 
-             this.onUpdateAbilities();
-             this.updateEffectVisibility();
-            return true;
-+            return event; // Paper
-         }
-     }
- 
-@@ -2204,6 +2211,16 @@ public class ServerPlayer extends Player {
-     }
- 
-     public void loadGameTypes(@Nullable CompoundTag nbt) {
-+        // Paper start
-+        if (this.server.getForcedGameType() != null && this.server.getForcedGameType() != ServerPlayer.readPlayerMode(nbt, "playerGameType")) {
-+            if (new org.bukkit.event.player.PlayerGameModeChangeEvent(this.getBukkitEntity(), org.bukkit.GameMode.getByValue(this.server.getDefaultGameType().getId()), org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.DEFAULT_GAMEMODE, null).callEvent()) {
-+                this.gameMode.setGameModeForPlayer(this.server.getForcedGameType(), GameType.DEFAULT_MODE);
-+            } else {
-+                this.gameMode.setGameModeForPlayer(ServerPlayer.readPlayerMode(nbt,"playerGameType"), ServerPlayer.readPlayerMode(nbt, "previousPlayerGameType"));
-+            }
-+            return;
-+        }
-+        // Paper end
-         this.gameMode.setGameModeForPlayer(this.calculateGameModeForNewPlayer(ServerPlayer.readPlayerMode(nbt, "playerGameType")), ServerPlayer.readPlayerMode(nbt, "previousPlayerGameType"));
-     }
- 
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index f97d97426144527cff9ebb91b26fe8541a9c6d9b..b6eef41079120fffd63f06f681378b1b628b95e0 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -74,18 +74,24 @@ public class ServerPlayerGameMode {
-     }
- 
-     public boolean changeGameModeForPlayer(GameType gameMode) {
-+        // Paper end
-+        PlayerGameModeChangeEvent event = this.changeGameModeForPlayer(gameMode, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.UNKNOWN, null);
-+        return event == null ? false : event.isCancelled();
-+    }
-+    public PlayerGameModeChangeEvent changeGameModeForPlayer(GameType gameMode, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause cause, net.kyori.adventure.text.Component cancelMessage) {
-+        // Paper end
-         if (gameMode == this.gameModeForPlayer) {
-            return false;
-+            return null; // Paper
-         } else {
-             // CraftBukkit start
-            PlayerGameModeChangeEvent event = new PlayerGameModeChangeEvent(this.player.getBukkitEntity(), GameMode.getByValue(gameMode.getId()));
-+            PlayerGameModeChangeEvent event = new PlayerGameModeChangeEvent(this.player.getBukkitEntity(), GameMode.getByValue(gameMode.getId()), cause, cancelMessage); // Paper
-             this.level.getCraftServer().getPluginManager().callEvent(event);
-             if (event.isCancelled()) {
-                return false;
-+                return event; // Paper
-             }
-             // CraftBukkit end
-             this.setGameModeForPlayer(gameMode, this.gameModeForPlayer);
-            return true;
-+            return event; // Paper
-         }
-     }
- 
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f80a39acd2df8181523549d53664d7008638122d..4f7cd9209cf6c352817591dd497c2e7ec6265ac6 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2511,7 +2511,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
- 
-                     this.player = this.server.getPlayerList().respawn(this.player, false);
-                     if (this.server.isHardcore()) {
-                        this.player.setGameMode(GameType.SPECTATOR);
-+                        this.player.setGameMode(GameType.SPECTATOR, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.HARDCORE_DEATH, null); // Paper
-                         ((GameRules.BooleanValue) this.player.getLevel().getGameRules().getRule(GameRules.RULE_SPECTATORSGENERATECHUNKS)).set(false, this.server);
-                     }
-                 }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 047411e24a53c2e625c05b7079406060024e5dc9..e80268801518b1cbdec69a09ea571af0f2cf5492 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1380,7 +1380,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-             throw new IllegalArgumentException("Mode cannot be null");
-         }
- 
-        this.getHandle().setGameMode(GameType.byId(mode.getValue()));
-+        this.getHandle().setGameMode(GameType.byId(mode.getValue()), org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.PLUGIN, null); // Paper
-     }
- 
-     @Override
--- a/patches/unapplied/server/0650-ItemStack-repair-check-API.patch
+++ b/patches/unapplied/server/0650-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 209ad4d73e7ac0c76600a4c68d9473765f09c240..9a98097f2d6beb6e7125ac5a7a2d60747d143a36 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -537,6 +537,14 @@ 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..8d9c9b3bd53d407391d4fcb7fc773153d1a7b402
--- /dev/null
-+++ b/src/test/java/io/papermc/paper/util/ItemStackRepairCheckTest.java
-@@ -0,0 +1,48 @@
-+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/0651-More-Enchantment-API.patch
+++ b/patches/unapplied/server/0651-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 c536eceef3365a7b726cd970df345ba1d055207d..11c1eb0e0bc326b28dc0cab16f67c413cc52e98c 100644
--- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-+++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-@@ -71,7 +71,7 @@ public class CraftEnchantment extends Enchantment {
- 
-     @Override
-     public boolean isCursed() {
-        return this.target instanceof BindingCurseEnchantment || this.target instanceof VanishingCurseEnchantment;
-+        return this.target.isCurse(); // Paper
-     }
- 
-     @Override
-@@ -197,6 +197,45 @@ 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 6555db49ff57bba13a7eb3c0bf7ecb66d7828dce..8fe1f5deddfee329c020d93c990dc686fe2b458e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -867,5 +867,21 @@ 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..62b56b5b43696b03fc72cac59f986d006edc3f76
--- /dev/null
-+++ b/src/test/java/io/papermc/paper/enchantments/EnchantmentRarityTest.java
-@@ -0,0 +1,18 @@
-+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..b9824b1f9491304ceb91be18f4f3b3068526bb33
--- /dev/null
-+++ b/src/test/java/io/papermc/paper/entity/EntityCategoryTest.java
-@@ -0,0 +1,34 @@
-+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);
-+    }
-+}