some work

2023-09-21 15:01:00 -07:00 · 2023-09-21 15:01:00 -07:00 · a27262375c
commit a27262375c
parent c60dd35989
79 changed files with 311 additions and 304 deletions
--- a/patches/unapplied/server/0185-Make-legacy-ping-handler-more-reliable.patch
+++ b/patches/unapplied/server/0185-Make-legacy-ping-handler-more-reliable.patch
@ -1,168 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Minecrell <minecrell@minecrell.net>
-Date: Wed, 11 Oct 2017 18:22:50 +0200
-Subject: [PATCH] Make legacy ping handler more reliable
-
-The Minecraft server often fails to respond to old ("legacy") pings
-from old Minecraft versions using the protocol used before the switch
-to Netty in Minecraft 1.7.
-
-Due to packet fragmentation[1], we might not have all needed bytes
-available when the LegacyPingHandler is called. In this case, it will
-run into an error, remove the handler and continue using the modern
-protocol.
-
-This is unlikely to happen for the first two revisions of the legacy
-ping protocol (used in Minecraft 1.5.x and older) since the request
-consists of only one or two bytes, but happens frequently for the
-last/third revision introduced in Minecraft 1.6.
-
-It has much larger, variable packet sizes due to the inclusion of
-the virtual host (the hostname/port used to connect to the server).
-
-The solution[2] is simple: If we find more than two matching bytes,
-we buffer the remaining bytes until we have enough to fully read and
-respond to the request.
-
-[1]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h3-11
-[2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13
-
-diff --git a/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java b/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java
-index 5518a0efb65190732c88ca18a0bdf35316b8687c..d3311d1d4a5f7535f07116865ef0701d82bcbcbd 100644
--- a/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java
-+++ b/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java
-@@ -17,6 +17,7 @@ public class LegacyQueryHandler extends ChannelInboundHandlerAdapter {
-     private static final Logger LOGGER = LogUtils.getLogger();
-     public static final int FAKE_PROTOCOL_VERSION = 127;
-     private final ServerConnectionListener serverConnectionListener;
-+    private ByteBuf buf; // Paper
- 
-     public LegacyQueryHandler(ServerConnectionListener networkIo) {
-         this.serverConnectionListener = networkIo;
-@@ -25,6 +26,16 @@ public class LegacyQueryHandler extends ChannelInboundHandlerAdapter {
-     public void channelRead(ChannelHandlerContext channelhandlercontext, Object object) {
-         ByteBuf bytebuf = (ByteBuf) object;
- 
-+        // Paper start - Make legacy ping handler more reliable
-+        if (this.buf != null) {
-+            try {
-+                readLegacy1_6(channelhandlercontext, bytebuf);
-+            } finally {
-+                bytebuf.release();
-+            }
-+            return;
-+        }
-+        // Paper end
-         bytebuf.markReaderIndex();
-         boolean flag = true;
- 
-@@ -55,6 +66,10 @@ public class LegacyQueryHandler extends ChannelInboundHandlerAdapter {
-                     this.sendFlushAndClose(channelhandlercontext, this.createReply(s));
-                     break;
-                 default:
-+                // Paper start - Replace with improved version below
-+                if (bytebuf.readUnsignedByte() != 0x01 || bytebuf.readUnsignedByte() != 0xFA) return;
-+                readLegacy1_6(channelhandlercontext, bytebuf);
-+                /*
-                     boolean flag1 = bytebuf.readUnsignedByte() == 1;
- 
-                     flag1 &= bytebuf.readUnsignedByte() == 250;
-@@ -78,6 +93,7 @@ public class LegacyQueryHandler extends ChannelInboundHandlerAdapter {
-                     } finally {
-                         bytebuf1.release();
-                     }
-+                */ // Paper end - Replace with improved version below
-             }
- 
-             bytebuf.release();
-@@ -95,6 +111,90 @@ public class LegacyQueryHandler extends ChannelInboundHandlerAdapter {
- 
-     }
- 
-+    // Paper start
-+    private static String readLegacyString(ByteBuf buf) {
-+        int size = buf.readShort() * Character.BYTES;
-+        if (!buf.isReadable(size)) {
-+            return null;
-+        }
-+
-+        String result = buf.toString(buf.readerIndex(), size, StandardCharsets.UTF_16BE);
-+        buf.skipBytes(size); // toString doesn't increase readerIndex automatically
-+        return result;
-+    }
-+
-+    private void readLegacy1_6(ChannelHandlerContext ctx, ByteBuf part) {
-+        ByteBuf buf = this.buf;
-+
-+        if (buf == null) {
-+            this.buf = buf = ctx.alloc().buffer();
-+            buf.markReaderIndex();
-+        } else {
-+            buf.resetReaderIndex();
-+        }
-+
-+        buf.writeBytes(part);
-+
-+        if (!buf.isReadable(Short.BYTES + Short.BYTES + Byte.BYTES + Short.BYTES + Integer.BYTES)) {
-+            return;
-+        }
-+
-+        String s = readLegacyString(buf);
-+        if (s == null) {
-+            return;
-+        }
-+
-+        if (!s.equals("MC|PingHost")) {
-+            removeHandler(ctx);
-+            return;
-+        }
-+
-+        if (!buf.isReadable(Short.BYTES) || !buf.isReadable(buf.readShort())) {
-+            return;
-+        }
-+
-+        MinecraftServer server = this.serverConnectionListener.getServer();
-+        int protocolVersion = buf.readByte();
-+        String host = readLegacyString(buf);
-+        if (host == null) {
-+            removeHandler(ctx);
-+            return;
-+        }
-+        int port = buf.readInt();
-+
-+        if (buf.isReadable()) {
-+            removeHandler(ctx);
-+            return;
-+        }
-+
-+        buf.release();
-+        this.buf = null;
-+
-+        LOGGER.debug("Ping: (1.6) from {}", ctx.channel().remoteAddress());
-+
-+        String response = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d",
-+                Byte.MAX_VALUE, server.getServerVersion(), server.getMotd(), server.getPlayerCount(), server.getMaxPlayers());
-+        this.sendFlushAndClose(ctx, this.createReply(response));
-+    }
-+
-+    private void removeHandler(ChannelHandlerContext ctx) {
-+        ByteBuf buf = this.buf;
-+        this.buf = null;
-+
-+        buf.resetReaderIndex();
-+        ctx.pipeline().remove(this);
-+        ctx.fireChannelRead(buf);
-+    }
-+
-+    @Override
-+    public void handlerRemoved(ChannelHandlerContext ctx) {
-+        if (this.buf != null) {
-+            this.buf.release();
-+            this.buf = null;
-+        }
-+    }
-+    // Paper end
-+
-     private void sendFlushAndClose(ChannelHandlerContext ctx, ByteBuf buf) {
-         ctx.pipeline().firstContext().writeAndFlush(buf).addListener(ChannelFutureListener.CLOSE);
-     }
--- a/patches/unapplied/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/patches/unapplied/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch
@ -1,150 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Minecrell <minecrell@minecrell.net>
-Date: Wed, 11 Oct 2017 19:30:51 +0200
-Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..cc54b1c207981235b5160e8773b27cf9a5dcd4d5
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
-@@ -0,0 +1,75 @@
-+package com.destroystokyo.paper.network;
-+
-+import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
-+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-+import net.minecraft.ChatFormatting;
-+import net.minecraft.server.MinecraftServer;
-+import org.apache.commons.lang3.StringUtils;
-+
-+import java.net.InetSocketAddress;
-+
-+import javax.annotation.Nullable;
-+
-+public final class PaperLegacyStatusClient implements StatusClient {
-+
-+    private final InetSocketAddress address;
-+    private final int protocolVersion;
-+    @Nullable private final InetSocketAddress virtualHost;
-+
-+    private PaperLegacyStatusClient(InetSocketAddress address, int protocolVersion, @Nullable InetSocketAddress virtualHost) {
-+        this.address = address;
-+        this.protocolVersion = protocolVersion;
-+        this.virtualHost = virtualHost;
-+    }
-+
-+    @Override
-+    public InetSocketAddress getAddress() {
-+        return this.address;
-+    }
-+
-+    @Override
-+    public int getProtocolVersion() {
-+        return this.protocolVersion;
-+    }
-+
-+    @Nullable
-+    @Override
-+    public InetSocketAddress getVirtualHost() {
-+        return this.virtualHost;
-+    }
-+
-+    @Override
-+    public boolean isLegacy() {
-+        return true;
-+    }
-+
-+    public static PaperServerListPingEvent processRequest(MinecraftServer server,
-+            InetSocketAddress address, int protocolVersion, @Nullable InetSocketAddress virtualHost) {
-+
-+        PaperServerListPingEvent event =  new PaperServerListPingEventImpl(server,
-+                new PaperLegacyStatusClient(address, protocolVersion, virtualHost), Byte.MAX_VALUE, null);
-+        server.server.getPluginManager().callEvent(event);
-+
-+        if (event.isCancelled()) {
-+            return null;
-+        }
-+
-+        return event;
-+    }
-+
-+    @SuppressWarnings("deprecation") // Valid as this is the legacy status client
-+    public static String getMotd(PaperServerListPingEvent event) {
-+        return getFirstLine(event.getMotd());
-+    }
-+
-+    public static String getUnformattedMotd(PaperServerListPingEvent event) {
-+        // Strip color codes and all other occurrences of the color char (because it's used as delimiter)
-+        return getFirstLine(StringUtils.remove(PlainTextComponentSerializer.plainText().serialize(event.motd()), ChatFormatting.PREFIX_CODE));
-+    }
-+
-+    private static String getFirstLine(String s) {
-+        int pos = s.indexOf('\n');
-+        return pos >= 0 ? s.substring(0, pos) : s;
-+    }
-+
-+}
-diff --git a/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java b/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java
-index d3311d1d4a5f7535f07116865ef0701d82bcbcbd..21393ad40095a4049e5b6871169b2db7aa92d13c 100644
--- a/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java
-+++ b/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java
-@@ -48,13 +48,21 @@ public class LegacyQueryHandler extends ChannelInboundHandlerAdapter {
-             MinecraftServer minecraftserver = this.serverConnectionListener.getServer();
-             int i = bytebuf.readableBytes();
-             String s;
-            org.bukkit.event.server.ServerListPingEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callServerListPingEvent(minecraftserver.server, inetsocketaddress.getAddress(), minecraftserver.getMotd(), minecraftserver.getPlayerCount(), minecraftserver.getMaxPlayers()); // CraftBukkit
-+            //org.bukkit.event.server.ServerListPingEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callServerListPingEvent(minecraftserver.server, inetsocketaddress.getAddress(), minecraftserver.getMotd(), minecraftserver.getPlayerCount(), minecraftserver.getMaxPlayers()); // CraftBukkit // Paper
-+            com.destroystokyo.paper.event.server.PaperServerListPingEvent event; // Paper
- 
-             switch (i) {
-                 case 0:
-                     LegacyQueryHandler.LOGGER.debug("Ping: (<1.3.x) from {}:{}", inetsocketaddress.getAddress(), inetsocketaddress.getPort());
-                    s = String.format(Locale.ROOT, "%s\u00a7%d\u00a7%d", event.getMotd(), event.getNumPlayers(), event.getMaxPlayers()); // CraftBukkit
-+                    // Paper start - Call PaperServerListPingEvent and use results
-+                    event = com.destroystokyo.paper.network.PaperLegacyStatusClient.processRequest(minecraftserver, inetsocketaddress, 39, null);
-+                    if (event == null) {
-+                        channelhandlercontext.close();
-+                        break;
-+                    }
-+                    s = String.format(Locale.ROOT, "%s\u00a7%d\u00a7%d", com.destroystokyo.paper.network.PaperLegacyStatusClient.getUnformattedMotd(event), event.getNumPlayers(), event.getMaxPlayers());
-                     this.sendFlushAndClose(channelhandlercontext, this.createReply(s));
-+                    // Paper end
-                     break;
-                 case 1:
-                     if (bytebuf.readUnsignedByte() != 1) {
-@@ -62,7 +70,14 @@ public class LegacyQueryHandler extends ChannelInboundHandlerAdapter {
-                     }
- 
-                     LegacyQueryHandler.LOGGER.debug("Ping: (1.4-1.5.x) from {}:{}", inetsocketaddress.getAddress(), inetsocketaddress.getPort());
-                    s = String.format(Locale.ROOT, "\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, minecraftserver.getServerVersion(), event.getMotd(), event.getNumPlayers(), event.getMaxPlayers()); // CraftBukkit
-+                    // Paper start - Call PaperServerListPingEvent and use results
-+                    event = com.destroystokyo.paper.network.PaperLegacyStatusClient.processRequest(minecraftserver, inetsocketaddress, 127, null); // Paper
-+                    if (event == null) {
-+                        channelhandlercontext.close();
-+                        break;
-+                    }
-+                    s = String.format(Locale.ROOT, "\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", new Object[] { event.getProtocolVersion(), minecraftserver.getServerVersion(), event.getMotd(), event.getNumPlayers(), event.getMaxPlayers()}); // CraftBukkit
-+                    // Paper end
-                     this.sendFlushAndClose(channelhandlercontext, this.createReply(s));
-                     break;
-                 default:
-@@ -172,8 +187,16 @@ public class LegacyQueryHandler extends ChannelInboundHandlerAdapter {
- 
-         LOGGER.debug("Ping: (1.6) from {}", ctx.channel().remoteAddress());
- 
-        String response = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d",
-                Byte.MAX_VALUE, server.getServerVersion(), server.getMotd(), server.getPlayerCount(), server.getMaxPlayers());
-+        InetSocketAddress virtualHost = com.destroystokyo.paper.network.PaperNetworkClient.prepareVirtualHost(host, port);
-+        com.destroystokyo.paper.event.server.PaperServerListPingEvent event = com.destroystokyo.paper.network.PaperLegacyStatusClient.processRequest(
-+                server, (InetSocketAddress) ctx.channel().remoteAddress(), protocolVersion, virtualHost);
-+        if (event == null) {
-+            ctx.close();
-+            return;
-+        }
-+
-+        String response = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", event.getProtocolVersion(), event.getVersion(),
-+            com.destroystokyo.paper.network.PaperLegacyStatusClient.getMotd(event), event.getNumPlayers(), event.getMaxPlayers());
-         this.sendFlushAndClose(ctx, this.createReply(response));
-     }
- 
--- a/patches/unapplied/server/0187-Flag-to-disable-the-channel-limit.patch
+++ b/patches/unapplied/server/0187-Flag-to-disable-the-channel-limit.patch
@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sat, 31 Mar 2018 17:04:26 +0100
-Subject: [PATCH] Flag to disable the channel limit
-
-In some enviroments, the channel limit set by spigot can cause issues,
-e.g. servers which allow and support the usage of mod packs.
-
-provide an optional flag to disable this check, at your own risk.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c48205d83eff82decf73724a315d2a9265d197e4..0868e977d356a1e3b5c49c9c788d8e3d0cb85c84 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -192,6 +192,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     // Paper start
-     private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
-     private String resourcePackHash;
-+    private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
-     // Paper end
- 
-     public CraftPlayer(CraftServer server, ServerPlayer entity) {
-@@ -2078,7 +2079,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     // Paper end
- 
-     public void addChannel(String channel) {
-        Preconditions.checkState(this.channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel);
-+        Preconditions.checkState(DISABLE_CHANNEL_LIMIT || this.channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel); // Paper - flag to disable channel limit
-         channel = StandardMessenger.validateAndCorrectChannel(channel);
-         if (this.channels.add(channel)) {
-             server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
--- a/patches/unapplied/server/0188-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/unapplied/server/0188-Add-openSign-method-to-HumanEntity.patch
@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
-Date: Sun, 1 Apr 2018 02:29:37 +0300
-Subject: [PATCH] Add openSign method 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 2f5704b19148f390402c0823030806ba96860286..74f1af3dccddf52965e5c91277be3592649e8cfa 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -626,6 +626,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
-         }
-     }
-
-+    // Paper start - move open sign method to HumanEntity
-+    @Override
-+    public void openSign(final org.bukkit.block.Sign sign, final org.bukkit.block.sign.Side side) {
-+        org.bukkit.craftbukkit.block.CraftSign.openSign(sign, (CraftPlayer) this, side);
-+    }
-+    // Paper end
-     @Override
-     public boolean dropItem(boolean dropAll) {
-         if (!(this.getHandle() instanceof ServerPlayer)) return false;
--- a/patches/unapplied/server/0189-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/unapplied/server/0189-Configurable-sprint-interruption-on-attack.patch
@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Brokkonaut <hannos17@gmx.de>
-Date: Sat, 14 Apr 2018 20:20:46 +0200
-Subject: [PATCH] Configurable sprint interruption on attack
-
-If the sprint interruption is disabled players continue sprinting when they attack entities.
-
-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 a668a62da9fb7fc013f078c030580b13a62db3ca..10dd06a23b34b7c8515c9ccc3988a9e8182c460d 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1290,7 +1290,11 @@ public abstract class Player extends LivingEntity {
-                             }
-
-                             this.setDeltaMovement(this.getDeltaMovement().multiply(0.6D, 1.0D, 0.6D));
-                            this.setSprinting(false);
-+                            // Paper start - Configuration option to disable automatic sprint interruption
-+                            if (!this.level().paperConfig().misc.disableSprintInterruptionOnAttack) {
-+                                this.setSprinting(false);
-+                            }
-+                            // Paper end
-                         }
-
-                         if (flag3) {
--- a/patches/unapplied/server/0190-EndermanEscapeEvent.patch
+++ b/patches/unapplied/server/0190-EndermanEscapeEvent.patch
@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 30 Apr 2018 13:15:55 -0400
-Subject: [PATCH] EndermanEscapeEvent
-
-Fires an event anytime an enderman intends to teleport away from the player
-
-You may cancel this, enabling ranged attacks to damage the enderman for example.
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 084a9bb8ca0ec57fad1efbc540e4b58eacb61970..d2dd4537f8a81d02a4d3570834549d7e27b749b9 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -122,6 +122,12 @@ public class EnderMan extends Monster implements NeutralMob {
-         this.setTarget(target, EntityTargetEvent.TargetReason.UNKNOWN, true);
-     }
-
-+    // Paper start
-+    private boolean tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason reason) {
-+        return new com.destroystokyo.paper.event.entity.EndermanEscapeEvent((org.bukkit.craftbukkit.entity.CraftEnderman) this.getBukkitEntity(), reason).callEvent();
-+    }
-+    // Paper end
-+
-     @Override
-     public boolean setTarget(LivingEntity entityliving, EntityTargetEvent.TargetReason reason, boolean fireEvent) {
-         if (!super.setTarget(entityliving, reason, fireEvent)) {
-@@ -276,7 +282,7 @@ public class EnderMan extends Monster implements NeutralMob {
-         if (this.level().isDay() && this.tickCount >= this.targetChangeTime + 600) {
-             float f = this.getLightLevelDependentMagicValue();
-
-            if (f > 0.5F && this.level().canSeeSky(this.blockPosition()) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F) {
-+            if (f > 0.5F && this.level().canSeeSky(this.blockPosition()) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F && this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.RUNAWAY)) { // Paper
-                 this.setTarget((LivingEntity) null);
-                 this.teleport();
-             }
-@@ -402,11 +408,13 @@ public class EnderMan extends Monster implements NeutralMob {
-             } else {
-                 flag1 = flag && this.hurtWithCleanWater(source, (ThrownPotion) source.getDirectEntity(), amount);
-
-+                if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
-                 for (int i = 0; i < 64; ++i) {
-                     if (this.teleport()) {
-                         return true;
-                     }
-                 }
-+                } // Paper end
-
-                 return flag1;
-             }
-@@ -633,7 +641,7 @@ public class EnderMan extends Monster implements NeutralMob {
-             } else {
-                 if (this.target != null && !this.enderman.isPassenger()) {
-                     if (this.enderman.isLookingAtMe((Player) this.target)) {
-                        if (this.target.distanceToSqr((Entity) this.enderman) < 16.0D) {
-+                        if (this.target.distanceToSqr((Entity) this.enderman) < 16.0D && this.enderman.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.STARE)) { // Paper
-                             this.enderman.teleport();
-                         }
-
--- a/patches/unapplied/server/0191-Enderman.teleportRandomly.patch
+++ b/patches/unapplied/server/0191-Enderman.teleportRandomly.patch
@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 30 Apr 2018 13:29:44 -0400
-Subject: [PATCH] Enderman.teleportRandomly()
-
-Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-index 0e13edd23016a6ffe6492de322e1d675137e3c9e..cb161c3d1a08d9c143201040018664298e98eafe 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-@@ -17,6 +17,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
-         super(server, entity);
-     }
-
-+    @Override public boolean teleportRandomly() { return getHandle().teleport(); } // Paper
-     @Override
-     public MaterialData getCarriedMaterial() {
-         BlockState blockData = this.getHandle().getCarriedBlock();
--- a/patches/unapplied/server/0192-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/unapplied/server/0192-Block-Enderpearl-Travel-Exploit.patch
@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 30 Apr 2018 17:15:26 -0400
-Subject: [PATCH] Block Enderpearl Travel Exploit
-
-Players are able to use alt accounts and enderpearls to travel
-long distances utilizing the pearls in unloaded chunks and loading
-the chunk later when convenient.
-
-This disables that by not saving the thrower when the chunk is unloaded.
-
-This is mainly useful for survival servers that do not allow freeform teleporting.
-
-== AT ==
-public net.minecraft.world.entity.projectile.Projectile cachedOwner
-public net.minecraft.world.entity.projectile.Projectile ownerUUID
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 17d9c5a6c357ac5e3eacd9e4d2cff9a05ec0f262..f2eefdeab44ad4f7c0abd0e55e688e74a83abfff 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2327,6 +2327,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
-
-         public void onTickingEnd(Entity entity) {
-             ServerLevel.this.entityTickList.remove(entity);
-+            // Paper start - Reset pearls when they stop being ticked
-+            if (paperConfig().fixes.disableUnloadedChunkEnderpearlExploit && entity instanceof net.minecraft.world.entity.projectile.ThrownEnderpearl pearl) {
-+                pearl.cachedOwner = null;
-+                pearl.ownerUUID = null;
-+            }
-+            // Paper end
-         }
-
-         public void onTrackingStart(Entity entity) {
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index b4a37d11e381d08c82945966ee5f969364f6e3ee..e9ae25a70c747c173ebd2e393818d205527d5314 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -92,6 +92,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
-         if (nbt.hasUUID("Owner")) {
-             this.ownerUUID = nbt.getUUID("Owner");
-             this.cachedOwner = null;
-+            if (this instanceof ThrownEnderpearl && this.level() != null && this.level().paperConfig().fixes.disableUnloadedChunkEnderpearlExploit) { this.ownerUUID = null; } // Paper - Don't store shooter name for pearls to block enderpearl travel exploit
-         }
-
-         this.leftOwner = nbt.getBoolean("LeftOwner");
--- a/patches/unapplied/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/unapplied/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
@ -1,59 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 15 Aug 2017 22:29:12 -0400
-Subject: [PATCH] Expand World.spawnParticle API and add Builder
-
-Adds ability to control who receives it and who is the source/sender (vanish API)
-the standard API is to send the packet to everyone in the world, which is ineffecient.
-Adds an option to control the force mode of the particle.
-
-This adds a new Builder API which is much friendlier to use.
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f2eefdeab44ad4f7c0abd0e55e688e74a83abfff..68257f257dd3b167e237482c8d149590103896b2 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1717,12 +1717,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
-     }
-
-     public <T extends ParticleOptions> int sendParticles(ServerPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) {
-+        // Paper start - Particle API Expansion
-+        return sendParticles(players, sender, t0, d0, d1, d2, i, d3, d4, d5, d6, force);
-+    }
-+    public <T extends ParticleOptions> int sendParticles(List<ServerPlayer> receivers, ServerPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) {
-+        // Paper end
-         ClientboundLevelParticlesPacket packetplayoutworldparticles = new ClientboundLevelParticlesPacket(t0, force, d0, d1, d2, (float) d3, (float) d4, (float) d5, (float) d6, i);
-         // CraftBukkit end
-         int j = 0;
-
-        for (int k = 0; k < this.players.size(); ++k) {
-            ServerPlayer entityplayer = (ServerPlayer) this.players.get(k);
-+        for (Player entityhuman : receivers) { // Paper - Particle API Expansion
-+            ServerPlayer entityplayer = (ServerPlayer) entityhuman; // Paper - Particle API Expansion
-             if (sender != null && !entityplayer.getBukkitEntity().canSee(sender.getBukkitEntity())) continue; // CraftBukkit
-
-             if (this.sendParticles(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d348ca56ae452dc80d5dabe874d9f8d72970fc4d..0476f00719d180d28a2a4bab3f4152b00a1e4e67 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1863,11 +1863,17 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-
-     @Override
-     public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
-        if (data != null) {
-+        // Paper start - Particle API Expansion
-+        spawnParticle(particle, null, null, x, y, z, count, offsetX, offsetY, offsetZ, extra, data, force);
-+    }
-+    public <T> void spawnParticle(Particle particle, List<Player> receivers, Player sender, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
-+        // Paper end
-+        if (data != null && !particle.getDataType().isInstance(data)) {
-             Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
-         }
-         this.getHandle().sendParticles(
-                null, // Sender
-+                receivers == null ? getHandle().players() : receivers.stream().map(player -> ((CraftPlayer) player).getHandle()).collect(java.util.stream.Collectors.toList()), // Paper -  Particle API Expansion
-+                sender != null ? ((CraftPlayer) sender).getHandle() : null, // Sender // Paper - Particle API Expansion
-                 CraftParticle.toNMS(particle, data), // Particle
-                 x, y, z, // Position
-                 count,  // Count
--- a/patches/unapplied/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/unapplied/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: 0x22 <0x22@futureclient.net>
-Date: Thu, 26 Apr 2018 04:41:11 -0400
-Subject: [PATCH] Fix exploit that allowed colored signs to be created
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 5bd28e1f475aeadaa626a4e9e9e2a1b3a28675f4..148ea4089c4f67894b28e21e961a661a2d291925 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-@@ -203,9 +203,9 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
-             Style chatmodifier = signtext.getMessage(i, entityhuman.isTextFilteringEnabled()).getStyle();
-
-             if (entityhuman.isTextFilteringEnabled()) {
-                signtext = signtext.setMessage(i, Component.literal(filteredtext.filteredOrEmpty()).setStyle(chatmodifier));
-+                signtext = signtext.setMessage(i, Component.literal(net.minecraft.SharedConstants.filterText(filteredtext.filteredOrEmpty())).setStyle(chatmodifier)); // Paper - filter sign text to chat only
-             } else {
-                signtext = signtext.setMessage(i, Component.literal(filteredtext.raw()).setStyle(chatmodifier), Component.literal(filteredtext.filteredOrEmpty()).setStyle(chatmodifier));
-+                signtext = signtext.setMessage(i, Component.literal(net.minecraft.SharedConstants.filterText(filteredtext.raw())).setStyle(chatmodifier), Component.literal(net.minecraft.SharedConstants.filterText(filteredtext.filteredOrEmpty())).setStyle(chatmodifier)); // Paper - filter sign text to chat only
-             }
-         }
-
--- a/patches/unapplied/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/patches/unapplied/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 10 Mar 2018 16:33:15 -0500
-Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks
-
-1.17: Shouldn't be needed as blocks no longer tick without at least 1 radius chunk loaded.
-
-diff --git a/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java b/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java
-index 331b642c36af97f7f05bd63f96d42d1af443e5a3..a3af96b2518b41f370d09cfda26dc589b9ee977b 100644
--- a/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java
-@@ -38,7 +38,8 @@ public class FrostedIceBlock extends IceBlock {
-
-             for(Direction direction : Direction.values()) {
-                 mutableBlockPos.setWithOffset(pos, direction);
-                BlockState blockState = world.getBlockState(mutableBlockPos);
-+                BlockState blockState = world.getBlockStateIfLoaded(mutableBlockPos); // Paper
-+                if (blockState == null) { continue; } // Paper
-                 if (blockState.is(this) && !this.slightlyMelt(blockState, world, mutableBlockPos)) {
-                     world.scheduleTick(mutableBlockPos, this, Mth.nextInt(random, world.paperConfig().environment.frostedIce.delay.min, world.paperConfig().environment.frostedIce.delay.max)); // Paper - use configurable min/max delay
-                 }
-@@ -75,7 +76,10 @@ public class FrostedIceBlock extends IceBlock {
-
-         for(Direction direction : Direction.values()) {
-             mutableBlockPos.setWithOffset(pos, direction);
-            if (world.getBlockState(mutableBlockPos).is(this)) {
-+            // Paper start
-+            BlockState blockState = world.getBlockStateIfLoaded(mutableBlockPos);
-+            if (blockState != null && blockState.is(this)) {
-+                // Paper end
-                 ++i;
-                 if (i >= maxNeighbors) {
-                     return false;
--- a/patches/unapplied/server/0196-EndermanAttackPlayerEvent.patch
+++ b/patches/unapplied/server/0196-EndermanAttackPlayerEvent.patch
@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 1 May 2018 20:18:54 -0400
-Subject: [PATCH] EndermanAttackPlayerEvent
-
-Allow control over whether or not an enderman aggros a player.
-
-This allows you to override/extend the pumpkin/stare logic.
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index d2dd4537f8a81d02a4d3570834549d7e27b749b9..06a0a06f3f4ed20f151ddac35ae7d56852e191ae 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -234,7 +234,15 @@ public class EnderMan extends Monster implements NeutralMob {
-         this.readPersistentAngerSaveData(this.level(), nbt);
-     }
-
-    boolean isLookingAtMe(Player player) {
-+    // Paper start - EndermanAttackPlayerEvent
-+    private boolean isLookingAtMe(Player player) {
-+        boolean shouldAttack = isLookingAtMe_check(player);
-+        com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent event = new com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent((org.bukkit.entity.Enderman) getBukkitEntity(), (org.bukkit.entity.Player) player.getBukkitEntity());
-+        event.setCancelled(!shouldAttack);
-+        return event.callEvent();
-+    }
-+    private boolean isLookingAtMe_check(Player player) {
-+        // Paper end
-         ItemStack itemstack = (ItemStack) player.getInventory().armor.get(3);
-
-         if (itemstack.is(Blocks.CARVED_PUMPKIN.asItem())) {
--- a/patches/unapplied/server/0197-WitchConsumePotionEvent.patch
+++ b/patches/unapplied/server/0197-WitchConsumePotionEvent.patch
@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 16 May 2018 20:35:16 -0400
-Subject: [PATCH] WitchConsumePotionEvent
-
-Fires when a witch consumes the potion in their hand
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index 112c4f203e2c1e3b1e0259e687ee2293c0132953..6a6b8672e65212dc2a1d837563d623b8bce8da28 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-@@ -124,7 +124,11 @@ public class Witch extends Raider implements RangedAttackMob {
-
-                     this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
-                     if (itemstack.is(Items.POTION)) {
-                        List<MobEffectInstance> list = PotionUtils.getMobEffects(itemstack);
-+                        // Paper start
-+                        com.destroystokyo.paper.event.entity.WitchConsumePotionEvent event = new com.destroystokyo.paper.event.entity.WitchConsumePotionEvent((org.bukkit.entity.Witch) this.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack));
-+
-+                        List<MobEffectInstance> list = event.callEvent() ? PotionUtils.getMobEffects(org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getPotion())) : null;
-+                        // Paper end
-
-                         if (list != null) {
-                             Iterator iterator = list.iterator();
--- a/patches/unapplied/server/0198-WitchThrowPotionEvent.patch
+++ b/patches/unapplied/server/0198-WitchThrowPotionEvent.patch
@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 16 May 2018 20:44:58 -0400
-Subject: [PATCH] WitchThrowPotionEvent
-
-Fired when a witch throws a potion at a player
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index 6a6b8672e65212dc2a1d837563d623b8bce8da28..0341a1cf05865f1a182a25adc5651f80ae09290a 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-@@ -236,9 +236,16 @@ public class Witch extends Raider implements RangedAttackMob {
-                 potionregistry = Potions.WEAKNESS;
-             }
-
-+            // Paper start
-+            ItemStack potion = PotionUtils.setPotion(new ItemStack(Items.SPLASH_POTION), potionregistry);
-+            com.destroystokyo.paper.event.entity.WitchThrowPotionEvent event = new com.destroystokyo.paper.event.entity.WitchThrowPotionEvent((org.bukkit.entity.Witch) this.getBukkitEntity(), (org.bukkit.entity.LivingEntity) target.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(potion));
-+            if (!event.callEvent()) {
-+                return;
-+            }
-+            potion = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getPotion());
-             ThrownPotion entitypotion = new ThrownPotion(this.level(), this);
-
-            entitypotion.setItem(PotionUtils.setPotion(new ItemStack(Items.SPLASH_POTION), potionregistry));
-+            entitypotion.setItem(potion);
-+            // Paper end
-             entitypotion.setXRot(entitypotion.getXRot() - -20.0F);
-             entitypotion.shoot(d0, d1 + d3 * 0.2D, d2, 0.75F, 8.0F);
-             if (!this.isSilent()) {
--- a/patches/unapplied/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/patches/unapplied/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 4 Jun 2018 20:39:20 -0400
-Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
-
-This API has more capabilities than .dropItem with the Consumer function
-
-Item can be set inside of the Consumer pre spawn function.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 3dd759d030411420f93eb5ac51f2087ecbf2dc49..91fbc67eefea473211b99e4338f6464f58dc5592 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -592,6 +592,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
-                 entity = net.minecraft.world.entity.EntityType.BOAT.create(world);
-             }
-             entity.moveTo(x, y, z, yaw, pitch);
-+            // Paper start
-+        } else if (org.bukkit.entity.Item.class.isAssignableFrom(clazz)) {
-+            entity = new net.minecraft.world.entity.item.ItemEntity(world, x, y, z, new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.DIRT));
-+            // Paper end
-         } else if (FallingBlock.class.isAssignableFrom(clazz)) {
-             BlockPos pos = BlockPos.containing(x, y, z);
-             entity = FallingBlockEntity.fall(world, pos, this.getHandle().getBlockState(pos));
--- a/patches/unapplied/server/0200-WitchReadyPotionEvent.patch
+++ b/patches/unapplied/server/0200-WitchReadyPotionEvent.patch
@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 5 Jun 2018 22:47:26 -0400
-Subject: [PATCH] WitchReadyPotionEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index 0341a1cf05865f1a182a25adc5651f80ae09290a..df024c3108df807772fc487f5c59004a59938bf2 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-@@ -157,7 +157,11 @@ public class Witch extends Raider implements RangedAttackMob {
-                 }
- 
-                 if (potionregistry != null) {
-                    this.setItemSlot(EquipmentSlot.MAINHAND, PotionUtils.setPotion(new ItemStack(Items.POTION), potionregistry));
-+                    // Paper start
-+                    ItemStack potion = PotionUtils.setPotion(new ItemStack(Items.POTION), potionregistry);
-+                    org.bukkit.inventory.ItemStack bukkitStack = com.destroystokyo.paper.event.entity.WitchReadyPotionEvent.process((org.bukkit.entity.Witch) this.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(potion));
-+                    this.setItemSlot(EquipmentSlot.MAINHAND, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(bukkitStack));
-+                    // Paper end
-                     this.usingTime = this.getMainHandItem().getUseDuration();
-                     this.setUsingItem(true);
-                     if (!this.isSilent()) {
--- a/patches/unapplied/server/0201-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/unapplied/server/0201-ItemStack-getMaxItemUseDuration.patch
@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 5 Jun 2018 23:00:29 -0400
-Subject: [PATCH] ItemStack#getMaxItemUseDuration
-
-Allows you to determine how long it takes to use a usable/consumable item
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 4dcbd1ed61070c12adf5871a595875ca60110c5d..00bdaff22deab7a9f328670917fe2bae01e37a73 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -184,6 +184,13 @@ public final class CraftItemStack extends ItemStack {
-         return (this.handle == null) ? Material.AIR.getMaxStackSize() : this.handle.getItem().getMaxStackSize();
-     }
- 
-+    // Paper start
-+    @Override
-+    public int getMaxItemUseDuration() {
-+        return handle == null ? 0 : handle.getUseDuration();
-+    }
-+    // Paper end
-+
-     @Override
-     public void addUnsafeEnchantment(Enchantment ench, int level) {
-         Preconditions.checkArgument(ench != null, "Enchantment cannot be null");
--- a/patches/unapplied/server/0202-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/server/0202-Implement-EntityTeleportEndGatewayEvent.patch
@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sat, 9 Jun 2018 14:08:39 +0200
-Subject: [PATCH] Implement EntityTeleportEndGatewayEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 020314dded2c6305bd5e9013b108bc74be25ccc1..85914124014b4e6f0a561cf560918af68682b6f5 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-@@ -224,9 +224,20 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
- 
-                 }
-                 // CraftBukkit end
-+                // Paper start - EntityTeleportEndGatewayEvent
-+                org.bukkit.Location location = new org.bukkit.Location(world.getWorld(), blockposition1.getX() + 0.5D, blockposition1.getY(), blockposition1.getZ() + 0.5D);
-+                location.setPitch(entity1.getXRot());
-+                location.setYaw(entity1.getBukkitYaw());
-+
-+                org.bukkit.entity.Entity bukkitEntity = entity1.getBukkitEntity();
-+                com.destroystokyo.paper.event.entity.EntityTeleportEndGatewayEvent event = new com.destroystokyo.paper.event.entity.EntityTeleportEndGatewayEvent(bukkitEntity, bukkitEntity.getLocation(), location, new org.bukkit.craftbukkit.block.CraftEndGateway(world.getWorld(), blockEntity));
-+                if (!event.callEvent()) {
-+                    return;
-+                }
-+                // Paper end
- 
-                 entity1.setPortalCooldown();
-                entity1.teleportToWithTicket((double) blockposition1.getX() + 0.5D, (double) blockposition1.getY(), (double) blockposition1.getZ() + 0.5D); // Paper - diff on change
-+                entity1.teleportToWithTicket(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ()); // Paper
-             }
- 
-             TheEndGatewayBlockEntity.triggerCooldown(world, pos, state, blockEntity);
--- a/patches/unapplied/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/unapplied/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 10 Jun 2018 01:18:49 -0400
-Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
-
-Otherwise the creeper infinite explodes
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 6594d501f51d18f5850999cceb9febfe206ec596..17ce05e7f9d2615be28a095ef6d3126885df8771 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -278,6 +278,7 @@ public class Creeper extends Monster implements PowerableMob {
-             // CraftBukkit start
-             } else {
-                 this.swell = 0;
-+                this.entityData.set(DATA_IS_IGNITED, Boolean.valueOf(false)); // Paper
-             }
-             // CraftBukkit end
-         }
--- a/patches/unapplied/server/0204-Fix-CraftEntity-hashCode.patch
+++ b/patches/unapplied/server/0204-Fix-CraftEntity-hashCode.patch
@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 10 Jun 2018 20:20:15 -0400
-Subject: [PATCH] Fix CraftEntity hashCode
-
-hashCodes are not allowed to change, however bukkit used a value
-that does change, the entityId.
-
-When an entity is teleported dimensions, the entity reference is
-replaced with a new one with a new entity ID.
-
-For hashCode, we can simply use the UUID's hashCode to keep
-the hashCode from changing.
-
-equals() is ok to use getEntityId() because equals() should only
-be true if both the left and right are the same reference.
-
-Since entity ids can not duplicate during runtime, this
-check is essentially the same as this.getHandle() == other.getHandle()
-
-However, replaced it too to make it clearer of intent.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 02277fc7e48e03d749edb7ec1c3f045dca900615..185b3af59bf72244bbbfc46c3336e4f7f14e73a8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -841,14 +841,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-             return false;
-         }
-         final CraftEntity other = (CraftEntity) obj;
-        return (this.getEntityId() == other.getEntityId());
-+        return (this.getHandle() == other.getHandle()); // Paper - while logically the same, this is clearer
-     }
- 
-+    // Paper - Fix hashCode. entity ID's are not static.
-+    // A CraftEntity can change reference to a new entity with a new ID, and hash codes should never change
-     @Override
-     public int hashCode() {
-        int hash = 7;
-        hash = 29 * hash + this.getEntityId();
-        return hash;
-+        return getUniqueId().hashCode();
-+        // Paper end
-     }
- 
-     @Override
--- a/patches/unapplied/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/patches/unapplied/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch
@ -1,78 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 15 Jun 2018 00:30:32 -0400
-Subject: [PATCH] Configurable Alternative LootPool Luck Formula
-
-Rewrites the Vanilla luck application formula so that luck can be
-applied to items that do not have any quality defined.
-
-See: https://luckformula.emc.gs for data and details
-----------
-
-The rough summary is:
-My goal was that in a pool, when luck was applied, the pool
-rebalances so the percentages for bigger items is
-lowered and smaller items is boosted.
-
-Do this by boosting and then reducing the weight value,
-so that larger numbers are penalized more than smaller numbers.
-resulting in a larger reduction of entries for more common
-items than the reduction on small weights,
-giving smaller weights more of a chance
-
-----------
-
-This work kind of obsoletes quality, but quality would be useful
-for 2 items with same weight that you want luck to impact
-in varying directions.
-
-Fishing still falls into that as the weights are closer, so luck
-will invalidate junk more.
-
-This change will result in some major changes to fishing formulas.
-
-----------
-
-I would love to see this change in Vanilla, so Mojang please pull :)
-
-diff --git a/src/main/java/net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer.java b/src/main/java/net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer.java
-index 710a66e9aafe8bd622f9f37789c281aba98d030e..d125b5a470be0f4c56c2c1f229fc5c83fc4d2f3b 100644
--- a/src/main/java/net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer.java
-+++ b/src/main/java/net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer.java
-@@ -113,9 +113,35 @@ public abstract class LootPoolSingletonContainer extends LootPoolEntryContainer
-     protected abstract class EntryBase implements LootPoolEntry {
-         @Override
-         public int getWeight(float luck) {
-            return Math.max(Mth.floor((float)LootPoolSingletonContainer.this.weight + (float)LootPoolSingletonContainer.this.quality * luck), 0);
-+            // Paper start - Offer an alternative loot formula to refactor how luck bonus applies
-+            // SEE: https://luckformula.emc.gs for details and data
-+            if (LootPoolSingletonContainer.this.lastLuck != null && LootPoolSingletonContainer.this.lastLuck == luck) {
-+                return lastWeight;
-+            }
-+            // This is vanilla
-+            float qualityModifer = (float) LootPoolSingletonContainer.this.quality * luck;
-+            double baseWeight = (LootPoolSingletonContainer.this.weight + qualityModifer);
-+            if (io.papermc.paper.configuration.GlobalConfiguration.get().misc.useAlternativeLuckFormula) {
-+                // Random boost to avoid losing precision in the final int cast on return
-+                final int weightBoost = 100;
-+                baseWeight *= weightBoost;
-+                // If we have vanilla 1, bump that down to 0 so nothing is is impacted
-+                // vanilla 3 = 300, 200 basis = impact 2%
-+                // =($B2*(($B2-100)/100/100))
-+                double impacted = baseWeight * ((baseWeight - weightBoost) / weightBoost / 100);
-+                // =($B$7/100)
-+                float luckModifier = Math.min(100, luck * 10) / 100;
-+                // =B2 - (C2 *($B$7/100))
-+                baseWeight = Math.ceil(baseWeight - (impacted * luckModifier));
-+            }
-+            LootPoolSingletonContainer.this.lastLuck = luck;
-+            LootPoolSingletonContainer.this.lastWeight = (int) Math.max(Math.floor(baseWeight), 0);
-+            return lastWeight;
-         }
-     }
-+    private Float lastLuck = null;
-+    private int lastWeight = 0;
-+    // Paper end
- 
-     @FunctionalInterface
-     protected interface EntryConstructor {
--- a/patches/unapplied/server/0206-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/patches/unapplied/server/0206-Print-Error-details-when-failing-to-save-player-data.patch
@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 15 Jun 2018 20:37:03 -0400
-Subject: [PATCH] Print Error details when failing to save player data
-
-
-diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-index 984b75e12b5feab63767e030df925b3cbf26d559..36af81f0957d17e170d229059c66f4eb4539dfeb 100644
--- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-+++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-@@ -43,7 +43,7 @@ public class PlayerDataStorage {
- 
-             Util.safeReplaceFile(file1, file, file2);
-         } catch (Exception exception) {
-            PlayerDataStorage.LOGGER.warn("Failed to save player data for {}", player.getName().getString());
-+            PlayerDataStorage.LOGGER.warn("Failed to save player data for {}", player.getScoreboardName(), exception); // Paper
-         }
- 
-     }
--- a/patches/unapplied/server/0207-Make-shield-blocking-delay-configurable.patch
+++ b/patches/unapplied/server/0207-Make-shield-blocking-delay-configurable.patch
@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 16 Jun 2018 01:18:16 -0500
-Subject: [PATCH] Make shield blocking delay configurable
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 021f3f81746a6e986c8899aa4b28ef87a67bed44..9e4b430c8d3ed6538e8b2549ee3f61b9e0d98c42 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3750,12 +3750,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
-         if (this.isUsingItem() && !this.useItem.isEmpty()) {
-             Item item = this.useItem.getItem();
- 
-            return item.getUseAnimation(this.useItem) != UseAnim.BLOCK ? false : item.getUseDuration(this.useItem) - this.useItemRemaining >= 5;
-+            return item.getUseAnimation(this.useItem) != UseAnim.BLOCK ? false : item.getUseDuration(this.useItem) - this.useItemRemaining >= getShieldBlockingDelay(); // Paper - shieldBlockingDelay
-         } else {
-             return false;
-         }
-     }
- 
-+    // Paper start
-+    public int shieldBlockingDelay = this.level().paperConfig().misc.shieldBlockingDelay;
-+
-+    public int getShieldBlockingDelay() {
-+        return shieldBlockingDelay;
-+    }
-+
-+    public void setShieldBlockingDelay(int shieldBlockingDelay) {
-+        this.shieldBlockingDelay = shieldBlockingDelay;
-+    }
-+    // Paper end
-+
-     public boolean isSuppressingSlidingDownLadder() {
-         return this.isShiftKeyDown();
-     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 24d13be4a5a6cd9d8d9f46c089fd23baa6da954d..4ea0b3423ad08c7645afdf1eabc66fdf299e3ef5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -810,5 +810,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     public void setArrowsStuck(final int arrows) {
-         this.getHandle().setArrowCount(arrows);
-     }
-+
-+    @Override
-+    public int getShieldBlockingDelay() {
-+        return getHandle().getShieldBlockingDelay();
-+    }
-+
-+    @Override
-+    public void setShieldBlockingDelay(int delay) {
-+        getHandle().setShieldBlockingDelay(delay);
-+    }
-     // Paper end
- }
--- a/patches/unapplied/server/0208-Improve-EntityShootBowEvent.patch
+++ b/patches/unapplied/server/0208-Improve-EntityShootBowEvent.patch
@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 15 Jun 2013 19:51:17 -0400
-Subject: [PATCH] Improve EntityShootBowEvent
-
-Adds missing call to Illagers and also adds Arrow ItemStack to skeletons
-
-== AT ==
-public net.minecraft.world.entity.projectile.AbstractArrow getPickupItem()Lnet.minecraft.world.item.ItemStack;
-
-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 9634de10605eb477c073d4241f8ea5f17eea268d..4ea7a6bd6fdc98bef30546e19e2676a78fb29007 100644
--- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -201,7 +201,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
- 
-         entityarrow.shoot(d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, (float) (14 - this.level().getDifficulty().getId() * 4));
-         // CraftBukkit start
-        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getMainHandItem(), null, entityarrow, net.minecraft.world.InteractionHand.MAIN_HAND, 0.8F, true);
-+        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getMainHandItem(), entityarrow.getPickupItem(), entityarrow, net.minecraft.world.InteractionHand.MAIN_HAND, 0.8F, true); // Paper
-         if (event.isCancelled()) {
-             event.getProjectile().remove();
-             return;
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-index 421ed4daed9a61b9e9395538ff36606b196ca1f1..63fce7e3d9f59f36e29bc827a46396d73143bb8b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-@@ -196,8 +196,18 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
-         double d3 = Math.sqrt(d0 * d0 + d2 * d2);
- 
-         entityarrow.shoot(d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, (float) (14 - this.level().getDifficulty().getId() * 4));
-+        // Paper start
-+        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getMainHandItem(), entityarrow.getPickupItem(), entityarrow, target.getUsedItemHand(), 0.8F, true);
-+        if (event.isCancelled()) {
-+            event.getProjectile().remove();
-+            return;
-+        }
-+
-+        if (event.getProjectile() == entityarrow.getBukkitEntity()) {
-+            this.level().addFreshEntity(entityarrow);
-+        }
-+        // Paper end
-         this.playSound(SoundEvents.SKELETON_SHOOT, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F));
-        this.level().addFreshEntity(entityarrow);
-     }
- 
-     @Override
--- a/patches/unapplied/server/0209-PlayerReadyArrowEvent.patch
+++ b/patches/unapplied/server/0209-PlayerReadyArrowEvent.patch
@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 18 Jun 2018 01:12:53 -0400
-Subject: [PATCH] PlayerReadyArrowEvent
-
-Called when a player is firing a bow and the server is choosing an arrow to use.
-Plugins can skip selection of certain arrows and control which is used.
-
-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 10dd06a23b34b7c8515c9ccc3988a9e8182c460d..48ba8f67b93bed0cfa540d7cb94199b633a349e6 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -2260,18 +2260,29 @@ public abstract class Player extends LivingEntity {
-         return ImmutableList.of(Pose.STANDING, Pose.CROUCHING, Pose.SWIMMING);
-     }
- 
-+    // Paper start
-+    protected boolean tryReadyArrow(ItemStack bow, ItemStack itemstack) {
-+        return !(this instanceof ServerPlayer) ||
-+                new com.destroystokyo.paper.event.player.PlayerReadyArrowEvent(
-+                    ((ServerPlayer) this).getBukkitEntity(),
-+                    org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(bow),
-+                    org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack)
-+                ).callEvent();
-+        // Paper end
-+    }
-+
-     @Override
-     public ItemStack getProjectile(ItemStack stack) {
-         if (!(stack.getItem() instanceof ProjectileWeaponItem)) {
-             return ItemStack.EMPTY;
-         } else {
-            Predicate<ItemStack> predicate = ((ProjectileWeaponItem) stack.getItem()).getSupportedHeldProjectiles();
-+            Predicate<ItemStack> predicate = ((ProjectileWeaponItem) stack.getItem()).getSupportedHeldProjectiles().and(item -> tryReadyArrow(stack, item)); // Paper
-             ItemStack itemstack1 = ProjectileWeaponItem.getHeldProjectile(this, predicate);
- 
-             if (!itemstack1.isEmpty()) {
-                 return itemstack1;
-             } else {
-                predicate = ((ProjectileWeaponItem) stack.getItem()).getAllSupportedProjectiles();
-+                predicate = ((ProjectileWeaponItem) stack.getItem()).getAllSupportedProjectiles().and(item -> tryReadyArrow(stack, item)); // Paper
- 
-                 for (int i = 0; i < this.inventory.getContainerSize(); ++i) {
-                     ItemStack itemstack2 = this.inventory.getItem(i);
--- a/patches/unapplied/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
+++ b/patches/unapplied/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
@ -1,200 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Brokkonaut <hannos17@gmx.de>
-Date: Mon, 18 Jun 2018 15:46:23 +0200
-Subject: [PATCH] Implement EntityKnockbackByEntityEvent and
- EntityPushedByEntityAttackEvent
-
-Co-authored-by: aerulion <aerulion@gmail.com>
-
-This event is called when an entity receives knockback by another entity.
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4c8ad4e6ed90d5ba25100abfd2f334a3d1e46288..427c5ff03bc5ae9469f979f106e3eed513d01536 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1894,8 +1894,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     }
- 
-     public void push(double deltaX, double deltaY, double deltaZ) {
-        this.setDeltaMovement(this.getDeltaMovement().add(deltaX, deltaY, deltaZ));
-        this.hasImpulse = true;
-+        // Paper start - call EntityPushedByEntityEvent
-+        this.push(deltaX, deltaY, deltaZ, null);
-+    }
-+
-+    public void push(double deltaX, double deltaY, double deltaZ, @org.jetbrains.annotations.Nullable Entity pushingEntity) {
-+        org.bukkit.util.Vector delta = new org.bukkit.util.Vector(deltaX, deltaY, deltaZ);
-+        if (pushingEntity == null || new io.papermc.paper.event.entity.EntityPushedByEntityAttackEvent(getBukkitEntity(), pushingEntity.getBukkitEntity(), delta).callEvent()) {
-+            this.setDeltaMovement(this.getDeltaMovement().add(delta.getX(), delta.getY(), delta.getZ()));
-+            this.hasImpulse = true;
-+        }
-+        // Paper end - call EntityPushedByEntityEvent
-     }
- 
-     protected void markHurt() {
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9e4b430c8d3ed6538e8b2549ee3f61b9e0d98c42..fe14ebe86ce2bc5835e51c7bbe56a5d69fa02bea 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1484,7 +1484,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-                         d0 = (Math.random() - Math.random()) * 0.01D;
-                     }
- 
-                    this.knockback(0.4000000059604645D, d0, d1);
-+                    this.knockback(0.4000000059604645D, d0, d1, entity1); // Paper
-                     if (!flag) {
-                         this.indicateDamage(d0, d1);
-                     }
-@@ -1533,7 +1533,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-     }
- 
-     protected void blockedByShield(LivingEntity target) {
-        target.knockback(0.5D, target.getX() - this.getX(), target.getZ() - this.getZ());
-+        target.knockback(0.5D, target.getX() - this.getX(), target.getZ() - this.getZ(), this); // Paper
-     }
- 
-     private boolean checkTotemDeathProtection(DamageSource source) {
-@@ -1793,6 +1793,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
-     }
- 
-     public void knockback(double strength, double x, double z) {
-+        // Paper start - add knockbacking entity parameter
-+        this.knockback(strength, x, z, null);
-+    }
-+    public void knockback(double strength, double x, double z, Entity knockingBackEntity) {
-+        // Paper end - add knockbacking entity parameter
-         strength *= 1.0D - this.getAttributeValue(Attributes.KNOCKBACK_RESISTANCE);
-         if (strength > 0.0D) {
-             this.hasImpulse = true;
-@@ -1800,6 +1805,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
-             Vec3 vec3d1 = (new Vec3(x, 0.0D, z)).normalize().scale(strength);
- 
-             this.setDeltaMovement(vec3d.x / 2.0D - vec3d1.x, this.onGround() ? Math.min(0.4D, vec3d.y / 2.0D + strength) : vec3d.y, vec3d.z / 2.0D - vec3d1.z);
-+            // Paper start - call EntityKnockbackByEntityEvent
-+            Vec3 currentMovement = this.getDeltaMovement();
-+            org.bukkit.util.Vector delta = new org.bukkit.util.Vector(currentMovement.x - vec3d.x, currentMovement.y - vec3d.y, currentMovement.z - vec3d.z);
-+            // Restore old velocity to be able to access it in the event
-+            this.setDeltaMovement(vec3d);
-+            if (knockingBackEntity == null || new com.destroystokyo.paper.event.entity.EntityKnockbackByEntityEvent((org.bukkit.entity.LivingEntity) getBukkitEntity(), knockingBackEntity.getBukkitEntity(), (float) strength, delta).callEvent()) {
-+                this.setDeltaMovement(vec3d.x + delta.getX(), vec3d.y + delta.getY(), vec3d.z + delta.getZ());
-+            }
-+            // Paper end
-         }
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 58d6a0bc8e94eaa22dcd5d86522ab378e5b3e7cd..2fc099e2fb17073f3ab4ac5e868b1c583bf8a594 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1633,7 +1633,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
- 
-         if (flag) {
-             if (f1 > 0.0F && target instanceof LivingEntity) {
-                ((LivingEntity) target).knockback((double) (f1 * 0.5F), (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)));
-+                ((LivingEntity) target).knockback((double) (f1 * 0.5F), (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)), this); // Paper
-                 this.setDeltaMovement(this.getDeltaMovement().multiply(0.6D, 1.0D, 0.6D));
-             }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/RamTarget.java b/src/main/java/net/minecraft/world/entity/ai/behavior/RamTarget.java
-index e319a46a21a94314c5d496820b1ac4879dcf56b9..4a3bcd988cf63452c4277ad55ba604ad43c8a623 100644
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/RamTarget.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/RamTarget.java
-@@ -77,7 +77,7 @@ public class RamTarget extends Behavior<Goat> {
-             float f = 0.25F * (float)(i - j);
-             float g = Mth.clamp(entity.getSpeed() * 1.65F, 0.2F, 3.0F) + f;
-             float h = livingEntity.isDamageSourceBlocked(world.damageSources().mobAttack(entity)) ? 0.5F : 1.0F;
-            livingEntity.knockback((double)(h * g) * this.getKnockbackForce.applyAsDouble(entity), this.ramDirection.x(), this.ramDirection.z());
-+            livingEntity.knockback((double)(h * g) * this.getKnockbackForce.applyAsDouble(entity), this.ramDirection.x(), this.ramDirection.z(), entity); // Paper
-             this.finishRam(world, entity);
-             world.playSound((Player)null, entity, this.getImpactSound.apply(entity), SoundSource.NEUTRAL, 1.0F, 1.0F);
-         } else if (this.hasRammedHornBreakingBlock(world, entity)) {
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/warden/SonicBoom.java b/src/main/java/net/minecraft/world/entity/ai/behavior/warden/SonicBoom.java
-index 29cfd065f246bbd3d3c2a5bbd32c3f4813a02951..03ec02f9a2fb5abb5387cd0d83c9481d6cbb0bd2 100644
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/warden/SonicBoom.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/warden/SonicBoom.java
-@@ -68,7 +68,7 @@ public class SonicBoom extends Behavior<Warden> {
-                 target.hurt(world.damageSources().sonicBoom(entity), 10.0F);
-                 double d = 0.5D * (1.0D - target.getAttributeValue(Attributes.KNOCKBACK_RESISTANCE));
-                 double e = 2.5D * (1.0D - target.getAttributeValue(Attributes.KNOCKBACK_RESISTANCE));
-                target.push(vec33.x() * e, vec33.y() * d, vec33.z() * e);
-+                target.push(vec33.x() * e, vec33.y() * d, vec33.z() * e, entity); // Paper
-             });
-         }
-     }
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 0f39550f82aa1646dd5e4a887e33c414160ee7d9..9d5d03a913366c0f60557e39523c30df7e2fde33 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -467,7 +467,7 @@ public class EnderDragon extends Mob implements Enemy {
-                 double d3 = entity.getZ() - d1;
-                 double d4 = Math.max(d2 * d2 + d3 * d3, 0.1D);
- 
-                entity.push(d2 / d4 * 4.0D, 0.20000000298023224D, d3 / d4 * 4.0D);
-+                entity.push(d2 / d4 * 4.0D, 0.20000000298023224D, d3 / d4 * 4.0D, this); // Paper
-                 if (!this.phaseManager.getCurrentPhase().isSitting() && ((LivingEntity) entity).getLastHurtByMobTimestamp() < entity.tickCount - 2) {
-                     entity.hurt(this.damageSources().mobAttack(this), 5.0F);
-                     this.doEnchantDamageEffects(this, entity);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 63ee0f07114e75201a1bcc2741512e3da54893ea..02f962eed1d85e8c532264f63666d26401d6a8f2 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-@@ -282,7 +282,7 @@ public class Ravager extends Raider {
-         double d1 = entity.getZ() - this.getZ();
-         double d2 = Math.max(d0 * d0 + d1 * d1, 0.001D);
- 
-        entity.push(d0 / d2 * 4.0D, 0.2D, d1 / d2 * 4.0D);
-+        entity.push(d0 / d2 * 4.0D, 0.2D, d1 / d2 * 4.0D, this); // Paper
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/HoglinBase.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/HoglinBase.java
-index 81003ce3f05c6be6f52a92b86a4721235f4ce12a..004382377ee364143a34287e7b6546ae1df4e88e 100644
--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/HoglinBase.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/HoglinBase.java
-@@ -40,7 +40,7 @@ public interface HoglinBase {
-             double j = f * (double)(attacker.level().random.nextFloat() * 0.5F + 0.2F);
-             Vec3 vec3 = (new Vec3(g, 0.0D, h)).normalize().scale(j).yRot(i);
-             double k = f * (double)attacker.level().random.nextFloat() * 0.5D;
-            target.push(vec3.x, k, vec3.z);
-+            target.push(vec3.x, k, vec3.z, attacker); // Paper
-             target.hurtMarked = true;
-         }
-     }
-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 48ba8f67b93bed0cfa540d7cb94199b633a349e6..734d00e84ec0bcef91a12546873de64e33e14d0c 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1284,9 +1284,9 @@ public abstract class Player extends LivingEntity {
-                     if (flag5) {
-                         if (i > 0) {
-                             if (target instanceof LivingEntity) {
-                                ((LivingEntity) target).knockback((double) ((float) i * 0.5F), (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)));
-+                                ((LivingEntity) target).knockback((double) ((float) i * 0.5F), (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)), this); // Paper
-                             } else {
-                                target.push((double) (-Mth.sin(this.getYRot() * 0.017453292F) * (float) i * 0.5F), 0.1D, (double) (Mth.cos(this.getYRot() * 0.017453292F) * (float) i * 0.5F));
-+                                target.push((double) (-Mth.sin(this.getYRot() * 0.017453292F) * (float) i * 0.5F), 0.1D, (double) (Mth.cos(this.getYRot() * 0.017453292F) * (float) i * 0.5F), this); // Paper
-                             }
- 
-                             this.setDeltaMovement(this.getDeltaMovement().multiply(0.6D, 1.0D, 0.6D));
-@@ -1308,7 +1308,7 @@ public abstract class Player extends LivingEntity {
-                                 if (entityliving != this && entityliving != target && !this.isAlliedTo((Entity) entityliving) && (!(entityliving instanceof ArmorStand) || !((ArmorStand) entityliving).isMarker()) && this.distanceToSqr((Entity) entityliving) < 9.0D) {
-                                     // CraftBukkit start - Only apply knockback if the damage hits
-                                     if (entityliving.hurt(this.damageSources().playerAttack(this).sweep(), f4)) {
-                                    entityliving.knockback(0.4000000059604645D, (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)));
-+                                    entityliving.knockback(0.4000000059604645D, (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)), this); // Pa
-                                     }
-                                     // CraftBukkit end
-                                 }
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 7acd5d9fb7f7d3e067de779a9e3f0cedb587c68a..86a82ecdcffc27b523fddc2709bbd92f315e8590 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -401,7 +401,7 @@ public abstract class AbstractArrow extends Projectile {
-                     Vec3 vec3d = this.getDeltaMovement().multiply(1.0D, 0.0D, 1.0D).normalize().scale((double) this.knockback * 0.6D * d0);
- 
-                     if (vec3d.lengthSqr() > 0.0D) {
-                        entityliving.push(vec3d.x, 0.1D, vec3d.z);
-+                        entityliving.push(vec3d.x, 0.1D, vec3d.z, this); // Paper
-                     }
-                 }
- 
--- a/patches/unapplied/server/0211-Expand-Explosions-API.patch
+++ b/patches/unapplied/server/0211-Expand-Explosions-API.patch
@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 20 Jun 2018 23:17:24 -0400
-Subject: [PATCH] Expand Explosions API
-
-Add Entity as a Source capability, and add more API choices, and on Location.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0476f00719d180d28a2a4bab3f4152b00a1e4e67..905cf3c98c363c4cd8b236e557572d8cc2ab88a8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -716,6 +716,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-     public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks, Entity source) {
-         return !this.world.explode(source == null ? null : ((CraftEntity) source).getHandle(), x, y, z, power, setFire, breakBlocks ? net.minecraft.world.level.Level.ExplosionInteraction.MOB : net.minecraft.world.level.Level.ExplosionInteraction.NONE).wasCanceled;
-     }
-+    // Paper start
-+    @Override
-+    public boolean createExplosion(Entity source, Location loc, float power, boolean setFire, boolean breakBlocks) {
-+        return !world.explode(source != null ? ((org.bukkit.craftbukkit.entity.CraftEntity) source).getHandle() : null, loc.getX(), loc.getY(), loc.getZ(), power, setFire, breakBlocks ? net.minecraft.world.level.Level.ExplosionInteraction.MOB : net.minecraft.world.level.Level.ExplosionInteraction.NONE).wasCanceled;
-+    }
-+    // Paper end
- 
-     @Override
-     public boolean createExplosion(Location loc, float power) {
--- a/patches/unapplied/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/unapplied/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch
@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 29 Jun 2018 00:21:28 -0400
-Subject: [PATCH] LivingEntity Hand Raised/Item Use API
-
-How long an entity has raised hands to charge an attack or use an item
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 4ea0b3423ad08c7645afdf1eabc66fdf299e3ef5..f79118891ca87515cbcea8b798e434cb57bbe494 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -820,5 +820,30 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     public void setShieldBlockingDelay(int delay) {
-         getHandle().setShieldBlockingDelay(delay);
-     }
-+
-+    @Override
-+    public ItemStack getActiveItem() {
-+        return getHandle().getUseItem().asBukkitMirror();
-+    }
-+
-+    @Override
-+    public int getItemUseRemainingTime() {
-+        return getHandle().getUseItemRemainingTicks();
-+    }
-+
-+    @Override
-+    public int getHandRaisedTime() {
-+        return getHandle().getTicksUsingItem();
-+    }
-+
-+    @Override
-+    public boolean isHandRaised() {
-+        return getHandle().isUsingItem();
-+    }
-+
-+    @Override
-+    public org.bukkit.inventory.EquipmentSlot getHandRaised() {
-+        return getHandle().getUsedItemHand() == net.minecraft.world.InteractionHand.MAIN_HAND ? org.bukkit.inventory.EquipmentSlot.HAND : org.bukkit.inventory.EquipmentSlot.OFF_HAND;
-+    }
-     // Paper end
- }
--- a/patches/unapplied/server/0213-RangedEntity-API.patch
+++ b/patches/unapplied/server/0213-RangedEntity-API.patch
@ -1,162 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 26 Jun 2018 22:00:49 -0400
-Subject: [PATCH] RangedEntity API
-
-Allows you to determine if an entity is capable of ranged attacks,
-and to perform an attack.
-
-diff --git a/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..d7a8eb1b8f24ed2741ae9dae62d3f6146f273e1d
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java
-@@ -0,0 +1,20 @@
-+package com.destroystokyo.paper.entity;
-+
-+import net.minecraft.world.entity.Mob;
-+import net.minecraft.world.entity.monster.RangedAttackMob;
-+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
-+import org.bukkit.entity.LivingEntity;
-+
-+public interface CraftRangedEntity<T extends Mob & RangedAttackMob> extends RangedEntity {
-+    T getHandle();
-+
-+    @Override
-+    default void rangedAttack(LivingEntity target, float charge) {
-+        getHandle().performRangedAttack(((CraftLivingEntity) target).getHandle(), charge);
-+    }
-+
-+    @Override
-+    default void setChargingAttack(boolean raiseHands) {
-+        getHandle().setAggressive(raiseHands);
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java
-index db6ad6eea8fa6f2755bbb0e1325df8bda98e708a..5ff566186431440c25a26900aba14e4adb642031 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java
-@@ -4,7 +4,7 @@ import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.AbstractSkeleton;
- import org.bukkit.entity.Skeleton;
- 
-public abstract class CraftAbstractSkeleton extends CraftMonster implements AbstractSkeleton {
-+public abstract class CraftAbstractSkeleton extends CraftMonster implements AbstractSkeleton, com.destroystokyo.paper.entity.CraftRangedEntity<net.minecraft.world.entity.monster.AbstractSkeleton> { // Paper
- 
-     public CraftAbstractSkeleton(CraftServer server, net.minecraft.world.entity.monster.AbstractSkeleton entity) {
-         super(server, entity);
-@@ -14,4 +14,10 @@ public abstract class CraftAbstractSkeleton extends CraftMonster implements Abst
-     public void setSkeletonType(Skeleton.SkeletonType type) {
-         throw new UnsupportedOperationException("Not supported.");
-     }
-+	// Paper start
-+    @Override
-+    public net.minecraft.world.entity.monster.AbstractSkeleton getHandle() {
-+        return (net.minecraft.world.entity.monster.AbstractSkeleton) super.getHandle();
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java
-index b91d0841b7189d560150d41877e4a0bdea161539..14b575254171f66b8792033c93cf5a325a42b467 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java
-@@ -3,7 +3,7 @@ package org.bukkit.craftbukkit.entity;
- import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.Drowned;
- 
-public class CraftDrowned extends CraftZombie implements Drowned {
-+public class CraftDrowned extends CraftZombie implements Drowned, com.destroystokyo.paper.entity.CraftRangedEntity<net.minecraft.world.entity.monster.Drowned> { // Paper
- 
-     public CraftDrowned(CraftServer server, net.minecraft.world.entity.monster.Drowned entity) {
-         super(server, entity);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
-index 995c77ee53347328bfd0ad66fcc1b39589967476..5b2af80e584977683cd39e6f440e65a76e929be9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
-@@ -3,7 +3,7 @@ package org.bukkit.craftbukkit.entity;
- import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.Illusioner;
- 
-public class CraftIllusioner extends CraftSpellcaster implements Illusioner {
-+public class CraftIllusioner extends CraftSpellcaster implements Illusioner, com.destroystokyo.paper.entity.CraftRangedEntity<net.minecraft.world.entity.monster.Illusioner> { // Paper
- 
-     public CraftIllusioner(CraftServer server, net.minecraft.world.entity.monster.Illusioner entity) {
-         super(server, entity);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-index dfd4cf1e613b7ccf3ad986f8e0d783593a411194..9986ac517e11b076a29a8c8e3f480ec286fa5825 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-@@ -8,7 +8,7 @@ import org.bukkit.entity.Llama;
- import org.bukkit.entity.Llama.Color;
- import org.bukkit.inventory.LlamaInventory;
- 
-public class CraftLlama extends CraftChestedHorse implements Llama {
-+public class CraftLlama extends CraftChestedHorse implements Llama, com.destroystokyo.paper.entity.CraftRangedEntity<net.minecraft.world.entity.animal.horse.Llama> { // Paper
- 
-     public CraftLlama(CraftServer server, net.minecraft.world.entity.animal.horse.Llama entity) {
-         super(server, entity);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
-index 83ab9f7c2bcd3e1bac0324030f182bc303e22cad..8b9695de6e3411cbcc2f97e4a4e243ec1d1dd076 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
-@@ -12,7 +12,7 @@ import org.bukkit.craftbukkit.util.CraftMagicNumbers;
- import org.bukkit.entity.Piglin;
- import org.bukkit.inventory.Inventory;
- 
-public class CraftPiglin extends CraftPiglinAbstract implements Piglin {
-+public class CraftPiglin extends CraftPiglinAbstract implements Piglin, com.destroystokyo.paper.entity.CraftRangedEntity<net.minecraft.world.entity.monster.piglin.Piglin> { // Paper
- 
-     public CraftPiglin(CraftServer server, net.minecraft.world.entity.monster.piglin.Piglin entity) {
-         super(server, entity);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPillager.java
-index d82cea48d9baeaba4dfa32540dcc9ca73651608b..2638c341bc02f201f7ab17fdebcdbdf3a7ec05bf 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPillager.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPillager.java
-@@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.inventory.CraftInventory;
- import org.bukkit.entity.Pillager;
- import org.bukkit.inventory.Inventory;
- 
-public class CraftPillager extends CraftIllager implements Pillager {
-+public class CraftPillager extends CraftIllager implements Pillager, com.destroystokyo.paper.entity.CraftRangedEntity<net.minecraft.world.entity.monster.Pillager> { // Paper
- 
-     public CraftPillager(CraftServer server, net.minecraft.world.entity.monster.Pillager entity) {
-         super(server, entity);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
-index cb9efd2fa886d721a802d1c644d9b2c7e6eb948a..5d2e0fb911265f1184de5434464378ffba98d379 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
-@@ -4,7 +4,7 @@ import net.minecraft.world.entity.animal.SnowGolem;
- import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.Snowman;
- 
-public class CraftSnowman extends CraftGolem implements Snowman {
-+public class CraftSnowman extends CraftGolem implements Snowman, com.destroystokyo.paper.entity.CraftRangedEntity<SnowGolem> { // Paper
-     public CraftSnowman(CraftServer server, SnowGolem entity) {
-         super(server, entity);
-     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index 399b045478d93b2b85b0b25c2dec427dc6a45166..5024a102fe71d7013bc809bb4140763bd4c466e7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-@@ -3,7 +3,7 @@ package org.bukkit.craftbukkit.entity;
- import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.Witch;
- 
-public class CraftWitch extends CraftRaider implements Witch {
-+public class CraftWitch extends CraftRaider implements Witch, com.destroystokyo.paper.entity.CraftRangedEntity<net.minecraft.world.entity.monster.Witch> { // Paper
-     public CraftWitch(CraftServer server, net.minecraft.world.entity.monster.Witch entity) {
-         super(server, entity);
-     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-index 2536d59a01e3557678125e26ace9676d7aec6099..83353863e0c58995d3699d5f812d38cae056f695 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-@@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.boss.CraftBossBar;
- import org.bukkit.entity.LivingEntity;
- import org.bukkit.entity.Wither;
- 
-public class CraftWither extends CraftMonster implements Wither {
-+public class CraftWither extends CraftMonster implements Wither, com.destroystokyo.paper.entity.CraftRangedEntity<WitherBoss> { // Paper
- 
-     private BossBar bossBar;
- 
--- a/patches/unapplied/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/unapplied/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch
@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 22 Jun 2018 10:38:31 -0500
-Subject: [PATCH] Add config to disable ender dragon legacy check
-
-
-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 c1c89d93f437850f6126ca69664dc9a3c5feac96..43a82ed953dd5d19f1c1c55b011b0cedef5ad7a2 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
-@@ -106,6 +106,10 @@ public class EndDragonFight {
-         this.ticksSinceLastPlayerScan = 21;
-         this.skipArenaLoadedCheck = false;
-         this.needsStateScanning = true;
-+        // Paper start
-+        this.needsStateScanning = world.paperConfig().entities.spawning.scanForLegacyEnderDragon;
-+        if (!this.needsStateScanning) this.dragonKilled = true;
-+        // Paper end
-         this.level = world;
-         this.origin = origin;
-         this.validPlayer = EntitySelector.ENTITY_STILL_ALIVE.and(EntitySelector.withinDistance((double) origin.getX(), (double) (128 + origin.getY()), (double) origin.getZ(), 192.0D));
--- a/patches/unapplied/server/0215-Implement-World.getEntity-UUID-API.patch
+++ b/patches/unapplied/server/0215-Implement-World.getEntity-UUID-API.patch
@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Brokkonaut <hannos17@gmx.de>
-Date: Tue, 3 Jul 2018 16:08:14 +0200
-Subject: [PATCH] Implement World.getEntity(UUID) API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 905cf3c98c363c4cd8b236e557572d8cc2ab88a8..58f261162627c3065bb1b518e0e99f5c822c022c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1040,6 +1040,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-         return list;
-     }
- 
-+    // Paper start - getEntity by UUID API
-+    @Override
-+    public Entity getEntity(UUID uuid) {
-+        Preconditions.checkArgument(uuid != null, "UUID cannot be null");
-+        net.minecraft.world.entity.Entity entity = world.getEntity(uuid);
-+        return entity == null ? null : entity.getBukkitEntity();
-+    }
-+    // Paper end
-+
-     @Override
-     public void save() {
-         org.spigotmc.AsyncCatcher.catchOp("world save"); // Spigot
--- a/patches/unapplied/server/0216-InventoryCloseEvent-Reason-API.patch
+++ b/patches/unapplied/server/0216-InventoryCloseEvent-Reason-API.patch
@ -1,220 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 3 Jul 2018 21:56:23 -0400
-Subject: [PATCH] InventoryCloseEvent Reason API
-
-Allows you to determine why an inventory was closed, enabling plugin developers
-to "confirm" things based on if it was player triggered close or not.
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 68257f257dd3b167e237482c8d149590103896b2..33ce550ea68d4862e0966ed827200cf426909d85 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1449,7 +1449,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         for (net.minecraft.world.level.block.entity.BlockEntity tileentity : chunk.getBlockEntities().values()) {
-             if (tileentity instanceof net.minecraft.world.Container) {
-                 for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((net.minecraft.world.Container) tileentity).getViewers())) {
-                    h.closeInventory();
-+                    h.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper
-                 }
-             }
-         }
-@@ -2417,7 +2417,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-             // Spigot Start
-             if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
-                 for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((org.bukkit.inventory.InventoryHolder) entity.getBukkitEntity()).getInventory().getViewers())) {
-                    h.closeInventory();
-+                    h.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper
-                 }
-             }
-             // Spigot End
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3842caf61e388aa65b3a18c587480a7dabb8341b..bd7b8ede44a5971b034ffb75fbddbadda8f42702 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -682,7 +682,7 @@ public class ServerPlayer extends Player {
-         }
-         // Paper end
-         if (!this.level().isClientSide && !this.containerMenu.stillValid(this)) {
-            this.closeContainer();
-+            this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper
-             this.containerMenu = this.inventoryMenu;
-         }
- 
-@@ -875,7 +875,7 @@ public class ServerPlayer extends Player {
- 
-         // SPIGOT-943 - only call if they have an inventory open
-         if (this.containerMenu != this.inventoryMenu) {
-            this.closeContainer();
-+            this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DEATH); // Paper
-         }
- 
-         net.kyori.adventure.text.Component deathMessage = event.deathMessage() != null ? event.deathMessage() : net.kyori.adventure.text.Component.empty(); // Paper - Adventure
-@@ -1494,7 +1494,7 @@ public class ServerPlayer extends Player {
-         }
-         // CraftBukkit end
-         if (this.containerMenu != this.inventoryMenu) {
-            this.closeContainer();
-+            this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.OPEN_NEW); // Paper
-         }
- 
-         // this.nextContainerCounter(); // CraftBukkit - moved up
-@@ -1522,7 +1522,13 @@ public class ServerPlayer extends Player {
- 
-     @Override
-     public void closeContainer() {
-        CraftEventFactory.handleInventoryCloseEvent(this); // CraftBukkit
-+        // Paper start
-+        this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNKNOWN);
-+    }
-+    @Override
-+    public void closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason reason) {
-+        CraftEventFactory.handleInventoryCloseEvent(this, reason); // CraftBukkit
-+        // Paper end
-         this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId));
-         this.doCloseContainer();
-     }
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d01daadf038b381c4b0d7787553ccd341c0787af..2b71b1345a8fc20ca94b837323560c4d70df97fe 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -222,6 +222,7 @@ import org.bukkit.event.inventory.ClickType;
- import org.bukkit.event.inventory.CraftItemEvent;
- import org.bukkit.event.inventory.InventoryAction;
- import org.bukkit.event.inventory.InventoryClickEvent;
-+import org.bukkit.event.inventory.InventoryCloseEvent; // Paper
- import org.bukkit.event.inventory.InventoryCreativeEvent;
- import org.bukkit.event.inventory.InventoryType.SlotType;
- import org.bukkit.event.inventory.SmithItemEvent;
-@@ -2661,10 +2662,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
- 
-     @Override
-     public void handleContainerClose(ServerboundContainerClosePacket packet) {
-+        // Paper start
-+        this.handleContainerClose(packet, InventoryCloseEvent.Reason.PLAYER);
-+    }
-+    public void handleContainerClose(ServerboundContainerClosePacket packet, InventoryCloseEvent.Reason reason) {
-+        // Paper end
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
- 
-         if (this.player.isImmobile()) return; // CraftBukkit
-        CraftEventFactory.handleInventoryCloseEvent(this.player); // CraftBukkit
-+        CraftEventFactory.handleInventoryCloseEvent(this.player, reason); // CraftBukkit // Paper
- 
-         this.player.doCloseContainer();
-     }
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 875b08503fbbac256fad1b3f3d9c742bf1cdced2..e00c1916202a4e0550cc19c9cb279448a9fcdd1e 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -533,7 +533,7 @@ public abstract class PlayerList {
-         // CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it
-         // See SPIGOT-5799, SPIGOT-6145
-         if (entityplayer.containerMenu != entityplayer.inventoryMenu) {
-            entityplayer.closeContainer();
-+            entityplayer.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper
-         }
- 
-         PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : PaperAdventure.asAdventure(entityplayer.getDisplayName()))); // Paper - Adventure
-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 734d00e84ec0bcef91a12546873de64e33e14d0c..c7bcbc3f0542a74c30e29bded3bfc0e94daeab25 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -269,7 +269,7 @@ public abstract class Player extends LivingEntity {
-         this.updateIsUnderwater();
-         super.tick();
-         if (!this.level().isClientSide && this.containerMenu != null && !this.containerMenu.stillValid(this)) {
-            this.closeContainer();
-+            this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper
-             this.containerMenu = this.inventoryMenu;
-         }
- 
-@@ -492,6 +492,13 @@ public abstract class Player extends LivingEntity {
- 
-     }
- 
-+    // Paper start - unused code, but to keep signatures aligned
-+    public void closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason reason) {
-+        closeContainer();
-+        this.containerMenu = this.inventoryMenu;
-+    }
-+    // Paper end
-+
-     public void closeContainer() {
-         this.containerMenu = this.inventoryMenu;
-     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 74f1af3dccddf52965e5c91277be3592649e8cfa..552fb0be2f31bd52a5ae43526d55aa29828f786e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -376,7 +376,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
-         if (((ServerPlayer) this.getHandle()).connection == null) return;
-         if (this.getHandle().containerMenu != this.getHandle().inventoryMenu) {
-             // fire INVENTORY_CLOSE if one already open
-            ((ServerPlayer) this.getHandle()).connection.handleContainerClose(new ServerboundContainerClosePacket(this.getHandle().containerMenu.containerId));
-+            ((ServerPlayer) this.getHandle()).connection.handleContainerClose(new ServerboundContainerClosePacket(this.getHandle().containerMenu.containerId), org.bukkit.event.inventory.InventoryCloseEvent.Reason.OPEN_NEW); // Paper
-         }
-         ServerPlayer player = (ServerPlayer) this.getHandle();
-         AbstractContainerMenu container;
-@@ -446,8 +446,14 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
- 
-     @Override
-     public void closeInventory() {
-        this.getHandle().closeContainer();
-+        // Paper start
-+        this.getHandle().closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.PLUGIN);
-     }
-+    @Override
-+    public void closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason reason) {
-+        getHandle().closeContainer(reason);
-+    }
-+    // Paper end
- 
-     @Override
-     public boolean isBlocking() {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0868e977d356a1e3b5c49c9c788d8e3d0cb85c84..240f90460ddddf8168b7bc661a55fe7e5c94c67d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1189,7 +1189,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-         // Close any foreign inventory
-         if (this.getHandle().containerMenu != this.getHandle().inventoryMenu) {
-            this.getHandle().closeContainer();
-+            this.getHandle().closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.TELEPORT); // Paper
-         }
- 
-         // Check if the fromWorld and toWorld are the same.
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ceb8d024888425248cb40eb3fbbe39fc4be1207b..4942ea5a66af310eac646a6be20e997d53ab99fb 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1304,7 +1304,7 @@ public class CraftEventFactory {
- 
-     public static AbstractContainerMenu callInventoryOpenEvent(ServerPlayer player, AbstractContainerMenu container, boolean cancelled) {
-         if (player.containerMenu != player.inventoryMenu) { // fire INVENTORY_CLOSE if one already open
-            player.connection.handleContainerClose(new ServerboundContainerClosePacket(player.containerMenu.containerId));
-+            player.connection.handleContainerClose(new ServerboundContainerClosePacket(player.containerMenu.containerId), InventoryCloseEvent.Reason.OPEN_NEW); // Paper
-         }
- 
-         CraftServer server = player.level().getCraftServer();
-@@ -1478,8 +1478,18 @@ public class CraftEventFactory {
-         return event;
-     }
- 
-+    // Paper start
-+    /**
-+     * Incase plugins hooked into this or Spigot adds a new inventory close event. Prefer to pass a reason
-+     * @param human
-+     */
-+    @Deprecated
-     public static void handleInventoryCloseEvent(net.minecraft.world.entity.player.Player human) {
-        InventoryCloseEvent event = new InventoryCloseEvent(human.containerMenu.getBukkitView());
-+        handleInventoryCloseEvent(human, org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNKNOWN);
-+    }
-+    public static void handleInventoryCloseEvent(net.minecraft.world.entity.player.Player human, org.bukkit.event.inventory.InventoryCloseEvent.Reason reason) {
-+        // Paper end
-+        InventoryCloseEvent event = new InventoryCloseEvent(human.containerMenu.getBukkitView(), reason); // Paper
-         human.level().getCraftServer().getPluginManager().callEvent(event);
-         human.containerMenu.transferTo(human.inventoryMenu, human.getBukkitEntity());
-     }
--- a/patches/unapplied/server/0217-Vex-get-setSummoner-API.patch
+++ b/patches/unapplied/server/0217-Vex-get-setSummoner-API.patch
@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 4 Jul 2018 15:30:22 -0400
-Subject: [PATCH] Vex#get/setSummoner API
-
-Get's the NPC that summoned this Vex and
-Allow setting the vex's summoner
-
-Co-authored-by: BillyGalbreath <Blake.Galbreath@GMail.com>
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index bf9e23702d30838770d612d7644713f6510497be..c4f7216c7ca7a49048fcf5240ef2a8f80e843f1c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-@@ -18,6 +18,19 @@ public class CraftVex extends CraftMonster implements Vex {
-         return (net.minecraft.world.entity.monster.Vex) super.getHandle();
-     }
- 
-+    // Paper start
-+    @Override
-+    public org.bukkit.entity.Mob getSummoner() {
-+        net.minecraft.world.entity.Mob owner = getHandle().getOwner();
-+        return owner != null ? (org.bukkit.entity.Mob) owner.getBukkitEntity() : null;
-+    }
-+
-+    @Override
-+    public void setSummoner(org.bukkit.entity.Mob summoner) {
-+        getHandle().setOwner(summoner == null ? null : ((CraftMob) summoner).getHandle());
-+    }
-+    // Paper end
-+
-     @Override
-     public String toString() {
-         return "CraftVex";
--- a/patches/unapplied/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/unapplied/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Minecrell <minecrell@minecrell.net>
-Date: Fri, 13 Jul 2018 14:54:43 +0200
-Subject: [PATCH] Refresh player inventory when cancelling
- PlayerInteractEntityEvent
-
-When interacting with entities with an item, the client will assume
-the interaction is successful, and update the held item on the
-client. However, if the interaction is cancelled on the server side,
-the client will still mistakenly remove/replace the item in hand.
-
-Examples for this are milking cows with a bucket or dyeing sheep.
-The bucket is replaced with milk and the dye removed from inventory.
-
-Refresh the player inventory when PlayerInteractEntityEvent is
-cancelled to avoid this problem.
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2b71b1345a8fc20ca94b837323560c4d70df97fe..32acb0ea31c3d617a0a087e11e5a8bfa6eb83db9 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2542,6 +2542,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-                             }
- 
-                             if (event.isCancelled()) {
-+                            ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); // Paper - Refresh player inventory
-                                 return;
-                             }
-                             // CraftBukkit end
--- a/patches/unapplied/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/unapplied/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Thu, 12 Aug 2021 04:46:41 -0700
-Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index e1dc32d94576d751c4078d78fbf3ce3b47f02159..ae64cbbff21ab56d27fd55a4f21b6241d0a54e98 100644
--- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -38,6 +38,7 @@ dependencies {
-     implementation("commons-lang:commons-lang:2.6")
-     runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0")
-     runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
-+    runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
- 
-     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
-diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 88957220d5574e5590e8a545605d76c0c7b0a10e..ea4e2161c0bd43884055cc6b8d70b2139f70e720 100644
--- a/src/main/resources/log4j2.xml
-+++ b/src/main/resources/log4j2.xml
-@@ -29,15 +29,18 @@
-             </Policies>
-             <DefaultRolloverStrategy max="1000"/>
-         </RollingRandomAccessFile>
-+        <Async name="Async">
-+            <AppenderRef ref="File"/>
-+            <AppenderRef ref="TerminalConsole" level="info"/>
-+            <AppenderRef ref="ServerGuiConsole" level="info"/>
-+        </Async>
-     </Appenders>
-     <Loggers>
-         <Root level="info">
-             <filters>
-                 <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
-             </filters>
-            <AppenderRef ref="File"/>
-            <AppenderRef ref="TerminalConsole" level="info"/>
-            <AppenderRef ref="ServerGuiConsole" level="info"/>
-+            <AppenderRef ref="Async"/>
-         </Root>
-     </Loggers>
- </Configuration>
--- a/patches/unapplied/server/0220-add-more-information-to-Entity.toString.patch
+++ b/patches/unapplied/server/0220-add-more-information-to-Entity.toString.patch
@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 19 Jul 2018 01:13:28 -0400
-Subject: [PATCH] add more information to Entity.toString()
-
-UUID, ticks lived, valid, dead
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 427c5ff03bc5ae9469f979f106e3eed513d01536..c1ece46bea30faf550040b7a3f36c8966029aa9d 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3137,7 +3137,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     public String toString() {
-         String s = this.level() == null ? "~NULL~" : this.level().toString();
- 
-        return this.removalReason != null ? String.format(Locale.ROOT, "%s['%s'/%d, l='%s', x=%.2f, y=%.2f, z=%.2f, removed=%s]", this.getClass().getSimpleName(), this.getName().getString(), this.id, s, this.getX(), this.getY(), this.getZ(), this.removalReason) : String.format(Locale.ROOT, "%s['%s'/%d, l='%s', x=%.2f, y=%.2f, z=%.2f]", this.getClass().getSimpleName(), this.getName().getString(), this.id, s, this.getX(), this.getY(), this.getZ());
-+        return this.removalReason != null ? String.format(Locale.ROOT, "%s['%s'/%d, uuid='%s', l='%s', x=%.2f, y=%.2f, z=%.2f, cpos=%s, tl=%d, v=%b, removed=%s]", this.getClass().getSimpleName(), this.getName().getString(), this.id, this.uuid, s, this.getX(), this.getY(), this.getZ(), this.chunkPosition(), this.tickCount, this.valid, this.removalReason) : String.format(Locale.ROOT, "%s['%s'/%d, uuid='%s', l='%s', x=%.2f, y=%.2f, z=%.2f, cpos=%s, tl=%d, v=%b]", this.getClass().getSimpleName(), this.getName().getString(), this.id, this.uuid, s, this.getX(), this.getY(), this.getZ(), this.chunkPosition(), this.tickCount, this.valid);
-     }
- 
-     public boolean isInvulnerableTo(DamageSource damageSource) {
--- a/patches/unapplied/server/0221-EnderDragon-Events.patch
+++ b/patches/unapplied/server/0221-EnderDragon-Events.patch
@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 21 Jul 2018 01:51:27 -0500
-Subject: [PATCH] EnderDragon Events
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java
-index f72ad2e7d0d5953c906d0d9f8adb9ba74d1841be..7b96cf748b69db98cb1bc3dc0430e39b9ffc93f2 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java
-@@ -83,7 +83,13 @@ public class DragonSittingFlamingPhase extends AbstractDragonSittingPhase {
-             this.flame.setDuration(200);
-             this.flame.setParticle(ParticleTypes.DRAGON_BREATH);
-             this.flame.addEffect(new MobEffectInstance(MobEffects.HARM));
-+            if (new com.destroystokyo.paper.event.entity.EnderDragonFlameEvent((org.bukkit.entity.EnderDragon) this.dragon.getBukkitEntity(), (org.bukkit.entity.AreaEffectCloud) this.flame.getBukkitEntity()).callEvent()) { // Paper
-             this.dragon.level().addFreshEntity(this.flame);
-+            // Paper start
-+            } else {
-+                this.end();
-+            }
-+            // Paper end
-         }
- 
-     }
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
-index f54576f6450e24f574bfe7f4b8e2ad5d8c9f1ba3..a3456b35db4e938f91d6bc32d4d202a011bf13c4 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
-@@ -74,7 +74,9 @@ public class DragonStrafePlayerPhase extends AbstractDragonPhaseInstance {
- 
-                         DragonFireball dragonFireball = new DragonFireball(this.dragon.level(), this.dragon, r, s, t);
-                         dragonFireball.moveTo(o, p, q, 0.0F, 0.0F);
-+                        if (new com.destroystokyo.paper.event.entity.EnderDragonShootFireballEvent((org.bukkit.entity.EnderDragon) dragon.getBukkitEntity(), (org.bukkit.entity.DragonFireball) dragonFireball.getBukkitEntity()).callEvent()) // Paper
-                         this.dragon.level().addFreshEntity(dragonFireball);
-+                        else dragonFireball.discard(); // Paper
-                         this.fireballCharge = 0;
-                         if (this.currentPath != null) {
-                             while(!this.currentPath.isDone()) {
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
-index 796a2a88134eee4021423fef132537a5e0680bc5..9652e3385ad10e5d825dd141f6be3522c596916d 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
-@@ -52,8 +52,10 @@ public class DragonFireball extends AbstractHurtingProjectile {
-                     }
-                 }
- 
-+                if (new com.destroystokyo.paper.event.entity.EnderDragonFireballHitEvent((org.bukkit.entity.DragonFireball) this.getBukkitEntity(), list.stream().map(LivingEntity::getBukkitLivingEntity).collect(java.util.stream.Collectors.toList()), (org.bukkit.entity.AreaEffectCloud) areaEffectCloud.getBukkitEntity()).callEvent()) { // Paper
-                 this.level().levelEvent(2006, this.blockPosition(), this.isSilent() ? -1 : 1);
-                 this.level().addFreshEntity(areaEffectCloud);
-+                } else areaEffectCloud.discard(); // Paper
-                 this.discard();
-             }
- 
--- a/patches/unapplied/server/0222-PlayerElytraBoostEvent.patch
+++ b/patches/unapplied/server/0222-PlayerElytraBoostEvent.patch
@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 21 Jul 2018 01:59:59 -0500
-Subject: [PATCH] PlayerElytraBoostEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-index 7c627d27300247db9122ab2081049345ef306073..f17e9c6c91c02e0d36f58851522a5d3e5e423121 100644
--- a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-+++ b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-@@ -61,12 +61,19 @@ public class FireworkRocketItem extends Item {
-             if (!world.isClientSide) {
-                 FireworkRocketEntity fireworkRocketEntity = new FireworkRocketEntity(world, itemStack, user);
-                 fireworkRocketEntity.spawningEntity = user.getUUID(); // Paper
-                world.addFreshEntity(fireworkRocketEntity);
-                if (!user.getAbilities().instabuild) {
-+                // Paper start
-+                com.destroystokyo.paper.event.player.PlayerElytraBoostEvent event = new com.destroystokyo.paper.event.player.PlayerElytraBoostEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), (org.bukkit.entity.Firework) fireworkRocketEntity.getBukkitEntity());
-+                if (event.callEvent() && world.addFreshEntity(fireworkRocketEntity)) {
-+                    user.awardStat(Stats.ITEM_USED.get(this));
-+                    if (event.shouldConsume() && !user.getAbilities().instabuild) {
-                     itemStack.shrink(1);
-+                    } else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
-+                } else if (user instanceof net.minecraft.server.level.ServerPlayer) {
-+                    ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
-+                    // Paper end
-                 }
- 
-                user.awardStat(Stats.ITEM_USED.get(this));
-+                // user.awardStat(Stats.ITEM_USED.get(this)); // Paper - move up
-             }
- 
-             return InteractionResultHolder.sidedSuccess(user.getItemInHand(hand), world.isClientSide());
--- a/patches/unapplied/server/0223-PlayerLaunchProjectileEvent.patch
+++ b/patches/unapplied/server/0223-PlayerLaunchProjectileEvent.patch
@ -1,301 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 21 Jul 2018 03:11:03 -0500
-Subject: [PATCH] PlayerLaunchProjectileEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/item/EggItem.java b/src/main/java/net/minecraft/world/item/EggItem.java
-index 32b63407b943fb00d765dbf4e0eefb4b06f801b6..58cb992c5defec2f092755cbde661ff10f38bf9d 100644
--- a/src/main/java/net/minecraft/world/item/EggItem.java
-+++ b/src/main/java/net/minecraft/world/item/EggItem.java
-@@ -25,21 +25,33 @@ public class EggItem extends Item {
- 
-             entityegg.setItem(itemstack);
-             entityegg.shootFromRotation(user, user.getXRot(), user.getYRot(), 0.0F, 1.5F, 1.0F);
-            // CraftBukkit start
-            if (!world.addFreshEntity(entityegg)) {
-+            // Paper start
-+            com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entityegg.getBukkitEntity());
-+            if (event.callEvent() && world.addFreshEntity(entityegg)) {
-+                if (event.shouldConsume() && !user.getAbilities().instabuild) {
-+                    itemstack.shrink(1);
-+                } else if (user instanceof net.minecraft.server.level.ServerPlayer) {
-+                    ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
-+                }
-+
-+                world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), net.minecraft.sounds.SoundEvents.EGG_THROW, net.minecraft.sounds.SoundSource.PLAYERS, 0.5F, 0.4F / (net.minecraft.world.entity.Entity.SHARED_RANDOM.nextFloat() * 0.4F + 0.8F));
-+                user.awardStat(Stats.ITEM_USED.get(this));
-+            } else {
-                 if (user instanceof net.minecraft.server.level.ServerPlayer) {
-                     ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
-                 }
-                 return InteractionResultHolder.fail(itemstack);
-             }
-            // CraftBukkit end
-+            // Paper end
-         }
-         world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), SoundEvents.EGG_THROW, SoundSource.PLAYERS, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
- 
-+        /* // Paper start - moved up
-         user.awardStat(Stats.ITEM_USED.get(this));
-         if (!user.getAbilities().instabuild) {
-             itemstack.shrink(1);
-         }
-+        */ // Paper end
- 
-         return InteractionResultHolder.sidedSuccess(itemstack, world.isClientSide());
-     }
-diff --git a/src/main/java/net/minecraft/world/item/EnderpearlItem.java b/src/main/java/net/minecraft/world/item/EnderpearlItem.java
-index c7d4745aed77b23562cde7c68b8870fa239428d4..749ab72edc0d2e9c6f1161415ab8d59d3d6ca976 100644
--- a/src/main/java/net/minecraft/world/item/EnderpearlItem.java
-+++ b/src/main/java/net/minecraft/world/item/EnderpearlItem.java
-@@ -25,7 +25,20 @@ public class EnderpearlItem extends Item {
- 
-             entityenderpearl.setItem(itemstack);
-             entityenderpearl.shootFromRotation(user, user.getXRot(), user.getYRot(), 0.0F, 1.5F, 1.0F);
-            if (!world.addFreshEntity(entityenderpearl)) {
-+            // Paper start
-+                com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entityenderpearl.getBukkitEntity());
-+            if (event.callEvent() && world.addFreshEntity(entityenderpearl)) {
-+                if (event.shouldConsume() && !user.getAbilities().instabuild) {
-+                    itemstack.shrink(1);
-+                } else if (user instanceof net.minecraft.server.level.ServerPlayer) {
-+                    ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
-+                }
-+
-+                world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), SoundEvents.ENDER_PEARL_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (net.minecraft.world.entity.Entity.SHARED_RANDOM.nextFloat() * 0.4F + 0.8F));
-+                user.awardStat(Stats.ITEM_USED.get(this));
-+                user.getCooldowns().addCooldown(this, 20);
-+            } else {
-+                // Paper end
-                 if (user instanceof net.minecraft.server.level.ServerPlayer) {
-                     ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
-                 }
-@@ -33,6 +46,7 @@ public class EnderpearlItem extends Item {
-             }
-         }
- 
-+        /* // Paper start - moved up
-         world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), SoundEvents.ENDER_PEARL_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
-         user.getCooldowns().addCooldown(this, 20);
-         // CraftBukkit end
-@@ -41,6 +55,7 @@ public class EnderpearlItem extends Item {
-         if (!user.getAbilities().instabuild) {
-             itemstack.shrink(1);
-         }
-+        */ // Paper end - moved up
- 
-         return InteractionResultHolder.sidedSuccess(itemstack, world.isClientSide());
-     }
-diff --git a/src/main/java/net/minecraft/world/item/ExperienceBottleItem.java b/src/main/java/net/minecraft/world/item/ExperienceBottleItem.java
-index 72dfb7b652f515bf9df201d524a851ab56706544..b80bedb5f27b474d7f66e9e1cc38ca3b692fc92b 100644
--- a/src/main/java/net/minecraft/world/item/ExperienceBottleItem.java
-+++ b/src/main/java/net/minecraft/world/item/ExperienceBottleItem.java
-@@ -22,18 +22,37 @@ public class ExperienceBottleItem extends Item {
-     @Override
-     public InteractionResultHolder<ItemStack> use(Level world, Player user, InteractionHand hand) {
-         ItemStack itemStack = user.getItemInHand(hand);
-        world.playSound((Player)null, user.getX(), user.getY(), user.getZ(), SoundEvents.EXPERIENCE_BOTTLE_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
-+        // world.playSound((Player)null, user.getX(), user.getY(), user.getZ(), SoundEvents.EXPERIENCE_BOTTLE_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F)); // Paper - moved down
-         if (!world.isClientSide) {
-             ThrownExperienceBottle thrownExperienceBottle = new ThrownExperienceBottle(world, user);
-             thrownExperienceBottle.setItem(itemStack);
-             thrownExperienceBottle.shootFromRotation(user, user.getXRot(), user.getYRot(), -20.0F, 0.7F, 1.0F);
-            world.addFreshEntity(thrownExperienceBottle);
-+            // Paper start
-+            com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), (org.bukkit.entity.Projectile) thrownExperienceBottle.getBukkitEntity());
-+            if (event.callEvent() && world.addFreshEntity(thrownExperienceBottle)) {
-+                if (event.shouldConsume() && !user.getAbilities().instabuild) {
-+                    itemStack.shrink(1);
-+                } else if (user instanceof net.minecraft.server.level.ServerPlayer) {
-+                    ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
-+                }
-+
-+                world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), SoundEvents.EXPERIENCE_BOTTLE_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (net.minecraft.world.entity.Entity.SHARED_RANDOM.nextFloat() * 0.4F + 0.8F));
-+                user.awardStat(Stats.ITEM_USED.get(this));
-+            } else {
-+                if (user instanceof net.minecraft.server.level.ServerPlayer) {
-+                    ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
-+                }
-+                return InteractionResultHolder.fail(itemStack);
-+            }
-+            // Paper end
-         }
- 
-+        /* // Paper start - moved up
-         user.awardStat(Stats.ITEM_USED.get(this));
-         if (!user.getAbilities().instabuild) {
-             itemStack.shrink(1);
-         }
-+        */ // Paper end
- 
-         return InteractionResultHolder.sidedSuccess(itemStack, world.isClientSide());
-     }
-diff --git a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-index f17e9c6c91c02e0d36f58851522a5d3e5e423121..82b0bda3e35ec2157a477e1a17b2b46baadc97d9 100644
--- a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-+++ b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-@@ -47,8 +47,12 @@ public class FireworkRocketItem extends Item {
-             Direction direction = context.getClickedFace();
-             FireworkRocketEntity fireworkRocketEntity = new FireworkRocketEntity(level, context.getPlayer(), vec3.x + (double)direction.getStepX() * 0.15D, vec3.y + (double)direction.getStepY() * 0.15D, vec3.z + (double)direction.getStepZ() * 0.15D, itemStack);
-             fireworkRocketEntity.spawningEntity = context.getPlayer() == null ? null : context.getPlayer().getUUID(); // Paper
-            level.addFreshEntity(fireworkRocketEntity);
-            itemStack.shrink(1);
-+            // Paper start - PlayerLaunchProjectileEvent
-+            com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) context.getPlayer().getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), (org.bukkit.entity.Firework) fireworkRocketEntity.getBukkitEntity());
-+            if (!event.callEvent() || !level.addFreshEntity(fireworkRocketEntity)) return InteractionResult.PASS;
-+            if (event.shouldConsume() && !context.getPlayer().getAbilities().instabuild) itemStack.shrink(1);
-+            else if (context.getPlayer() instanceof net.minecraft.server.level.ServerPlayer) ((net.minecraft.server.level.ServerPlayer) context.getPlayer()).getBukkitEntity().updateInventory();
-+            // Paper end
-         }
- 
-         return InteractionResult.sidedSuccess(level.isClientSide);
-diff --git a/src/main/java/net/minecraft/world/item/LingeringPotionItem.java b/src/main/java/net/minecraft/world/item/LingeringPotionItem.java
-index db0492f6337de562210ef062f46e98992c908200..f2d1b4e3fc08f6a06beb391bc6e60f62a9bf82b9 100644
--- a/src/main/java/net/minecraft/world/item/LingeringPotionItem.java
-+++ b/src/main/java/net/minecraft/world/item/LingeringPotionItem.java
-@@ -23,7 +23,12 @@ public class LingeringPotionItem extends ThrowablePotionItem {
- 
-     @Override
-     public InteractionResultHolder<ItemStack> use(Level world, Player user, InteractionHand hand) {
-+        // Paper start
-+        InteractionResultHolder<ItemStack> wrapper = super.use(world, user, hand);
-+        if (wrapper.getResult() != net.minecraft.world.InteractionResult.FAIL) {
-         world.playSound((Player)null, user.getX(), user.getY(), user.getZ(), SoundEvents.LINGERING_POTION_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
-        return super.use(world, user, hand);
-+        }
-+        return wrapper;
-+        // Paper end
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/item/SnowballItem.java b/src/main/java/net/minecraft/world/item/SnowballItem.java
-index d60e57e84f7d66e1858ab50ac33777feedf1c54d..ef3f90a5bcdd7b9815a4053cff166f9d2552f55d 100644
--- a/src/main/java/net/minecraft/world/item/SnowballItem.java
-+++ b/src/main/java/net/minecraft/world/item/SnowballItem.java
-@@ -26,18 +26,26 @@ public class SnowballItem extends Item {
- 
-             entitysnowball.setItem(itemstack);
-             entitysnowball.shootFromRotation(user, user.getXRot(), user.getYRot(), 0.0F, 1.5F, 1.0F);
-            if (world.addFreshEntity(entitysnowball)) {
-                if (!user.getAbilities().instabuild) {
-+            // Paper start
-+            com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entitysnowball.getBukkitEntity());
-+            if (event.callEvent() && world.addFreshEntity(entitysnowball)) {
-+                user.awardStat(Stats.ITEM_USED.get(this));
-+                if (event.shouldConsume() && !user.getAbilities().instabuild) {
-+                    // Paper end
-                     itemstack.shrink(1);
-+                } else if (user instanceof net.minecraft.server.level.ServerPlayer) {  // Paper
-+                    ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();  // Paper
-                 }
- 
-                 world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), SoundEvents.SNOWBALL_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
-            } else if (user instanceof net.minecraft.server.level.ServerPlayer) {
-                ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
-+            } else { // Paper
-+                if (user instanceof net.minecraft.server.level.ServerPlayer) ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory(); // Paper
-+                return InteractionResultHolder.fail(itemstack); // Paper
-             }
-         }
-         // CraftBukkit end
- 
-+        /* // Paper tart - moved up
-         user.awardStat(Stats.ITEM_USED.get(this));
-         // CraftBukkit start - moved up
-         /*
-@@ -45,6 +53,7 @@ public class SnowballItem extends Item {
-             itemstack.shrink(1);
-         }
-         */
-+        // Paper end
- 
-         return InteractionResultHolder.sidedSuccess(itemstack, world.isClientSide());
-     }
-diff --git a/src/main/java/net/minecraft/world/item/SplashPotionItem.java b/src/main/java/net/minecraft/world/item/SplashPotionItem.java
-index 317e20052bcac9118e1adeb619bedaacc6fcd690..ece19f30064e9f59d4df077683e1f894455a84b7 100644
--- a/src/main/java/net/minecraft/world/item/SplashPotionItem.java
-+++ b/src/main/java/net/minecraft/world/item/SplashPotionItem.java
-@@ -14,7 +14,12 @@ public class SplashPotionItem extends ThrowablePotionItem {
- 
-     @Override
-     public InteractionResultHolder<ItemStack> use(Level world, Player user, InteractionHand hand) {
-+        // Paper start
-+        InteractionResultHolder<ItemStack> wrapper = super.use(world, user, hand);
-+        if (wrapper.getResult() != net.minecraft.world.InteractionResult.FAIL) {
-         world.playSound((Player)null, user.getX(), user.getY(), user.getZ(), SoundEvents.SPLASH_POTION_THROW, SoundSource.PLAYERS, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
-        return super.use(world, user, hand);
-+        }
-+        return wrapper;
-+        // Paper end
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java b/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java
-index 0673f62f25532955f3552b64f122e644d42027e4..de5bdceb4c8578fb972a2fd5ee0dfdae509e46dc 100644
--- a/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java
-+++ b/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java
-@@ -19,13 +19,31 @@ public class ThrowablePotionItem extends PotionItem {
-             ThrownPotion thrownPotion = new ThrownPotion(world, user);
-             thrownPotion.setItem(itemStack);
-             thrownPotion.shootFromRotation(user, user.getXRot(), user.getYRot(), -20.0F, 0.5F, 1.0F);
-            world.addFreshEntity(thrownPotion);
-+            // Paper start
-+            com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), (org.bukkit.entity.Projectile) thrownPotion.getBukkitEntity());
-+            if (event.callEvent() && world.addFreshEntity(thrownPotion)) {
-+                if (event.shouldConsume() && !user.getAbilities().instabuild) {
-+                    itemStack.shrink(1);
-+                } else if (user instanceof net.minecraft.server.level.ServerPlayer) {
-+                    ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
-+                }
-+
-+                user.awardStat(Stats.ITEM_USED.get(this));
-+            } else {
-+                if (user instanceof net.minecraft.server.level.ServerPlayer) {
-+                    ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
-+                }
-+                return InteractionResultHolder.fail(itemStack);
-+            }
-+            // Paper end
-         }
- 
-+        /* // Paper start - moved up
-         user.awardStat(Stats.ITEM_USED.get(this));
-         if (!user.getAbilities().instabuild) {
-             itemStack.shrink(1);
-         }
-+        */ // Paper end
- 
-         return InteractionResultHolder.sidedSuccess(itemStack, world.isClientSide());
-     }
-diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java
-index 216ae3fbc6d64538255ad404ad7e9915d6694f81..8078f127ff4b6e0aafb5804b9c02e237f79445b5 100644
--- a/src/main/java/net/minecraft/world/item/TridentItem.java
-+++ b/src/main/java/net/minecraft/world/item/TridentItem.java
-@@ -83,21 +83,25 @@ public class TridentItem extends Item implements Vanishable {
-                             }
- 
-                             // CraftBukkit start
-                            if (!world.addFreshEntity(entitythrowntrident)) {
-+                            // Paper start
-+                            com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(stack), (org.bukkit.entity.Projectile) entitythrowntrident.getBukkitEntity());
-+                            if (!event.callEvent() || !world.addFreshEntity(entitythrowntrident)) {
-+                                // Paper end
-                                 if (entityhuman instanceof net.minecraft.server.level.ServerPlayer) {
-                                     ((net.minecraft.server.level.ServerPlayer) entityhuman).getBukkitEntity().updateInventory();
-                                 }
-                                 return;
-                             }
-
-+                            if (event.shouldConsume()) { // Paper
-                             stack.hurtAndBreak(1, entityhuman, (entityhuman1) -> {
-                                 entityhuman1.broadcastBreakEvent(user.getUsedItemHand());
-                             });
-+                            } // Paper
-                             entitythrowntrident.tridentItem = stack.copy(); // SPIGOT-4511 update since damage call moved
-                             // CraftBukkit end
- 
-                             world.playSound((Player) null, (Entity) entitythrowntrident, SoundEvents.TRIDENT_THROW, SoundSource.PLAYERS, 1.0F, 1.0F);
-                            if (!entityhuman.getAbilities().instabuild) {
-+                            if (event.shouldConsume() && !entityhuman.getAbilities().instabuild) { // Paper
-                                 entityhuman.getInventory().removeItem(stack);
-                             }
-                             // CraftBukkit start - SPIGOT-5458 also need in this branch :(
--- a/patches/unapplied/server/0224-Improve-BlockPosition-inlining.patch
+++ b/patches/unapplied/server/0224-Improve-BlockPosition-inlining.patch
@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Techcable <Techcable@outlook.com>
-Date: Wed, 30 Nov 2016 20:56:58 -0600
-Subject: [PATCH] Improve BlockPosition inlining
-
-Normally the JVM can inline virtual getters by having two sets of code, one is the 'optimized' code and the other is the 'deoptimized' code.
-If a single type is used 99% of the time, then its worth it to inline, and to revert to 'deoptimized' the 1% of the time we encounter other types.
-But if two types are encountered commonly, then the JVM can't inline them both, and the call overhead remains.
-
-This scenario also occurs with BlockPos and MutableBlockPos.
-The variables in BlockPos are final, so MutableBlockPos can't modify them.
-MutableBlockPos fixes this by adding custom mutable variables, and overriding the getters to access them.
-
-This approach with utility methods that operate on MutableBlockPos and BlockPos.
-Specific examples are BlockPosition.up(), and World.isValidLocation().
-It makes these simple methods much slower than they need to be.
-
-This should result in an across the board speedup in anything that accesses blocks or does logic with positions.
-
-This is based upon conclusions drawn from inspecting the assenmbly generated bythe JIT compiler on my microbenchmarks.
-They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
-
-diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java
-index 40950db0c242c65dfd4de247c86249354d12108f..e87ef99260bff134529e00b9a75381cecaec01a4 100644
--- a/src/main/java/net/minecraft/core/Vec3i.java
-+++ b/src/main/java/net/minecraft/core/Vec3i.java
-@@ -44,7 +44,7 @@ public class Vec3i implements Comparable<Vec3i> {
-     }
- 
-     @Override
-    public boolean equals(Object object) {
-+    public final boolean equals(Object object) { // Paper
-         if (this == object) {
-             return true;
-         } else if (!(object instanceof Vec3i)) {
-@@ -62,7 +62,7 @@ public class Vec3i implements Comparable<Vec3i> {
-     }
- 
-     @Override
-    public int hashCode() {
-+    public final int hashCode() { // Paper
-         return (this.getY() + this.getZ() * 31) * 31 + this.getX();
-     }
- 
-@@ -75,15 +75,15 @@ public class Vec3i implements Comparable<Vec3i> {
-         }
-     }
- 
-    public int getX() {
-+    public final int getX() { // Paper
-         return this.x;
-     }
- 
-    public int getY() {
-+    public final int getY() { // Paper
-         return this.y;
-     }
- 
-    public int getZ() {
-+    public final int getZ() { // Paper
-         return this.z;
-     }
- 
--- a/patches/unapplied/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/unapplied/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Hugo Manrique <hugmanrique@gmail.com>
-Date: Mon, 23 Jul 2018 12:57:39 +0200
-Subject: [PATCH] Option to prevent armor stands from doing entity lookups
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 68ac3ffae5d800bde3c5b5163a52768a43bb5963..a59381646031a1a99c98c8c6ad9de7efc96b774a 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-@@ -337,6 +337,7 @@ public class ArmorStand extends LivingEntity {
- 
-     @Override
-     protected void pushEntities() {
-+        if (!this.level().paperConfig().entities.armorStands.doCollisionEntityLookups) return; // Paper
-         List<Entity> list = this.level().getEntities((Entity) this, this.getBoundingBox(), ArmorStand.RIDABLE_MINECARTS);
- 
-         for (int i = 0; i < list.size(); ++i) {
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ce24a52b2b9fb0ae7cfb085a204de8780bc8f5d6..0b02ba70956ea1352ea8e67957b3789408b67f6b 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -849,6 +849,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-             // Paper end
-         }
-     }
-+    // Paper start - Prevent armor stands from doing entity lookups
-+    @Override
-+    public boolean noCollision(@Nullable Entity entity, AABB box) {
-+        if (entity instanceof net.minecraft.world.entity.decoration.ArmorStand && !entity.level().paperConfig().entities.armorStands.doCollisionEntityLookups) return false;
-+        return LevelAccessor.super.noCollision(entity, box);
-+    }
-+    // Paper end
- 
-     public boolean shouldTickDeath(Entity entity) {
-         return true;
--- a/patches/unapplied/server/0226-Vanished-players-don-t-have-rights.patch
+++ b/patches/unapplied/server/0226-Vanished-players-don-t-have-rights.patch
@ -1,109 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Hugo Manrique <hugmanrique@gmail.com>
-Date: Mon, 23 Jul 2018 14:22:26 +0200
-Subject: [PATCH] Vanished players don't have rights
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index e9ae25a70c747c173ebd2e393818d205527d5314..f49dd279ba9e8970f116f956466feb072c4f8420 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -217,6 +217,15 @@ public abstract class Projectile extends Entity implements TraceableEntity {
-         } else {
-             Entity entity1 = this.getOwner();
- 
-+            // Paper start - Cancel hit for vanished players
-+            if (entity1 instanceof net.minecraft.server.level.ServerPlayer && entity instanceof net.minecraft.server.level.ServerPlayer) {
-+                org.bukkit.entity.Player collided = (org.bukkit.entity.Player) entity.getBukkitEntity();
-+                org.bukkit.entity.Player shooter = (org.bukkit.entity.Player) entity1.getBukkitEntity();
-+                if (!shooter.canSee(collided)) {
-+                    return false;
-+                }
-+            }
-+            // Paper end
-             return entity1 == null || this.leftOwner || !entity1.isPassengerOfSameVehicle(entity);
-         }
-     }
-diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index a6638e626600e4304a973497a39e3fac52203b16..e68b7a1b03783e4f9de24c5ae8773fc359bd2d37 100644
--- a/src/main/java/net/minecraft/world/item/BlockItem.java
-+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
-@@ -197,7 +197,8 @@ public class BlockItem extends Item {
-         Player entityhuman = context.getPlayer();
-         CollisionContext voxelshapecollision = entityhuman == null ? CollisionContext.empty() : CollisionContext.of(entityhuman);
-         // CraftBukkit start - store default return
-        boolean defaultReturn = (!this.mustSurvive() || state.canSurvive(context.getLevel(), context.getClickedPos())) && context.getLevel().isUnobstructed(state, context.getClickedPos(), voxelshapecollision);
-+        Level world = context.getLevel(); // Paper
-+        boolean defaultReturn = (!this.mustSurvive() || state.canSurvive(context.getLevel(), context.getClickedPos())) && world.checkEntityCollision(state, entityhuman, voxelshapecollision, context.getClickedPos(), true); // Paper
-         org.bukkit.entity.Player player = (context.getPlayer() instanceof ServerPlayer) ? (org.bukkit.entity.Player) context.getPlayer().getBukkitEntity() : null;
- 
-         BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(context.getLevel(), context.getClickedPos()), player, CraftBlockData.fromData(state), defaultReturn);
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 0b02ba70956ea1352ea8e67957b3789408b67f6b..8320bece16dfa339e33801e43ff2f297bc876001 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -273,6 +273,45 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
-     }
- 
-+    // Paper start
-+    // ret true if no collision
-+    public final boolean checkEntityCollision(BlockState data, Entity source, net.minecraft.world.phys.shapes.CollisionContext voxelshapedcollision,
-+                                              BlockPos position, boolean checkCanSee) {
-+        // Copied from IWorldReader#a(IBlockData, BlockPosition, VoxelShapeCollision) & EntityAccess#a(Entity, VoxelShape)
-+        net.minecraft.world.phys.shapes.VoxelShape voxelshape = data.getCollisionShape(this, position, voxelshapedcollision);
-+        if (voxelshape.isEmpty()) {
-+            return true;
-+        }
-+
-+        voxelshape = voxelshape.move((double) position.getX(), (double) position.getY(), (double) position.getZ());
-+        if (voxelshape.isEmpty()) {
-+            return true;
-+        }
-+
-+        List<Entity> entities = this.getEntities(null, voxelshape.bounds());
-+        for (int i = 0, len = entities.size(); i < len; ++i) {
-+            Entity entity = entities.get(i);
-+
-+            if (checkCanSee && source instanceof net.minecraft.server.level.ServerPlayer && entity instanceof net.minecraft.server.level.ServerPlayer
-+                && !((net.minecraft.server.level.ServerPlayer) source).getBukkitEntity().canSee(((net.minecraft.server.level.ServerPlayer) entity).getBukkitEntity())) {
-+                continue;
-+            }
-+
-+            // !entity1.dead && entity1.i && (entity == null || !entity1.x(entity));
-+            // elide the last check since vanilla calls with entity = null
-+            // only we care about the source for the canSee check
-+            if (entity.isRemoved() || !entity.blocksBuilding) {
-+                continue;
-+            }
-+
-+            if (net.minecraft.world.phys.shapes.Shapes.joinIsNotEmpty(voxelshape, net.minecraft.world.phys.shapes.Shapes.create(entity.getBoundingBox()), net.minecraft.world.phys.shapes.BooleanOp.AND)) {
-+                return false;
-+            }
-+        }
-+
-+        return true;
-+    }
-+    // Paper end
-     @Override
-     public boolean isClientSide() {
-         return this.isClientSide;
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4942ea5a66af310eac646a6be20e997d53ab99fb..53af54ffecd7fdb20588d75a8c32003cb89a75b1 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1341,6 +1341,14 @@ public class CraftEventFactory {
-         Projectile projectile = (Projectile) entity.getBukkitEntity();
-         org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity();
-         com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
-+
-+        if (projectile.getShooter() instanceof Player && collided instanceof Player) {
-+            if (!((Player) projectile.getShooter()).canSee((Player) collided)) {
-+                event.setCancelled(true);
-+                return event;
-+            }
-+        }
-+
-         Bukkit.getPluginManager().callEvent(event);
-         return event;
-     }
--- a/patches/unapplied/server/0227-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/unapplied/server/0227-Allow-disabling-armour-stand-ticking.patch
@ -1,145 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Wed, 15 Aug 2018 01:26:09 -0700
-Subject: [PATCH] Allow disabling armour stand ticking
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index a59381646031a1a99c98c8c6ad9de7efc96b774a..719f68f96e58ddcdd3592131c691d21263c81915 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-@@ -93,9 +93,16 @@ public class ArmorStand extends LivingEntity {
-     public Rotations leftLegPose;
-     public Rotations rightLegPose;
-     public boolean canMove = true; // Paper
-+    // Paper start - Allow ArmorStands not to tick
-+    public boolean canTick = true;
-+    public boolean canTickSetByAPI = false;
-+    private boolean noTickPoseDirty = false;
-+    private boolean noTickEquipmentDirty = false;
-+    // Paper end
- 
-     public ArmorStand(EntityType<? extends ArmorStand> type, Level world) {
-         super(type, world);
-+        if (world != null) this.canTick = world.paperConfig().entities.armorStands.tick; // Paper - armour stand ticking
-         this.handItems = NonNullList.withSize(2, ItemStack.EMPTY);
-         this.armorItems = NonNullList.withSize(4, ItemStack.EMPTY);
-         this.headPose = ArmorStand.DEFAULT_HEAD_POSE;
-@@ -190,6 +197,7 @@ public class ArmorStand extends LivingEntity {
-                 this.onEquipItem(enumitemslot, (ItemStack) this.armorItems.set(enumitemslot.getIndex(), itemstack), itemstack, silent); // CraftBukkit
-         }
- 
-+        this.noTickEquipmentDirty = true; // Paper - Allow equipment to be updated even when tick disabled
-     }
- 
-     @Override
-@@ -240,6 +248,7 @@ public class ArmorStand extends LivingEntity {
-         }
- 
-         nbt.put("Pose", this.writePose());
-+        if (this.canTickSetByAPI) nbt.putBoolean("Paper.CanTickOverride", this.canTick); // Paper - persist no tick setting
-     }
- 
-     @Override
-@@ -271,6 +280,12 @@ public class ArmorStand extends LivingEntity {
-         this.setNoBasePlate(nbt.getBoolean("NoBasePlate"));
-         this.setMarker(nbt.getBoolean("Marker"));
-         this.noPhysics = !this.hasPhysics();
-+        // Paper start - persist no tick
-+        if (nbt.contains("Paper.CanTickOverride")) {
-+            this.canTick = nbt.getBoolean("Paper.CanTickOverride");
-+            this.canTickSetByAPI = true;
-+        }
-+        // Paper end
-         CompoundTag nbttagcompound1 = nbt.getCompound("Pose");
- 
-         this.readPose(nbttagcompound1);
-@@ -663,7 +678,29 @@ public class ArmorStand extends LivingEntity {
- 
-     @Override
-     public void tick() {
-+        // Paper start
-+        if (!this.canTick) {
-+            if (this.noTickPoseDirty) {
-+                this.noTickPoseDirty = false;
-+                this.updatePose();
-+            }
-+
-+            if (this.noTickEquipmentDirty) {
-+                this.noTickEquipmentDirty = false;
-+                this.detectEquipmentUpdates();
-+            }
-+
-+            return;
-+        }
-+        // Paper end
-+
-         super.tick();
-+        // Paper start - Split into separate method
-+        updatePose();
-+    }
-+
-+    public void updatePose() {
-+        // Paper end
-         Rotations vector3f = (Rotations) this.entityData.get(ArmorStand.DATA_HEAD_POSE);
- 
-         if (!this.headPose.equals(vector3f)) {
-@@ -792,31 +829,37 @@ public class ArmorStand extends LivingEntity {
-     public void setHeadPose(Rotations angle) {
-         this.headPose = angle;
-         this.entityData.set(ArmorStand.DATA_HEAD_POSE, angle);
-+        this.noTickPoseDirty = true; // Paper - Allow updates when not ticking
-     }
- 
-     public void setBodyPose(Rotations angle) {
-         this.bodyPose = angle;
-         this.entityData.set(ArmorStand.DATA_BODY_POSE, angle);
-+        this.noTickPoseDirty = true; // Paper - Allow updates when not ticking
-     }
- 
-     public void setLeftArmPose(Rotations angle) {
-         this.leftArmPose = angle;
-         this.entityData.set(ArmorStand.DATA_LEFT_ARM_POSE, angle);
-+        this.noTickPoseDirty = true; // Paper - Allow updates when not ticking
-     }
- 
-     public void setRightArmPose(Rotations angle) {
-         this.rightArmPose = angle;
-         this.entityData.set(ArmorStand.DATA_RIGHT_ARM_POSE, angle);
-+        this.noTickPoseDirty = true; // Paper - Allow updates when not ticking
-     }
- 
-     public void setLeftLegPose(Rotations angle) {
-         this.leftLegPose = angle;
-         this.entityData.set(ArmorStand.DATA_LEFT_LEG_POSE, angle);
-+        this.noTickPoseDirty = true; // Paper - Allow updates when not ticking
-     }
- 
-     public void setRightLegPose(Rotations angle) {
-         this.rightLegPose = angle;
-         this.entityData.set(ArmorStand.DATA_RIGHT_LEG_POSE, angle);
-+        this.noTickPoseDirty = true; // Paper - Allow updates when not ticking
-     }
- 
-     public Rotations getHeadPose() {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index fc3b98746a558b3ad6c89543170225bdae1e63ba..f4d46cd34fb97ebbf2e95d905d315b93add958b8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-@@ -232,5 +232,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
-     public void setCanMove(boolean move) {
-         getHandle().canMove = move;
-     }
-+
-+    @Override
-+    public boolean canTick() {
-+        return this.getHandle().canTick;
-+    }
-+
-+    @Override
-+    public void setCanTick(final boolean tick) {
-+        this.getHandle().canTick = tick;
-+        this.getHandle().canTickSetByAPI = true;
-+    }
-     // Paper end
- }
--- a/patches/unapplied/server/0228-SkeletonHorse-Additions.patch
+++ b/patches/unapplied/server/0228-SkeletonHorse-Additions.patch
@ -1,87 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 27 Jul 2018 22:36:31 -0500
-Subject: [PATCH] SkeletonHorse Additions
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java
-index 8f20239f3ef7ebe41fac8ee6e024c36dafec33c4..d00fb16ae3b94dfcb10fd1a7c1671595e2ff1855 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonTrapGoal.java
-@@ -18,6 +18,7 @@ import net.minecraft.world.item.enchantment.EnchantmentHelper;
- public class SkeletonTrapGoal extends Goal {
- 
-     private final SkeletonHorse horse;
-+    private java.util.List<org.bukkit.entity.HumanEntity> eligiblePlayers; // Paper
- 
-     public SkeletonTrapGoal(SkeletonHorse skeletonHorse) {
-         this.horse = skeletonHorse;
-@@ -25,12 +26,13 @@ public class SkeletonTrapGoal extends Goal {
- 
-     @Override
-     public boolean canUse() {
-        return this.horse.level().hasNearbyAlivePlayerThatAffectsSpawning(this.horse.getX(), this.horse.getY(), this.horse.getZ(), 10.0D); // Paper - Affects Spawning API
-+        return !(eligiblePlayers = this.horse.level().findNearbyBukkitPlayers(this.horse.getX(), this.horse.getY(), this.horse.getZ(), 10.0D, net.minecraft.world.entity.EntitySelector.PLAYER_AFFECTS_SPAWNING)).isEmpty(); // Paper - Affects Spawning API & SkeletonHorseTrapEvent
-     }
- 
-     @Override
-     public void tick() {
-         ServerLevel worldserver = (ServerLevel) this.horse.level();
-+        if (!new com.destroystokyo.paper.event.entity.SkeletonHorseTrapEvent((org.bukkit.entity.SkeletonHorse) this.horse.getBukkitEntity(), eligiblePlayers).callEvent()) return; // Paper
-         DifficultyInstance difficultydamagescaler = worldserver.getCurrentDifficultyAt(this.horse.blockPosition());
- 
-         this.horse.setTrap(false);
-diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index ea98625fe7c00743b8df74a24e6d4b75df4189a5..66a5783e2a83c75ca46d1fd6f97d9de733c01a09 100644
--- a/src/main/java/net/minecraft/world/level/EntityGetter.java
-+++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
-@@ -105,6 +105,28 @@ public interface EntityGetter {
-         return player;
-     }
- 
-+    // Paper start
-+    default List<org.bukkit.entity.HumanEntity> findNearbyBukkitPlayers(double x, double y, double z, double radius, boolean notSpectator) {
-+        return findNearbyBukkitPlayers(x, y, z, radius, notSpectator ? EntitySelector.NO_SPECTATORS : net.minecraft.world.entity.EntitySelector.NO_CREATIVE_OR_SPECTATOR);
-+    }
-+
-+    default List<org.bukkit.entity.HumanEntity> findNearbyBukkitPlayers(double x, double y, double z, double radius, @Nullable Predicate<Entity> predicate) {
-+        com.google.common.collect.ImmutableList.Builder<org.bukkit.entity.HumanEntity> builder = com.google.common.collect.ImmutableList.builder();
-+
-+        for (Player human : this.players()) {
-+            if (predicate == null || predicate.test(human)) {
-+                double distanceSquared = human.distanceToSqr(x, y, z);
-+
-+                if (radius < 0.0D || distanceSquared < radius * radius) {
-+                    builder.add(human.getBukkitEntity());
-+                }
-+            }
-+        }
-+
-+        return builder.build();
-+    }
-+    // Paper end
-+
-     @Nullable
-     default Player getNearestPlayer(Entity entity, double maxDistance) {
-         return this.getNearestPlayer(entity.getX(), entity.getY(), entity.getZ(), maxDistance, false);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-index 1a631ab092bbd03d24a09e22992bb16c825e7043..bba6dcac6df4841561cf39b9ea0fc116f57a901b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-@@ -44,4 +44,16 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
-     public void setTrapTime(int trapTime) {
-         this.getHandle().trapTime = trapTime;
-     }
-+
-+    // Paper start - replaced by above methods
-+    @Override
-+    public boolean isTrap() {
-+        return getHandle().isTrap();
-+    }
-+
-+    @Override
-+    public void setTrap(boolean trap) {
-+        getHandle().setTrap(trap);
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/patches/unapplied/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Hugo Manrique <hugmanrique@gmail.com>
-Date: Thu, 26 Jul 2018 14:10:23 +0200
-Subject: [PATCH] Don't call getItemMeta on hasItemMeta
-
-Spigot 1.13 checks if any field (which are manually copied from the ItemStack's "tag" NBT tag) on the ItemMeta class of an ItemStack is set.
-
-We could just check if the "tag" NBT tag is empty, albeit that would break some plugins. The only general tag added on 1.13 is "Damage", and we can just check if the "tag" NBT tag contains any other tag that's not "Damage" (https://minecraft.gamepedia.com/Player.dat_format#Item_structure) making the `hasItemStack` method behave as before.
-
-Returns true if getDamage() == 0 or has damage tag or other tag is set.
-Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 00bdaff22deab7a9f328670917fe2bae01e37a73..cee7a93cd516ed8f483fd29dfcd6a54f4c37e348 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -678,7 +678,7 @@ public final class CraftItemStack extends ItemStack {
- 
-     @Override
-     public boolean hasItemMeta() {
-        return CraftItemStack.hasItemMeta(this.handle) && !CraftItemFactory.instance().equals(this.getItemMeta(), null);
-+        return CraftItemStack.hasItemMeta(this.handle) && (this.handle.getDamageValue() != 0 || (this.handle.getTag() != null && this.handle.getTag().tags.size() >= (this.handle.getTag().contains(CraftMetaItem.DAMAGE.NBT) ? 2 : 1))); // Paper - keep 1.12 CraftBukkit behavior without calling getItemMeta
-     }
- 
-     static boolean hasItemMeta(net.minecraft.world.item.ItemStack item) {
-diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 4400f10a592b86488e61521a4fce61adbf656cb9..7cc7f485325a4277bac7a6eade749dbb3b0b104f 100644
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-@@ -107,6 +107,34 @@ public class ItemMetaTest extends AbstractTestingBase {
-         assertThat(itemMeta.hasConflictingEnchant(null), is(false));
-     }
- 
-+    // Paper start
-+    private void testItemMeta(ItemStack stack) {
-+        assertThat("Should not have ItemMeta", stack.hasItemMeta(), is(false));
-+
-+        stack.setDurability((short) 0);
-+        assertThat("ItemStack with zero durability should not have ItemMeta", stack.hasItemMeta(), is(false));
-+
-+        stack.setDurability((short) 2);
-+        assertThat("ItemStack with non-zero durability should have ItemMeta", stack.hasItemMeta(), is(true));
-+
-+        stack.setLore(java.util.Collections.singletonList("Lore"));
-+        assertThat("ItemStack with lore and durability should have ItemMeta", stack.hasItemMeta(), is(true));
-+
-+        stack.setDurability((short) 0);
-+        assertThat("ItemStack with lore should have ItemMeta", stack.hasItemMeta(), is(true));
-+
-+        stack.setLore(null);
-+    }
-+
-+    @Test
-+    public void testHasItemMeta() {
-+        ItemStack itemStack = new ItemStack(Material.SHEARS);
-+
-+        testItemMeta(itemStack);
-+        testItemMeta(CraftItemStack.asCraftCopy(itemStack));
-+    }
-+    // Paper end
-+
-     @Test
-     public void testConflictingStoredEnchantment() {
-         EnchantmentStorageMeta itemMeta = (EnchantmentStorageMeta) Bukkit.getItemFactory().getItemMeta(Material.ENCHANTED_BOOK);
--- a/patches/unapplied/server/0230-Implement-Expanded-ArmorStand-API.patch
+++ b/patches/unapplied/server/0230-Implement-Expanded-ArmorStand-API.patch
@ -1,167 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: willies952002 <admin@domnian.com>
-Date: Thu, 26 Jul 2018 02:25:46 -0400
-Subject: [PATCH] Implement Expanded ArmorStand API
-
-Adds the following:
- Add proper methods for getting and setting items in both hands. Deprecates old methods
- Enable/Disable slot interactions
- Allow using degrees for ArmorStand rotations (via new Rotations class)
-
-== AT ==
-public net.minecraft.world.entity.decoration.ArmorStand isDisabled(Lnet/minecraft/world/entity/EquipmentSlot;)Z
-
-Co-authored-by: SoSeDiK <mrsosedik@gmail.com>
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index f4d46cd34fb97ebbf2e95d905d315b93add958b8..273f3c029f878c8a30e4f0911d79195c023d3442 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-@@ -233,6 +233,147 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
-         getHandle().canMove = move;
-     }
- 
-+    @Override
-+    public ItemStack getItem(org.bukkit.inventory.EquipmentSlot slot) {
-+        com.google.common.base.Preconditions.checkNotNull(slot, "slot");
-+        return getHandle().getItemBySlot(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot)).asBukkitMirror();
-+    }
-+
-+    @Override
-+    public void setItem(org.bukkit.inventory.EquipmentSlot slot, ItemStack item) {
-+        com.google.common.base.Preconditions.checkNotNull(slot, "slot");
-+        switch (slot) {
-+            case HAND:
-+                getEquipment().setItemInMainHand(item);
-+                return;
-+            case OFF_HAND:
-+                getEquipment().setItemInOffHand(item);
-+                return;
-+            case FEET:
-+                setBoots(item);
-+                return;
-+            case LEGS:
-+                setLeggings(item);
-+                return;
-+            case CHEST:
-+                setChestplate(item);
-+                return;
-+            case HEAD:
-+                setHelmet(item);
-+                return;
-+        }
-+        throw new UnsupportedOperationException(slot.name());
-+    }
-+
-+    @Override
-+    public java.util.Set<org.bukkit.inventory.EquipmentSlot> getDisabledSlots() {
-+        java.util.Set<org.bukkit.inventory.EquipmentSlot> disabled = new java.util.HashSet<>();
-+        for (org.bukkit.inventory.EquipmentSlot slot : org.bukkit.inventory.EquipmentSlot.values()) {
-+            if (this.isSlotDisabled(slot)) {
-+                disabled.add(slot);
-+            }
-+        }
-+        return disabled;
-+    }
-+
-+    @Override
-+    public void setDisabledSlots(org.bukkit.inventory.EquipmentSlot... slots) {
-+        int disabled = 0;
-+        for (org.bukkit.inventory.EquipmentSlot slot : slots) {
-+            if (slot == org.bukkit.inventory.EquipmentSlot.OFF_HAND) continue;
-+            net.minecraft.world.entity.EquipmentSlot nmsSlot = org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot);
-+            disabled += (1 << nmsSlot.getFilterFlag()) + (1 << (nmsSlot.getFilterFlag() + 8)) + (1 << (nmsSlot.getFilterFlag() + 16));
-+        }
-+        getHandle().disabledSlots = disabled;
-+    }
-+
-+    @Override
-+    public void addDisabledSlots(org.bukkit.inventory.EquipmentSlot... slots) {
-+        java.util.Set<org.bukkit.inventory.EquipmentSlot> disabled = getDisabledSlots();
-+        java.util.Collections.addAll(disabled, slots);
-+        setDisabledSlots(disabled.toArray(new org.bukkit.inventory.EquipmentSlot[0]));
-+    }
-+
-+    @Override
-+    public void removeDisabledSlots(org.bukkit.inventory.EquipmentSlot... slots) {
-+        java.util.Set<org.bukkit.inventory.EquipmentSlot> disabled = getDisabledSlots();
-+        for (final org.bukkit.inventory.EquipmentSlot slot : slots) disabled.remove(slot);
-+        setDisabledSlots(disabled.toArray(new org.bukkit.inventory.EquipmentSlot[0]));
-+    }
-+
-+    @Override
-+    public boolean isSlotDisabled(org.bukkit.inventory.EquipmentSlot slot) {
-+        return getHandle().isDisabled(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
-+    }
-+
-+    @Override
-+    public io.papermc.paper.math.Rotations getBodyRotations() {
-+        return fromNMSRotations(getHandle().bodyPose);
-+    }
-+
-+    @Override
-+    public void setBodyRotations(io.papermc.paper.math.Rotations rotations) {
-+        getHandle().setBodyPose(toNMSRotations(rotations));
-+    }
-+
-+    @Override
-+    public io.papermc.paper.math.Rotations getLeftArmRotations() {
-+        return fromNMSRotations(getHandle().leftArmPose);
-+    }
-+
-+    @Override
-+    public void setLeftArmRotations(io.papermc.paper.math.Rotations rotations) {
-+        getHandle().setLeftArmPose(toNMSRotations(rotations));
-+    }
-+
-+    @Override
-+    public io.papermc.paper.math.Rotations getRightArmRotations() {
-+        return fromNMSRotations(getHandle().rightArmPose);
-+    }
-+
-+    @Override
-+    public void setRightArmRotations(io.papermc.paper.math.Rotations rotations) {
-+        getHandle().setRightArmPose(toNMSRotations(rotations));
-+    }
-+
-+    @Override
-+    public io.papermc.paper.math.Rotations getLeftLegRotations() {
-+        return fromNMSRotations(getHandle().leftLegPose);
-+    }
-+
-+    @Override
-+    public void setLeftLegRotations(io.papermc.paper.math.Rotations rotations) {
-+        getHandle().setLeftLegPose(toNMSRotations(rotations));
-+    }
-+
-+    @Override
-+    public io.papermc.paper.math.Rotations getRightLegRotations() {
-+        return fromNMSRotations(getHandle().rightLegPose);
-+    }
-+
-+    @Override
-+    public void setRightLegRotations(io.papermc.paper.math.Rotations rotations) {
-+        getHandle().setRightLegPose(toNMSRotations(rotations));
-+    }
-+
-+    @Override
-+    public io.papermc.paper.math.Rotations getHeadRotations() {
-+        return fromNMSRotations(getHandle().headPose);
-+    }
-+
-+    @Override
-+    public void setHeadRotations(io.papermc.paper.math.Rotations rotations) {
-+        getHandle().setHeadPose(toNMSRotations(rotations));
-+    }
-+
-+    private static io.papermc.paper.math.Rotations fromNMSRotations(Rotations old) {
-+        return io.papermc.paper.math.Rotations.ofDegrees(old.getX(), old.getY(), old.getZ());
-+    }
-+
-+    private static Rotations toNMSRotations(io.papermc.paper.math.Rotations old) {
-+        return new Rotations((float) old.x(), (float) old.y(), (float) old.z());
-+    }
-+
-     @Override
-     public boolean canTick() {
-         return this.getHandle().canTick;
--- a/patches/unapplied/server/0231-AnvilDamageEvent.patch
+++ b/patches/unapplied/server/0231-AnvilDamageEvent.patch
@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 20 Jul 2018 23:37:03 -0500
-Subject: [PATCH] AnvilDamageEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-index b3d4b8a1a3fecd58edeed6562ffabe123569c139..d15f01f5a4f14d25ded9de015c70cbc7977a6a77 100644
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-@@ -108,6 +108,16 @@ public class AnvilMenu extends ItemCombinerMenu {
-             if (!player.getAbilities().instabuild && iblockdata.is(BlockTags.ANVIL) && player.getRandom().nextFloat() < 0.12F) {
-                 BlockState iblockdata1 = AnvilBlock.damage(iblockdata);
- 
-+                // Paper start
-+                com.destroystokyo.paper.event.block.AnvilDamagedEvent event = new com.destroystokyo.paper.event.block.AnvilDamagedEvent(getBukkitView(), iblockdata1 != null ? org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(iblockdata1) : null);
-+                if (!event.callEvent()) {
-+                    return;
-+                } else if (event.getDamageState() == com.destroystokyo.paper.event.block.AnvilDamagedEvent.DamageState.BROKEN) {
-+                    iblockdata1 = null;
-+                } else {
-+                    iblockdata1 = ((org.bukkit.craftbukkit.block.data.CraftBlockData) event.getDamageState().getMaterial().createBlockData()).getState().setValue(AnvilBlock.FACING, iblockdata.getValue(AnvilBlock.FACING));
-+                }
-+                // Paper end
-                 if (iblockdata1 == null) {
-                     world.removeBlock(blockposition, false);
-                     world.levelEvent(1029, blockposition, 0);
--- a/patches/unapplied/server/0232-Add-TNTPrimeEvent.patch
+++ b/patches/unapplied/server/0232-Add-TNTPrimeEvent.patch
@ -1,117 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
-Date: Mon, 16 Jul 2018 00:05:05 +0300
-Subject: [PATCH] Add TNTPrimeEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 9d5d03a913366c0f60557e39523c30df7e2fde33..fada988941c33e09bce5e71bcb2bb733185f6c12 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -567,6 +567,11 @@ public class EnderDragon extends Mob implements Enemy {
-                     });
-                     craftBlock.getNMS().spawnAfterBreak((ServerLevel) this.level(), blockposition, ItemStack.EMPTY, false);
-                 }
-+                // Paper start - TNTPrimeEvent
-+                org.bukkit.block.Block tntBlock = this.level().getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
-+                if(!new com.destroystokyo.paper.event.block.TNTPrimeEvent(tntBlock, com.destroystokyo.paper.event.block.TNTPrimeEvent.PrimeReason.EXPLOSION, explosionSource.getIndirectSourceEntity().getBukkitEntity()).callEvent())
-+                    continue;
-+                // Paper end
-                 nmsBlock.wasExploded(this.level(), blockposition, explosionSource);
- 
-                 this.level().removeBlock(blockposition, false);
-diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index 49df94d8a5d1d4020e7e9f5457f117ebaa581b43..945d8b0f58f6a5b2281f136d3afbba3b34e0e6b5 100644
--- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-@@ -295,12 +295,19 @@ public class FireBlock extends BaseFireBlock {
- 
-                 world.setBlock(blockposition, this.getStateWithAge(world, blockposition, l), 3);
-             } else {
-                world.removeBlock(blockposition, false);
-+                if(iblockdata.getBlock() != Blocks.TNT) world.removeBlock(blockposition, false); // Paper - TNTPrimeEvent - We might be cancelling it below, move the setAir down
-             }
- 
-             Block block = iblockdata.getBlock();
- 
-             if (block instanceof TntBlock) {
-+                // Paper start - TNTPrimeEvent
-+                org.bukkit.block.Block tntBlock = io.papermc.paper.util.MCUtil.toBukkitBlock(world, blockposition);
-+                if (!new com.destroystokyo.paper.event.block.TNTPrimeEvent(tntBlock, com.destroystokyo.paper.event.block.TNTPrimeEvent.PrimeReason.FIRE, null).callEvent()) {
-+                    return;
-+                }
-+                world.removeBlock(blockposition, false);
-+                // Paper end
-                 TntBlock.explode(world, blockposition);
-             }
-         }
-diff --git a/src/main/java/net/minecraft/world/level/block/TntBlock.java b/src/main/java/net/minecraft/world/level/block/TntBlock.java
-index e9c04432c0252a019644f439e513e89fd01837a3..ed90d126e317612f40b101b559a94aabf9ad7ee2 100644
--- a/src/main/java/net/minecraft/world/level/block/TntBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/TntBlock.java
-@@ -42,6 +42,12 @@ public class TntBlock extends Block {
-     public void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldState, boolean notify) {
-         if (!oldState.is(state.getBlock())) {
-             if (world.hasNeighborSignal(pos) && CraftEventFactory.callTNTPrimeEvent(world, pos, PrimeCause.REDSTONE, null, null)) { // CraftBukkit - TNTPrimeEvent
-+                // Paper start - TNTPrimeEvent
-+                org.bukkit.block.Block tntBlock = io.papermc.paper.util.MCUtil.toBukkitBlock(world, pos);
-+                if (!new com.destroystokyo.paper.event.block.TNTPrimeEvent(tntBlock, com.destroystokyo.paper.event.block.TNTPrimeEvent.PrimeReason.REDSTONE, null).callEvent()) {
-+                    return;
-+                }
-+                // Paper end
-                 TntBlock.explode(world, pos);
-                 world.removeBlock(pos, false);
-             }
-@@ -52,6 +58,12 @@ public class TntBlock extends Block {
-     @Override
-     public void neighborChanged(BlockState state, Level world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) {
-         if (world.hasNeighborSignal(pos) && CraftEventFactory.callTNTPrimeEvent(world, pos, PrimeCause.REDSTONE, null, sourcePos)) { // CraftBukkit - TNTPrimeEvent
-+            // Paper start - TNTPrimeEvent
-+            org.bukkit.block.Block tntBlock = io.papermc.paper.util.MCUtil.toBukkitBlock(world, pos);
-+            if (!new com.destroystokyo.paper.event.block.TNTPrimeEvent(tntBlock, com.destroystokyo.paper.event.block.TNTPrimeEvent.PrimeReason.REDSTONE, null).callEvent()) {
-+                return;
-+            }
-+            // Paper end
-             TntBlock.explode(world, pos);
-             world.removeBlock(pos, false);
-         }
-@@ -70,6 +82,13 @@ public class TntBlock extends Block {
-     @Override
-     public void wasExploded(Level world, BlockPos pos, Explosion explosion) {
-         if (!world.isClientSide) {
-+            // Paper start - TNTPrimeEvent
-+            org.bukkit.block.Block tntBlock = io.papermc.paper.util.MCUtil.toBukkitBlock(world, pos);
-+            org.bukkit.entity.Entity source = explosion.source != null ? explosion.source.getBukkitEntity() : null;
-+            if (!new com.destroystokyo.paper.event.block.TNTPrimeEvent(tntBlock, com.destroystokyo.paper.event.block.TNTPrimeEvent.PrimeReason.EXPLOSION, source).callEvent()) {
-+                return;
-+            }
-+            // Paper end
-             PrimedTnt entitytntprimed = new PrimedTnt(world, (double) pos.getX() + 0.5D, (double) pos.getY(), (double) pos.getZ() + 0.5D, explosion.getIndirectSourceEntity());
-             int i = entitytntprimed.getFuse();
- 
-@@ -104,6 +123,12 @@ public class TntBlock extends Block {
-                 return InteractionResult.CONSUME;
-             }
-             // CraftBukkit end
-+            // Paper start - TNTPrimeEvent
-+            org.bukkit.block.Block tntBlock = io.papermc.paper.util.MCUtil.toBukkitBlock(world, pos);
-+            if (!new com.destroystokyo.paper.event.block.TNTPrimeEvent(tntBlock, com.destroystokyo.paper.event.block.TNTPrimeEvent.PrimeReason.ITEM, player.getBukkitEntity()).callEvent()) {
-+                return InteractionResult.FAIL;
-+            }
-+            // Paper end
-             TntBlock.explode(world, pos, player);
-             world.setBlock(pos, Blocks.AIR.defaultBlockState(), 11);
-             Item item = itemstack.getItem();
-@@ -135,6 +160,12 @@ public class TntBlock extends Block {
-                     return;
-                 }
-                 // CraftBukkit end
-+                // Paper start - TNTPrimeEvent
-+                org.bukkit.block.Block tntBlock = io.papermc.paper.util.MCUtil.toBukkitBlock(world, blockposition);
-+                if (!new com.destroystokyo.paper.event.block.TNTPrimeEvent(tntBlock, com.destroystokyo.paper.event.block.TNTPrimeEvent.PrimeReason.PROJECTILE, projectile.getBukkitEntity()).callEvent()) {
-+                    return;
-+                }
-+                // Paper end
-                 TntBlock.explode(world, blockposition, entity instanceof LivingEntity ? (LivingEntity) entity : null);
-                 world.removeBlock(blockposition, false);
-             }
--- a/patches/unapplied/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/unapplied/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 29 Jul 2018 05:02:15 +0100
-Subject: [PATCH] Break up and make tab spam limits configurable
-
-Due to the changes in 1.13, clients will send a tab completion request
-for all bukkit commands in order to factor in the lack of support for
-brigadier and provide backwards support in the API.
-
-Craftbukkit, however; has moved the chat spam limiter to also interact
-with the tab completion request, which while good for avoiding abuse,
-causes 1.13 clients to easilly be kicked from a server in bukkit due
-to this. Removing the spam limit could cause issues for servers, however,
-there is no way for servers to manipulate this without blindly cancelling
-kick events, which only causes additional complications. This also causes
-issues in that the tab spam limit and chat share the same field but different
-limits, meaning that a player having typed a long command may be kicked from
-the server.
-
-Splitting the field up and making it configurable allows for server owners
-to take the burden of this into their own hand without having to rely on
-plugins doing unsafe things.
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 32acb0ea31c3d617a0a087e11e5a8bfa6eb83db9..9092a04f7a98f022c9a9bfe5310643b4b89ce2e7 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -267,6 +267,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-     private long keepAliveChallenge;
-     // CraftBukkit start - multithreaded fields
-     private final AtomicInteger chatSpamTickCount = new AtomicInteger();
-+    private final java.util.concurrent.atomic.AtomicInteger tabSpamLimiter = new java.util.concurrent.atomic.AtomicInteger(); // Paper - configurable tab spam limits
-     // CraftBukkit end
-     private int dropSpamTickCount;
-     private double firstGoodX;
-@@ -415,6 +416,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-         this.server.getProfiler().pop();
-         // CraftBukkit start
-         for (int spam; (spam = this.chatSpamTickCount.get()) > 0 && !this.chatSpamTickCount.compareAndSet(spam, spam - 1); ) ;
-+        if (tabSpamLimiter.get() > 0) tabSpamLimiter.getAndDecrement(); // Paper - split to seperate variable
-         /* Use thread-safe field access instead
-         if (this.chatSpamTickCount > 0) {
-             --this.chatSpamTickCount;
-@@ -799,7 +801,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-     public void handleCustomCommandSuggestions(ServerboundCommandSuggestionPacket packet) {
-         // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // Paper - run this async
-         // CraftBukkit start
-        if (this.chatSpamTickCount.addAndGet(1) > 500 && !this.server.getPlayerList().isOp(this.player.getGameProfile())) {
-+        if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable
-             server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", new Object[0]))); // Paper
-             return;
-         }
--- a/patches/unapplied/server/0234-Fix-NBT-type-issues.patch
+++ b/patches/unapplied/server/0234-Fix-NBT-type-issues.patch
@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 3 Aug 2018 00:04:54 -0400
-Subject: [PATCH] Fix NBT type issues
-
-Addresses two issues:
- MC-135506: Experience should save as Integers
- Allay duplication cooldown is saved and exposed as a long, but loaded as an int
-
-diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index ff682a671f04a333615c4f22dc4b2aedd00eb117..8d8fe55a05eea237a8af99ed15ab16d6167daa77 100644
--- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-+++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -295,7 +295,7 @@ public class ExperienceOrb extends Entity {
-     public void addAdditionalSaveData(CompoundTag nbt) {
-         nbt.putShort("Health", (short) this.health);
-         nbt.putShort("Age", (short) this.age);
-        nbt.putShort("Value", (short) this.value);
-+        nbt.putInt("Value", this.value); // Paper - save as Integer
-         nbt.putInt("Count", this.count);
-         this.savePaperNBT(nbt); // Paper
-     }
-@@ -304,7 +304,7 @@ public class ExperienceOrb extends Entity {
-     public void readAdditionalSaveData(CompoundTag nbt) {
-         this.health = nbt.getShort("Health");
-         this.age = nbt.getShort("Age");
-        this.value = nbt.getShort("Value");
-+        this.value = nbt.getInt("Value"); // Paper - load as Integer
-         this.count = Math.max(nbt.getInt("Count"), 1);
-         this.loadPaperNBT(nbt); // Paper
-     }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-index 33a058474cd9d5e089a39e04cf5176eb9df62603..339c70f101d026a100a801e66cf514b3329a89d2 100644
--- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-@@ -514,7 +514,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
-             });
-         }
- 
-        this.duplicationCooldown = (long) nbt.getInt("DuplicationCooldown");
-+        this.duplicationCooldown = nbt.getLong("DuplicationCooldown"); // Paper - Load as long
-         this.entityData.set(Allay.DATA_CAN_DUPLICATE, nbt.getBoolean("CanDuplicate"));
-     }
- 
--- a/patches/unapplied/server/0235-Remove-unnecessary-itemmeta-handling.patch
+++ b/patches/unapplied/server/0235-Remove-unnecessary-itemmeta-handling.patch
@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 22 Nov 2016 00:40:42 -0500
-Subject: [PATCH] Remove unnecessary itemmeta handling
-
-
-diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-index c2f56f4628e42c130e4c55030432cb43aa0d8458..9938bb90bef84cf784f9a1ceb02a1a45aa8b48a1 100644
--- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-+++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-@@ -688,7 +688,7 @@ public class FriendlyByteBuf extends ByteBuf {
-             if (item.canBeDepleted() || item.shouldOverrideMultiplayerNbt()) {
-                 // Spigot start - filter
-                 stack = stack.copy();
-                CraftItemStack.setItemMeta(stack, CraftItemStack.getItemMeta(stack));
-+                // CraftItemStack.setItemMeta(stack, CraftItemStack.getItemMeta(stack)); // Paper - This is no longer with raw NBT being handled in metadata
-                 // Spigot end
-                 nbttagcompound = stack.getTag();
-             }
-@@ -709,7 +709,7 @@ public class FriendlyByteBuf extends ByteBuf {
- 
-             itemstack.setTag(this.readNbt());
-             // CraftBukkit start
-            if (itemstack.getTag() != null) {
-+            if (false && itemstack.getTag() != null) { // Paper - This is no longer needed with raw NBT being handled in metadata
-                 CraftItemStack.setItemMeta(itemstack, CraftItemStack.getItemMeta(itemstack));
-             }
-             // CraftBukkit end
--- a/patches/unapplied/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/unapplied/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@ -1,129 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 21 Jul 2018 08:25:40 -0400
-Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
-
-Add -Ddebug.entities=true to your JVM flags to gain more information
-
-1.17: Needs to be reworked for new entity storage system
-
-diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 8dc2a217d018e0a11fb852cf46d4e9b5290ea6a0..af92411006c3d281815b3f4c3de5f0280d3a5901 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -897,6 +897,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-                 } else {
-                     ChunkMap.TrackedEntity playerchunkmap_entitytracker = new ChunkMap.TrackedEntity(entity, i, j, entitytypes.trackDeltas());
- 
-+                    entity.tracker = playerchunkmap_entitytracker; // Paper - Fast access to tracker
-                     this.entityMap.put(entity.getId(), playerchunkmap_entitytracker);
-                     playerchunkmap_entitytracker.updatePlayers(this.level.players());
-                     if (entity instanceof ServerPlayer) {
-@@ -939,7 +940,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         if (playerchunkmap_entitytracker1 != null) {
-             playerchunkmap_entitytracker1.broadcastRemoved();
-         }
-
-+        entity.tracker = null; // Paper - We're no longer tracked
-     }
- 
-     protected void tick() {
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 33ce550ea68d4862e0966ed827200cf426909d85..6b157b362cffedae26133fc0f0af1094655ee11f 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -221,6 +221,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
-     public final LevelStorageSource.LevelStorageAccess convertable;
-     public final UUID uuid;
-     public boolean hasPhysicsEvent = true; // Paper
-+    public static Throwable getAddToWorldStackTrace(Entity entity) {
-+        return new Throwable(entity + " Added to world at " + new java.util.Date());
-+    }
- 
-     @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
-         return this.chunkSource.getChunk(x, z, false);
-@@ -1411,7 +1414,28 @@ public class ServerLevel extends Level implements WorldGenLevel {
-     // CraftBukkit start
-     private boolean addEntity(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
-         org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot
-+        // Paper start
-+        if (entity.valid) {
-+            MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable());
-+
-+            if (DEBUG_ENTITIES) {
-+                Throwable thr = entity.addedToWorldStack;
-+                if (thr == null) {
-+                    MinecraftServer.LOGGER.error("Double add entity has no add stacktrace");
-+                } else {
-+                    MinecraftServer.LOGGER.error("Double add stacktrace: ", thr);
-+                }
-+            }
-+            return true;
-+        }
-+        // Paper end
-         if (entity.isRemoved()) {
-+            // Paper start
-+            if (DEBUG_ENTITIES) {
-+                new Throwable("Tried to add entity " + entity + " but it was marked as removed already").printStackTrace(); // CraftBukkit
-+                getAddToWorldStackTrace(entity).printStackTrace();
-+            }
-+            // Paper end
-             // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
-             return false;
-         } else {
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c1ece46bea30faf550040b7a3f36c8966029aa9d..7ca89b1a5bbeefd8622cb0f93e0235abcefbc033 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -238,6 +238,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
-     private CraftEntity bukkitEntity;
- 
-+    public @org.jetbrains.annotations.Nullable net.minecraft.server.level.ChunkMap.TrackedEntity tracker; // Paper
-+    public @Nullable Throwable addedToWorldStack; // Paper - entity debug
-     public CraftEntity getBukkitEntity() {
-         if (this.bukkitEntity == null) {
-             this.bukkitEntity = CraftEntity.getEntity(this.level.getCraftServer(), this);
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 8320bece16dfa339e33801e43ff2f297bc876001..18234d71eba7d2a2874f3e5c9628d82970acc033 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -150,6 +150,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     public boolean pvpMode;
-     public boolean keepSpawnInMemory = true;
-     public org.bukkit.generator.ChunkGenerator generator;
-+    public static final boolean DEBUG_ENTITIES = Boolean.getBoolean("debug.entities"); // Paper
- 
-     public boolean preventPoiUpdated = false; // CraftBukkit - SPIGOT-5710
-     public boolean captureBlockStates = false;
-diff --git a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
-index 21a2800db22f287b9c6a8290326fdf3b94ae94b1..d45d832232be5017dde53816191c2b1830a0da32 100644
--- a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
-+++ b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
-@@ -34,6 +34,26 @@ public class EntityLookup<T extends EntityAccess> {
-         UUID uUID = entity.getUUID();
-         if (this.byUuid.containsKey(uUID)) {
-             LOGGER.warn("Duplicate entity UUID {}: {}", uUID, entity);
-+            // Paper start - extra debug info
-+            if (entity instanceof net.minecraft.world.entity.Entity entityCast) {
-+                if (net.minecraft.server.level.ServerLevel.DEBUG_ENTITIES) {
-+                    entityCast.addedToWorldStack = net.minecraft.server.level.ServerLevel.getAddToWorldStackTrace(entityCast);
-+                }
-+
-+                T old = this.byUuid.get(entity.getUUID());
-+                if (old instanceof net.minecraft.world.entity.Entity oldCast && old != null && oldCast.getId() != entity.getId() && oldCast.valid) {
-+                    LOGGER.error("Overwrote an existing entity " + oldCast + " with " + entity);
-+                    if (net.minecraft.server.level.ServerLevel.DEBUG_ENTITIES) {
-+                        if (oldCast.addedToWorldStack != null) {
-+                            oldCast.addedToWorldStack.printStackTrace();
-+                        } else {
-+                            LOGGER.error("Oddly, the old entity was not added to the world in the normal way. Plugins?");
-+                        }
-+                        entityCast.addedToWorldStack.printStackTrace();
-+                    }
-+                }
-+            }
-+            // Paper end
-         } else {
-             this.byUuid.put(uUID, entity);
-             this.byId.put(entity.getId(), entity);
--- a/patches/unapplied/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/unapplied/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
@ -1,160 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: miclebrick <miclebrick@outlook.com>
-Date: Wed, 8 Aug 2018 15:30:52 -0400
-Subject: [PATCH] Add Early Warning Feature to WatchDog
-
-Detect when the server has been hung for a long duration, and start printing
-thread dumps at an interval until the point of crash.
-
-This will help diagnose what was going on in that time before the crash.
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9f59ef54ef6f6af8b0fef8567d8cfbefb64bc29f..d05f776204a720084a583c6d6dfe47936761b6e3 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1047,6 +1047,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             this.status = this.buildServerStatus();
- 
-             // Spigot start
-+            org.spigotmc.WatchdogThread.hasStarted = true; // Paper
-             Arrays.fill( recentTps, 20 );
-             long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
-             lastTick = start - TICK_TIME; // Paper
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 97df17a1636ac1ba765a8e486cfbb46bfac9ee6c..980088f5af3d44d47b94ecde52cdc5f9277f6329 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -197,6 +197,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         // Paper start
-         paperConfigurations.initializeGlobalConfiguration();
-         paperConfigurations.initializeWorldDefaultsConfiguration();
-+        org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash);
-         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/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e19ddd1ab4d15ee041c74bb3767e3a9c41072f34..2e64d43cdc25135fadb759ea503b26104b881968 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -915,6 +915,7 @@ public final class CraftServer implements Server {
- 
-     @Override
-     public void reload() {
-+        org.spigotmc.WatchdogThread.hasStarted = false; // Paper - Disable watchdog early timeout on reload
-         this.reloadCount++;
-         this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
-         this.commandsConfiguration = YamlConfiguration.loadConfiguration(this.getCommandsConfigFile());
-@@ -1004,6 +1005,7 @@ public final class CraftServer implements Server {
-         this.enablePlugins(PluginLoadOrder.STARTUP);
-         this.enablePlugins(PluginLoadOrder.POSTWORLD);
-         this.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.RELOAD));
-+        org.spigotmc.WatchdogThread.hasStarted = true; // Paper - Disable watchdog early timeout on reload
-     }
- 
-     @Override
-diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index ddc5f2d9aa7dda6aff132392927e3d7e3674dbff..3ac48dafe2300ff4cf4591569fec9ce4916503cd 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
-+++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -229,7 +229,7 @@ public class SpigotConfig
-         SpigotConfig.restartScript = SpigotConfig.getString( "settings.restart-script", SpigotConfig.restartScript );
-         SpigotConfig.restartMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.restart", "Server is restarting" ) );
-         SpigotConfig.commands.put( "restart", new RestartCommand( "restart" ) );
-        WatchdogThread.doStart( timeoutTime, restartOnCrash );
-+        // WatchdogThread.doStart( timeoutTime, restartOnCrash ); // Paper - moved to after paper config initialization
-     }
- 
-     public static boolean bungee;
-diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index a9897c494b3dc56d900356d74030359832febbaa..b47d043144c499b1499f6b4be5a16a3f75c9fcb8 100644
--- a/src/main/java/org/spigotmc/WatchdogThread.java
-+++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -14,6 +14,10 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
-     private static WatchdogThread instance;
-     private long timeoutTime;
-     private boolean restart;
-+    private final long earlyWarningEvery; // Paper - Timeout time for just printing a dump but not restarting
-+    private final long earlyWarningDelay; // Paper
-+    public static volatile boolean hasStarted; // Paper
-+    private long lastEarlyWarning; // Paper - Keep track of short dump times to avoid spamming console with short dumps
-     private volatile long lastTick;
-     private volatile boolean stopping;
- 
-@@ -22,6 +26,8 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
-         super( "Paper Watchdog Thread" );
-         this.timeoutTime = timeoutTime;
-         this.restart = restart;
-+        earlyWarningEvery = Math.min(io.papermc.paper.configuration.GlobalConfiguration.get().watchdog.earlyWarningEvery, timeoutTime); // Paper
-+        earlyWarningDelay = Math.min(io.papermc.paper.configuration.GlobalConfiguration.get().watchdog.earlyWarningDelay, timeoutTime); // Paper
-     }
- 
-     private static long monotonicMillis()
-@@ -61,9 +67,18 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
-         while ( !this.stopping )
-         {
-             //
-            if ( this.lastTick != 0 && this.timeoutTime > 0 && WatchdogThread.monotonicMillis() > this.lastTick + this.timeoutTime && !Boolean.getBoolean("disable.watchdog")) // Paper - Add property to disable
-+            // Paper start
-+            Logger log = Bukkit.getServer().getLogger();
-+            long currentTime = WatchdogThread.monotonicMillis();
-+            if ( this.lastTick != 0 && this.timeoutTime > 0 && currentTime > this.lastTick + this.earlyWarningEvery && !Boolean.getBoolean("disable.watchdog")) // Paper - Add property to disable
-             {
-                Logger log = Bukkit.getServer().getLogger();
-+                boolean isLongTimeout = currentTime > lastTick + timeoutTime;
-+                // Don't spam early warning dumps
-+                if ( !isLongTimeout && (earlyWarningEvery <= 0 || !hasStarted || currentTime < lastEarlyWarning + earlyWarningEvery || currentTime < lastTick + earlyWarningDelay)) continue;
-+                if ( !isLongTimeout && MinecraftServer.getServer().hasStopped()) continue; // Don't spam early watchdog warnings during shutdown, we'll come back to this...
-+                lastEarlyWarning = currentTime;
-+                if (isLongTimeout) {
-+                // Paper end
-                 log.log( Level.SEVERE, "------------------------------" );
-                 log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Paper bug." ); // Paper
-                 log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
-@@ -93,30 +108,46 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
-                     }
-                 }
-                 // Paper end
-+                } else
-+                {
-+                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PAPER - THIS IS NOT A BUG OR A CRASH  - " + Bukkit.getServer().getVersion() + " ---");
-+                    log.log(Level.SEVERE, "The server has not responded for " + (currentTime - lastTick) / 1000 + " seconds! Creating thread dump");
-+                }
-+                // Paper end - Different message for short timeout
-                 log.log( Level.SEVERE, "------------------------------" );
-                 log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
-                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper // Paper - rewrite chunk system
-                 WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
-                 log.log( Level.SEVERE, "------------------------------" );
-                 //
-+                // Paper start - Only print full dump on long timeouts
-+                if ( isLongTimeout )
-+                {
-                 log.log( Level.SEVERE, "Entire Thread Dump:" );
-                 ThreadInfo[] threads = ManagementFactory.getThreadMXBean().dumpAllThreads( true, true );
-                 for ( ThreadInfo thread : threads )
-                 {
-                     WatchdogThread.dumpThread( thread, log );
-                 }
-+                } else {
-+                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PAPER - THIS IS NOT A BUG OR A CRASH ---");
-+                }
-+
-                 log.log( Level.SEVERE, "------------------------------" );
- 
-+                if ( isLongTimeout )
-+                {
-                 if ( this.restart && !MinecraftServer.getServer().hasStopped() )
-                 {
-                     RestartCommand.restart();
-                 }
-                 break;
-+                } // Paper end
-             }
- 
-             try
-             {
-                sleep( 10000 );
-+                sleep( 1000 ); // Paper - Reduce check time to every second instead of every ten seconds, more consistent and allows for short timeout
-             } catch ( InterruptedException ex )
-             {
-                 interrupt();
--- a/patches/unapplied/server/0238-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/unapplied/server/0238-Use-ConcurrentHashMap-in-JsonList.patch
@ -1,140 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: egg82 <phantom_zero@ymail.com>
-Date: Tue, 7 Aug 2018 01:24:23 -0600
-Subject: [PATCH] Use ConcurrentHashMap in JsonList
-
-This is specifically aimed at fixing #471
-
-Using a ConcurrentHashMap because thread safety
-The performance benefit of Map over ConcurrentMap is negligabe at best in this scenaio, as most operations will be get and not add or remove
-Even without considering the use-case the benefits are still negligable
-
-Original ideas for the system included an expiration policy and/or handler
-The simpler solution was to use a computeIfPresent in the get method
-This will simultaneously have an O(1) lookup time and automatically expire any values
-Since the get method (nor other similar methods) don't seem to have a critical need to flush the map to disk at any of these points further processing is simply wasteful
-Meaning the original function expired values unrelated to the current value without actually having any explicit need to
-
-The h method was heavily modified to be much more efficient in its processing
-Also instead of being called on every get, it's now called just before a save
-This will eliminate stale values being flushed to disk
-
-Modified isEmpty to use the isEmpty() method instead of the slightly confusing size() < 1
-The point of this is readability, but does have a side-benefit of a small microptimization
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e00c1916202a4e0550cc19c9cb279448a9fcdd1e..2bccba03bb12cf17a82c1e54c2bb10535b7c8964 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -649,7 +649,7 @@ public abstract class PlayerList {
-         } else if (!this.isWhiteListed(gameprofile, event)) { // Paper
-             //ichatmutablecomponent = Component.translatable("multiplayer.disconnect.not_whitelisted"); // Paper
-             //event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.whitelistMessage)); // Spigot // Paper - Adventure - moved to isWhitelisted
-        } else if (this.getIpBans().isBanned(socketaddress) && !this.getIpBans().get(socketaddress).hasExpired()) {
-+        } else if (this.getIpBans().isBanned(socketaddress) && getIpBans().get(socketaddress) != null && !this.getIpBans().get(socketaddress).hasExpired()) { // Paper - fix NPE with temp ip bans
-             IpBanListEntry ipbanentry = this.ipBans.get(socketaddress);
- 
-             ichatmutablecomponent = Component.translatable("multiplayer.disconnect.banned_ip.reason", ipbanentry.getReason());
-diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java
-index 58ebac3ddf8a59cee8fd87b9106d068507768992..08173a6e0b7e46c041a81d6b51d77a0aea182525 100644
--- a/src/main/java/net/minecraft/server/players/StoredUserList.java
-+++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
-@@ -14,6 +14,8 @@ import java.io.BufferedReader;
- import java.io.BufferedWriter;
- import java.io.File;
- import java.io.IOException;
-+import java.lang.reflect.ParameterizedType; // Paper
-+import java.lang.reflect.Type; // Paper
- import java.nio.charset.StandardCharsets;
- import java.util.Collection;
- import java.util.Iterator;
-@@ -31,7 +33,22 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
-     private static final Logger LOGGER = LogUtils.getLogger();
-     private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().create();
-     private final File file;
-    private final Map<String, V> map = Maps.newHashMap();
-+    // Paper - replace HashMap is ConcurrentHashMap
-+    private final Map<String, V> map = Maps.newConcurrentMap();
-+    private boolean e = true;
-+    private static final ParameterizedType f = new ParameterizedType() {
-+        public Type[] getActualTypeArguments() {
-+            return new Type[]{StoredUserEntry.class};
-+        }
-+
-+        public Type getRawType() {
-+            return List.class;
-+        }
-+
-+        public Type getOwnerType() {
-+            return null;
-+        }
-+    };
- 
-     public StoredUserList(File file) {
-         this.file = file;
-@@ -54,8 +71,13 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
- 
-     @Nullable
-     public V get(K key) {
-        this.removeExpired();
-        return (V) this.map.get(this.getKeyForUser(key)); // CraftBukkit - fix decompile error
-+        // Paper start
-+        // this.g();
-+        // return (V) this.d.get(this.a(k0)); // CraftBukkit - fix decompile error
-+        return (V) this.map.computeIfPresent(this.getKeyForUser(key), (k, v) -> {
-+            return v.hasExpired() ? null : v;
-+        });
-+        // Paper end
-     }
- 
-     public void remove(K key) {
-@@ -78,7 +100,8 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
-     }
- 
-     public boolean isEmpty() {
-        return this.map.size() < 1;
-+        // return this.d.size() < 1; // Paper
-+        return this.map.isEmpty(); // Paper - readability is the goal. As an aside, isEmpty() uses only sumCount() and a comparison. size() uses sumCount(), casts, and boolean logic
-     }
- 
-     protected String getKeyForUser(K profile) {
-@@ -90,14 +113,14 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
-     }
- 
-     private void removeExpired() {
-        List<K> list = Lists.newArrayList();
-        Iterator iterator = this.map.values().iterator();
-+        /*List<K> list = Lists.newArrayList();
-+        Iterator iterator = this.d.values().iterator();
- 
-         while (iterator.hasNext()) {
-             V v0 = (V) iterator.next(); // CraftBukkit - decompile error
- 
-             if (v0.hasExpired()) {
-                list.add(v0.getUser());
-+                list.add(v0.getKey());
-             }
-         }
- 
-@@ -106,9 +129,11 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
-         while (iterator.hasNext()) {
-             K k0 = (K) iterator.next(); // CraftBukkit - decompile error
- 
-            this.map.remove(this.getKeyForUser(k0));
-        }
-+            this.d.remove(this.a(k0));
-+        }*/
- 
-+        this.map.values().removeIf(StoredUserEntry::hasExpired);
-+        // Paper end
-     }
- 
-     protected abstract StoredUserEntry<K> createEntry(JsonObject json);
-@@ -118,6 +143,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
-     }
- 
-     public void save() throws IOException {
-+        this.removeExpired(); // Paper - remove expired values before saving
-         JsonArray jsonarray = new JsonArray();
-         Stream<JsonObject> stream = this.map.values().stream().map((jsonlistentry) -> { // CraftBukkit - decompile error
-             JsonObject jsonobject = new JsonObject();
--- a/patches/unapplied/server/0239-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/unapplied/server/0239-Use-a-Queue-for-Queueing-Commands.patch
@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 12 Aug 2018 02:33:39 -0400
-Subject: [PATCH] Use a Queue for Queueing Commands
-
-Lists are bad as Queues mmmkay.
-
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 980088f5af3d44d47b94ecde52cdc5f9277f6329..ff908bab7d83e5c049d86a0c8ea235ca3c69936b 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -69,7 +69,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-     static final Logger LOGGER = LogUtils.getLogger();
-     private static final int CONVERSION_RETRY_DELAY_MS = 5000;
-     private static final int CONVERSION_RETRIES = 2;
-    private final List<ConsoleInput> consoleInput = Collections.synchronizedList(Lists.newArrayList());
-+    private final java.util.Queue<ConsoleInput> serverCommandQueue = new java.util.concurrent.ConcurrentLinkedQueue<>(); // Paper - use a proper queuemmands
-     @Nullable
-     private QueryThreadGs4 queryThreadGs4;
-     // public final RemoteControlCommandListener rconConsoleSource; // CraftBukkit - remove field
-@@ -439,13 +439,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-             return;
-         }
-         // Paper end - rewrite chunk system
-        this.consoleInput.add(new ConsoleInput(command, commandSource));
-+        this.serverCommandQueue.add(new ConsoleInput(command, commandSource)); // Paper - use proper queue
-     }
- 
-     public void handleConsoleInputs() {
-         MinecraftTimings.serverCommandTimer.startTiming(); // Spigot
-        while (!this.consoleInput.isEmpty()) {
-            ConsoleInput servercommand = (ConsoleInput) this.consoleInput.remove(0);
-+        // Paper start - use proper queue
-+        ConsoleInput servercommand;
-+        while ((servercommand = this.serverCommandQueue.poll()) != null) {
-+            // Paper end
- 
-             // CraftBukkit start - ServerCommand for preprocessing
-             ServerCommandEvent event = new ServerCommandEvent(console, servercommand.msg);
--- a/patches/unapplied/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/unapplied/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 15 Aug 2018 01:16:34 -0400
-Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 8ae78690748b2cb5d5186d8859871c1630e10130..b738e1f7debac7d70910d5ac908ca9d4f60640d5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-@@ -125,6 +125,13 @@ public class CraftChunk implements Chunk {
- 
-     @Override
-     public BlockState[] getTileEntities() {
-+        // Paper start
-+        return getTileEntities(true);
-+    }
-+
-+    @Override
-+    public BlockState[] getTileEntities(boolean useSnapshot) {
-+        // Paper end
-         if (!this.isLoaded()) {
-             this.getWorld().getChunkAt(x, z); // Transient load for this tick
-         }
-@@ -134,7 +141,29 @@ public class CraftChunk implements Chunk {
-         BlockState[] entities = new BlockState[chunk.blockEntities.size()];
- 
-         for (BlockPos position : chunk.blockEntities.keySet()) {
-            entities[index++] = this.worldServer.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()).getState();
-+            // Paper start
-+            entities[index++] = this.worldServer.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()).getState(useSnapshot);
-+        }
-+
-+        return entities;
-+    }
-+
-+    @Override
-+    public Collection<BlockState> getTileEntities(Predicate<Block> blockPredicate, boolean useSnapshot) {
-+        Preconditions.checkNotNull(blockPredicate, "blockPredicate");
-+        if (!this.isLoaded()) {
-+            this.getWorld().getChunkAt(this.x, this.z); // Transient load for this tick
-+        }
-+        ChunkAccess chunk = this.getHandle(ChunkStatus.FULL);
-+
-+        java.util.List<BlockState> entities = new java.util.ArrayList<>();
-+
-+        for (BlockPos position : chunk.blockEntities.keySet()) {
-+            Block block = this.worldServer.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ());
-+            if (blockPredicate.test(block)) {
-+                entities.add(block.getState(useSnapshot));
-+            }
-+            // Paper end
-         }
- 
-         return entities;
--- a/patches/unapplied/server/0241-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/unapplied/server/0241-Optimize-BlockPosition-helper-methods.patch
@ -1,108 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Wed, 15 Aug 2018 12:05:12 -0700
-Subject: [PATCH] Optimize BlockPosition helper methods
-
-Resolves #1338
-
-diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 1834f3efb05fd70c8c1c67733bff514829ae1154..fbdbf61f49bd6867eea609d5572fb31ece094944 100644
--- a/src/main/java/net/minecraft/core/BlockPos.java
-+++ b/src/main/java/net/minecraft/core/BlockPos.java
-@@ -132,67 +132,84 @@ public class BlockPos extends Vec3i {
- 
-     @Override
-     public BlockPos above() {
-        return this.relative(Direction.UP);
-+        return new BlockPos(this.getX(), this.getY() + 1, this.getZ()); // Paper - Optimize BlockPosition
-     }
- 
-     @Override
-     public BlockPos above(int distance) {
-        return this.relative(Direction.UP, distance);
-+        return distance == 0 ? this : new BlockPos(this.getX(), this.getY() + distance, this.getZ()); // Paper - Optimize BlockPosition
-     }
- 
-     @Override
-     public BlockPos below() {
-        return this.relative(Direction.DOWN);
-+        return new BlockPos(this.getX(), this.getY() - 1, this.getZ()); // Paper - Optimize BlockPosition
-     }
- 
-     @Override
-     public BlockPos below(int i) {
-        return this.relative(Direction.DOWN, i);
-+        return i == 0 ? this : new BlockPos(this.getX(), this.getY() - i, this.getZ()); // Paper - Optimize BlockPosition
-     }
- 
-     @Override
-     public BlockPos north() {
-        return this.relative(Direction.NORTH);
-+        return new BlockPos(this.getX(), this.getY(), this.getZ() - 1); // Paper - Optimize BlockPosition
-     }
- 
-     @Override
-     public BlockPos north(int distance) {
-        return this.relative(Direction.NORTH, distance);
-+        return distance == 0 ? this : new BlockPos(this.getX(), this.getY(), this.getZ() - distance); // Paper - Optimize BlockPosition
-     }
- 
-     @Override
-     public BlockPos south() {
-        return this.relative(Direction.SOUTH);
-+        return new BlockPos(this.getX(), this.getY(), this.getZ() + 1); // Paper - Optimize BlockPosition
-     }
- 
-     @Override
-     public BlockPos south(int distance) {
-        return this.relative(Direction.SOUTH, distance);
-+        return distance == 0 ? this : new BlockPos(this.getX(), this.getY(), this.getZ() + distance); // Paper - Optimize BlockPosition
-     }
- 
-     @Override
-     public BlockPos west() {
-        return this.relative(Direction.WEST);
-+        return new BlockPos(this.getX() - 1, this.getY(), this.getZ()); // Paper - Optimize BlockPosition
-     }
- 
-     @Override
-     public BlockPos west(int distance) {
-        return this.relative(Direction.WEST, distance);
-+        return distance == 0 ? this : new BlockPos(this.getX() - distance, this.getY(), this.getZ()); // Paper - Optimize BlockPosition
-     }
- 
-     @Override
-     public BlockPos east() {
-        return this.relative(Direction.EAST);
-+        return new BlockPos(this.getX() + 1, this.getY(), this.getZ()); // Paper - Optimize BlockPosition
-     }
- 
-     @Override
-     public BlockPos east(int distance) {
-        return this.relative(Direction.EAST, distance);
-+        return distance == 0 ? this : new BlockPos(this.getX() + distance, this.getY(), this.getZ()); // Paper - Optimize BlockPosition
-     }
- 
-     @Override
-     public BlockPos relative(Direction direction) {
-+        // Paper Start - Optimize BlockPosition
-+        switch(direction) {
-+            case UP:
-+                return new BlockPos(this.getX(), this.getY() + 1, this.getZ());
-+            case DOWN:
-+                return new BlockPos(this.getX(), this.getY() - 1, this.getZ());
-+            case NORTH:
-+                return new BlockPos(this.getX(), this.getY(), this.getZ() - 1);
-+            case SOUTH:
-+                return new BlockPos(this.getX(), this.getY(), this.getZ() + 1);
-+            case WEST:
-+                return new BlockPos(this.getX() - 1, this.getY(), this.getZ());
-+            case EAST:
-+                return new BlockPos(this.getX() + 1, this.getY(), this.getZ());
-+            default:
-         return new BlockPos(this.getX() + direction.getStepX(), this.getY() + direction.getStepY(), this.getZ() + direction.getStepZ());
-+        }
-+        // Paper End
-     }
- 
-     @Override
--- a/patches/unapplied/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/unapplied/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 18 Aug 2018 12:43:16 -0400
-Subject: [PATCH] Restore vanilla default mob-spawn-range and water animals
- limit
-
-
-diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index afe68aa28f8b39fd490f650a335c90818e1c9a8d..e873a311e2918e1cb72f190e14d088a3ed540aa8 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
-+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -190,7 +190,7 @@ public class SpigotWorldConfig
-     public byte mobSpawnRange;
-     private void mobSpawnRange()
-     {
-        this.mobSpawnRange = (byte) this.getInt( "mob-spawn-range", 6 );
-+        this.mobSpawnRange = (byte) getInt( "mob-spawn-range", 8 ); // Paper - Vanilla
-         this.log( "Mob Spawn Range: " + this.mobSpawnRange );
-     }
- 
--- a/patches/unapplied/server/0243-Slime-Pathfinder-Events.patch
+++ b/patches/unapplied/server/0243-Slime-Pathfinder-Events.patch
@ -1,167 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 24 Aug 2018 08:18:42 -0500
-Subject: [PATCH] Slime Pathfinder Events
-
-
-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 476a9b2db5deac803f1cb3c2cbe88b69cc3da8e5..30779b817db6f8e392036b4ec66e1c5cf50cd0f5 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-@@ -41,6 +41,12 @@ import net.minecraft.world.level.ServerLevelAccessor;
- import net.minecraft.world.level.WorldGenLevel;
- import net.minecraft.world.level.levelgen.WorldgenRandom;
- import net.minecraft.world.phys.Vec3;
-+// Paper start
-+import com.destroystokyo.paper.event.entity.SlimeChangeDirectionEvent;
-+import com.destroystokyo.paper.event.entity.SlimeSwimEvent;
-+import com.destroystokyo.paper.event.entity.SlimeTargetLivingEntityEvent;
-+import com.destroystokyo.paper.event.entity.SlimeWanderEvent;
-+// Paper end
- // CraftBukkit start
- import java.util.ArrayList;
- import java.util.List;
-@@ -107,6 +113,7 @@ public class Slime extends Mob implements Enemy {
-     @Override
-     public void addAdditionalSaveData(CompoundTag nbt) {
-         super.addAdditionalSaveData(nbt);
-+        nbt.putBoolean("Paper.canWander", this.canWander); // Paper
-         nbt.putInt("Size", this.getSize() - 1);
-         nbt.putBoolean("wasOnGround", this.wasOnGround);
-     }
-@@ -115,6 +122,11 @@ public class Slime extends Mob implements Enemy {
-     public void readAdditionalSaveData(CompoundTag nbt) {
-         this.setSize(nbt.getInt("Size") + 1, false);
-         super.readAdditionalSaveData(nbt);
-+        // Paper start - check exists before loading or this will be loaded as false
-+        if (nbt.contains("Paper.canWander")) {
-+            this.canWander = nbt.getBoolean("Paper.canWander");
-+        }
-+        // Paper end
-         this.wasOnGround = nbt.getBoolean("wasOnGround");
-     }
- 
-@@ -450,7 +462,7 @@ public class Slime extends Mob implements Enemy {
- 
-         @Override
-         public boolean canUse() {
-            return (this.slime.isInWater() || this.slime.isInLava()) && this.slime.getMoveControl() instanceof Slime.SlimeMoveControl;
-+            return (this.slime.isInWater() || this.slime.isInLava()) && this.slime.getMoveControl() instanceof Slime.SlimeMoveControl && this.slime.canWander && new SlimeSwimEvent((org.bukkit.entity.Slime) this.slime.getBukkitEntity()).callEvent(); // Paper
-         }
- 
-         @Override
-@@ -489,7 +501,15 @@ public class Slime extends Mob implements Enemy {
-         public boolean canUse() {
-             LivingEntity entityliving = this.slime.getTarget();
- 
-            return entityliving == null ? false : (!this.slime.canAttack(entityliving) ? false : this.slime.getMoveControl() instanceof Slime.SlimeMoveControl);
-+            // Paper start
-+            if (entityliving == null || !entityliving.isAlive()) {
-+                return false;
-+            }
-+            if (!this.slime.canAttack(entityliving)) {
-+                return false;
-+            }
-+            return this.slime.getMoveControl() instanceof Slime.SlimeMoveControl && this.slime.canWander && new SlimeTargetLivingEntityEvent((org.bukkit.entity.Slime) this.slime.getBukkitEntity(), (org.bukkit.entity.LivingEntity) entityliving.getBukkitEntity()).callEvent();
-+            // Paper end
-         }
- 
-         @Override
-@@ -502,7 +522,15 @@ public class Slime extends Mob implements Enemy {
-         public boolean canContinueToUse() {
-             LivingEntity entityliving = this.slime.getTarget();
- 
-            return entityliving == null ? false : (!this.slime.canAttack(entityliving) ? false : --this.growTiredTimer > 0);
-+            // Paper start
-+            if (entityliving == null || !entityliving.isAlive()) {
-+                return false;
-+            }
-+            if (!this.slime.canAttack(entityliving)) {
-+                return false;
-+            }
-+            return --this.growTiredTimer > 0 && this.slime.canWander && new SlimeTargetLivingEntityEvent((org.bukkit.entity.Slime) this.slime.getBukkitEntity(), (org.bukkit.entity.LivingEntity) entityliving.getBukkitEntity()).callEvent();
-+            // Paper end
-         }
- 
-         @Override
-@@ -527,6 +555,13 @@ public class Slime extends Mob implements Enemy {
-             }
- 
-         }
-+
-+        // Paper start - clear timer and target when goal resets
-+        public void stop() {
-+            this.growTiredTimer = 0;
-+            this.slime.setTarget(null);
-+        }
-+        // Paper end
-     }
- 
-     private static class SlimeRandomDirectionGoal extends Goal {
-@@ -542,7 +577,7 @@ public class Slime extends Mob implements Enemy {
- 
-         @Override
-         public boolean canUse() {
-            return this.slime.getTarget() == null && (this.slime.onGround() || this.slime.isInWater() || this.slime.isInLava() || this.slime.hasEffect(MobEffects.LEVITATION)) && this.slime.getMoveControl() instanceof Slime.SlimeMoveControl;
-+            return this.slime.getTarget() == null && (this.slime.onGround() || this.slime.isInWater() || this.slime.isInLava() || this.slime.hasEffect(MobEffects.LEVITATION)) && this.slime.getMoveControl() instanceof Slime.SlimeMoveControl && this.slime.canWander; // Paper - add canWander
-         }
- 
-         @Override
-@@ -550,6 +585,11 @@ public class Slime extends Mob implements Enemy {
-             if (--this.nextRandomizeTime <= 0) {
-                 this.nextRandomizeTime = this.adjustedTickDelay(40 + this.slime.getRandom().nextInt(60));
-                 this.chosenDegrees = (float) this.slime.getRandom().nextInt(360);
-+                // Paper start
-+                SlimeChangeDirectionEvent event = new SlimeChangeDirectionEvent((org.bukkit.entity.Slime) this.slime.getBukkitEntity(), this.chosenDegrees);
-+                if (!this.slime.canWander || !event.callEvent()) return;
-+                this.chosenDegrees = event.getNewYaw();
-+                // Paper end
-             }
- 
-             MoveControl controllermove = this.slime.getMoveControl();
-@@ -574,7 +614,7 @@ public class Slime extends Mob implements Enemy {
- 
-         @Override
-         public boolean canUse() {
-            return !this.slime.isPassenger();
-+            return !this.slime.isPassenger() && this.slime.canWander && new SlimeWanderEvent((org.bukkit.entity.Slime) this.slime.getBukkitEntity()).callEvent(); // Paper
-         }
- 
-         @Override
-@@ -589,4 +629,15 @@ public class Slime extends Mob implements Enemy {
- 
-         }
-     }
-+
-+    // Paper start
-+    private boolean canWander = true;
-+    public boolean canWander() {
-+        return canWander;
-+    }
-+
-+    public void setWander(boolean canWander) {
-+        this.canWander = canWander;
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-index d4891e026c5ccc3d75d5b455661ab641b9d4a3b5..9b219beb8922bf0701e538bcf874f0eb922f60bb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-@@ -28,4 +28,16 @@ public class CraftSlime extends CraftMob implements Slime, CraftEnemy {
-     public String toString() {
-         return "CraftSlime";
-     }
-+
-+    // Paper start
-+    @Override
-+    public boolean canWander() {
-+        return getHandle().canWander();
-+    }
-+
-+    @Override
-+    public void setWander(boolean canWander) {
-+        getHandle().setWander(canWander);
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/0244-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/patches/unapplied/server/0244-Configurable-speed-for-water-flowing-over-lava.patch
@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Byteflux <byte@byteflux.net>
-Date: Wed, 8 Aug 2018 16:33:21 -0600
-Subject: [PATCH] Configurable speed for water flowing over lava
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/LiquidBlock.java b/src/main/java/net/minecraft/world/level/block/LiquidBlock.java
-index fd7a7772eef7e2e4418539a11cefa98046b087e1..bbabe4ad8afcc3a2069f6e9d4a9adcb643266894 100644
--- a/src/main/java/net/minecraft/world/level/block/LiquidBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/LiquidBlock.java
-@@ -106,11 +106,31 @@ public class LiquidBlock extends Block implements BucketPickup {
-     @Override
-     public void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldState, boolean notify) {
-         if (this.shouldSpreadLiquid(world, pos, state)) {
-            world.scheduleTick(pos, state.getFluidState().getType(), this.fluid.getTickDelay(world));
-+            world.scheduleTick(pos, state.getFluidState().getType(), this.getFlowSpeed(world, pos)); // Paper
-         }
- 
-     }
- 
-+    // Paper start - Get flow speed. Throttle if its water and flowing adjacent to lava
-+    public int getFlowSpeed(Level world, BlockPos blockposition) {
-+        if (net.minecraft.core.registries.BuiltInRegistries.FLUID.wrapAsHolder(this.fluid).is(FluidTags.WATER)) {
-+            if (
-+                isLava(world, blockposition.north(1)) ||
-+                isLava(world, blockposition.south(1)) ||
-+                isLava(world, blockposition.west(1)) ||
-+                isLava(world, blockposition.east(1))
-+            ) {
-+                return world.paperConfig().environment.waterOverLavaFlowSpeed;
-+            }
-+        }
-+        return this.fluid.getTickDelay(world);
-+    }
-+    private static boolean isLava(Level world, BlockPos blockPos) {
-+        final FluidState fluidState = world.getFluidIfLoaded(blockPos);
-+        return fluidState != null && fluidState.is(FluidTags.LAVA);
-+    }
-+    // Paper end
-+
-     @Override
-     public BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
-         if (state.getFluidState().isSource() || neighborState.getFluidState().isSource()) {
-@@ -123,7 +143,7 @@ public class LiquidBlock extends Block implements BucketPickup {
-     @Override
-     public void neighborChanged(BlockState state, Level world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) {
-         if (this.shouldSpreadLiquid(world, pos, state)) {
-            world.scheduleTick(pos, state.getFluidState().getType(), this.fluid.getTickDelay(world));
-+            world.scheduleTick(pos, state.getFluidState().getType(), this.getFlowSpeed(world, pos)); // Paper
-         }
- 
-     }
--- a/patches/unapplied/server/0245-Optimize-CraftBlockData-Creation.patch
+++ b/patches/unapplied/server/0245-Optimize-CraftBlockData-Creation.patch
@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: miclebrick <miclebrick@outlook.com>
-Date: Thu, 23 Aug 2018 11:45:32 -0400
-Subject: [PATCH] Optimize CraftBlockData Creation
-
-Avoids a hashmap lookup by cacheing a reference to the CraftBlockData
-and cloning it when one is needed.
-
-diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 803f3ebaa9fe43c88f461168ee43fc6ba920a764..2451bb61e304fbe5cdfd6bbb248575e9e1135075 100644
--- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-+++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-@@ -809,6 +809,14 @@ public abstract class BlockBehaviour implements FeatureElement {
-             this.replaceable = blockbase_info.replaceable;
-             this.conditionallyFullOpaque = this.isOpaque() & this.isTransparentOnSomeFaces(); // Paper
-         }
-+        // Paper start - impl cached craft block data, lazy load to fix issue with loading at the wrong time
-+        private org.bukkit.craftbukkit.block.data.CraftBlockData cachedCraftBlockData;
-+
-+        public org.bukkit.craftbukkit.block.data.CraftBlockData createCraftBlockData() {
-+            if (cachedCraftBlockData == null) cachedCraftBlockData = org.bukkit.craftbukkit.block.data.CraftBlockData.createData(asState());
-+            return (org.bukkit.craftbukkit.block.data.CraftBlockData) cachedCraftBlockData.clone();
-+        }
-+        // Paper end
- 
-         private boolean calculateSolid() {
-             if (((Block) this.owner).properties.forceSolidOn) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index 745d2c589df8c59db327d7482024096473318812..c80aaa37b7d63acfb283641a4804dc2a32156eda 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-@@ -560,7 +560,17 @@ public class CraftBlockData implements BlockData {
-         return craft;
-     }
- 
-+    // Paper start - optimize creating BlockData to not need a map lookup
-+    static {
-+        // Initialize cached data for all IBlockData instances after registration
-+        Block.BLOCK_STATE_REGISTRY.iterator().forEachRemaining(net.minecraft.world.level.block.state.BlockState::createCraftBlockData);
-+    }
-     public static CraftBlockData fromData(net.minecraft.world.level.block.state.BlockState data) {
-+        return data.createCraftBlockData();
-+    }
-+
-+    public static CraftBlockData createData(net.minecraft.world.level.block.state.BlockState data) {
-+        // Paper end
-         return CraftBlockData.MAP.getOrDefault(data.getBlock().getClass(), CraftBlockData::new).apply(data);
-     }
- 
--- a/patches/unapplied/server/0246-Optimize-MappedRegistry.patch
+++ b/patches/unapplied/server/0246-Optimize-MappedRegistry.patch
@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 26 Aug 2018 20:49:50 -0400
-Subject: [PATCH] Optimize MappedRegistry
-
-Use larger initial sizes to increase bucket capacity on the BiMap
-
-BiMap.get was seen to be using a good bit of CPU time.
-
-diff --git a/src/main/java/net/minecraft/core/MappedRegistry.java b/src/main/java/net/minecraft/core/MappedRegistry.java
-index 300e009abbc41961d59d55d965e9a99d44c21e32..1e33434f9f361542e03da3e4812bc6d76768a202 100644
--- a/src/main/java/net/minecraft/core/MappedRegistry.java
-+++ b/src/main/java/net/minecraft/core/MappedRegistry.java
-@@ -36,13 +36,11 @@ public class MappedRegistry<T> implements WritableRegistry<T> {
-     private static final Logger LOGGER = LogUtils.getLogger();
-     final ResourceKey<? extends Registry<T>> key;
-     private final ObjectList<Holder.Reference<T>> byId = new ObjectArrayList<>(256);
-    private final Object2IntMap<T> toId = Util.make(new Object2IntOpenCustomHashMap<>(Util.identityStrategy()), (map) -> {
-        map.defaultReturnValue(-1);
-    });
-    private final Map<ResourceLocation, Holder.Reference<T>> byLocation = new HashMap<>();
-    private final Map<ResourceKey<T>, Holder.Reference<T>> byKey = new HashMap<>();
-    private final Map<T, Holder.Reference<T>> byValue = new IdentityHashMap<>();
-    private final Map<T, Lifecycle> lifecycles = new IdentityHashMap<>();
-+    private final it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap<T> toId = new it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap<T>(2048);// Paper - use bigger expected size to reduce collisions and direct intent for FastUtil to be identity map
-+    private final Map<ResourceLocation, Holder.Reference<T>> byLocation = new HashMap<>(2048); // Paper - use bigger expected size to reduce collisions
-+    private final Map<ResourceKey<T>, Holder.Reference<T>> byKey = new HashMap<>(2048); // Paper - use bigger expected size to reduce collisions
-+    private final Map<T, Holder.Reference<T>> byValue = new IdentityHashMap<>(2048); // Paper - use bigger expected size to reduce collisions
-+    private final Map<T, Lifecycle> lifecycles = new IdentityHashMap<>(2048); // Paper - use bigger expected size to reduce collisions
-     private Lifecycle registryLifecycle;
-     private volatile Map<TagKey<T>, HolderSet.Named<T>> tags = new IdentityHashMap<>();
-     private boolean frozen;
-@@ -88,6 +86,7 @@ public class MappedRegistry<T> implements WritableRegistry<T> {
-     }
- 
-     public MappedRegistry(ResourceKey<? extends Registry<T>> key, Lifecycle lifecycle, boolean intrusive) {
-+        this.toId.defaultReturnValue(-1); // Paper
-         Bootstrap.checkBootstrapCalled(() -> {
-             return "registry " + key;
-         });
--- a/patches/unapplied/server/0247-Add-PhantomPreSpawnEvent.patch
+++ b/patches/unapplied/server/0247-Add-PhantomPreSpawnEvent.patch
@ -1,89 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 25 Aug 2018 19:56:51 -0500
-Subject: [PATCH] Add PhantomPreSpawnEvent
-
-
-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 7582efc69928718a164f704a54bce026ad6f7dd9..9bd6e71ea38bf050832f0f7bbed4a5db6ddcef71 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -171,6 +171,11 @@ public class Phantom extends FlyingMob implements Enemy {
-         }
- 
-         this.setPhantomSize(nbt.getInt("Size"));
-+        // Paper start
-+        if (nbt.hasUUID("Paper.SpawningEntity")) {
-+            this.spawningEntity = nbt.getUUID("Paper.SpawningEntity");
-+        }
-+        // Paper end
-     }
- 
-     @Override
-@@ -180,6 +185,11 @@ public class Phantom extends FlyingMob implements Enemy {
-         nbt.putInt("AY", this.anchorPoint.getY());
-         nbt.putInt("AZ", this.anchorPoint.getZ());
-         nbt.putInt("Size", this.getPhantomSize());
-+        // Paper start
-+        if (this.spawningEntity != null) {
-+            nbt.putUUID("Paper.SpawningEntity", this.spawningEntity);
-+        }
-+        // Paper end
-     }
- 
-     @Override
-@@ -236,6 +246,14 @@ public class Phantom extends FlyingMob implements Enemy {
-         return (double) this.getEyeHeight();
-     }
- 
-+    // Paper start
-+    java.util.UUID spawningEntity;
-+
-+    public java.util.UUID getSpawningEntity() {
-+        return spawningEntity;
-+    }
-+    public void setSpawningEntity(java.util.UUID entity) { this.spawningEntity = entity; }
-+    // Paper end
-     private static enum AttackPhase {
- 
-         CIRCLE, SWOOP;
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-index 61ba99d99cc4e7782450ee6aa8b6c87b1a42cb3a..94ee9c399f59e0198b4d9bc2a4255e8b821bcd36 100644
--- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-@@ -70,9 +70,19 @@ public class PhantomSpawner implements CustomSpawner {
-                                             int k = 1 + randomsource.nextInt(difficultydamagescaler.getDifficulty().getId() + 1);
- 
-                                             for (int l = 0; l < k; ++l) {
-+                                                // Paper start
-+                                                com.destroystokyo.paper.event.entity.PhantomPreSpawnEvent event = new com.destroystokyo.paper.event.entity.PhantomPreSpawnEvent(io.papermc.paper.util.MCUtil.toLocation(world, blockposition1), entityplayer.getBukkitEntity(), org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL);
-+                                                if (!event.callEvent()) {
-+                                                    if (event.shouldAbortSpawn()) {
-+                                                        break;
-+                                                    }
-+                                                    continue;
-+                                                }
-+                                                // Paper end
-                                                 Phantom entityphantom = (Phantom) EntityType.PHANTOM.create(world);
- 
-                                                 if (entityphantom != null) {
-+                                                    entityphantom.setSpawningEntity(entityplayer.getUUID()); // Paper
-                                                     entityphantom.moveTo(blockposition1, 0.0F, 0.0F);
-                                                     groupdataentity = entityphantom.finalizeSpawn(world, difficultydamagescaler, MobSpawnType.NATURAL, groupdataentity, (CompoundTag) null);
-                                                     world.addFreshEntityWithPassengers(entityphantom, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-index 0359c161448941f1b9fdac545a5c47a68f19b760..305a635b049741ac5e2670060c6818cb2c07e5ab 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-@@ -28,4 +28,11 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
-     public String toString() {
-         return "CraftPhantom";
-     }
-+
-+    // Paper start
-+    @Override
-+    public java.util.UUID getSpawningEntity() {
-+        return getHandle().getSpawningEntity();
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/0248-Add-More-Creeper-API.patch
+++ b/patches/unapplied/server/0248-Add-More-Creeper-API.patch
@ -1,60 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 24 Aug 2018 11:50:26 -0500
-Subject: [PATCH] Add More Creeper API
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 17ce05e7f9d2615be28a095ef6d3126885df8771..7fe90ebc8eced53f72c7f935e40745075f02421b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -132,7 +132,7 @@ public class Creeper extends Monster implements PowerableMob {
-         }
- 
-         if (nbt.getBoolean("ignited")) {
-            this.ignite();
-+            this.entityData.set(Creeper.DATA_IS_IGNITED, true); // Paper - set directly to avoid firing event
-         }
- 
-     }
-@@ -315,7 +315,18 @@ public class Creeper extends Monster implements PowerableMob {
-     }
- 
-     public void ignite() {
-        this.entityData.set(Creeper.DATA_IS_IGNITED, true);
-+        // Paper start
-+        setIgnited(true);
-+    }
-+
-+    public void setIgnited(boolean ignited) {
-+        if (isIgnited() != ignited) {
-+            com.destroystokyo.paper.event.entity.CreeperIgniteEvent event = new com.destroystokyo.paper.event.entity.CreeperIgniteEvent((org.bukkit.entity.Creeper) getBukkitEntity(), ignited);
-+            if (event.callEvent()) {
-+                this.entityData.set(Creeper.DATA_IS_IGNITED, event.isIgnited());
-+            }
-+        }
-+        // Paper end
-     }
- 
-     public boolean canDropMobsSkull() {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
-index e9a9154804bf2b26f4c613e81819e1cf448b76d0..6ccb32786b3abe1109dcc2d083cd231b70d8c6b4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
-@@ -88,4 +88,16 @@ public class CraftCreeper extends CraftMonster implements Creeper {
-     public String toString() {
-         return "CraftCreeper";
-     }
-+
-+    // Paper start
-+    @Override
-+    public void setIgnited(boolean ignited) {
-+        getHandle().setIgnited(ignited);
-+    }
-+
-+    @Override
-+    public boolean isIgnited() {
-+        return getHandle().isIgnited();
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/server/0249-Inventory-removeItemAnySlot.patch
+++ b/patches/unapplied/server/0249-Inventory-removeItemAnySlot.patch
@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 28 Aug 2018 23:04:15 -0400
-Subject: [PATCH] Inventory#removeItemAnySlot
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 89706da0940ac6bbb3c34f0a8815783edd6cd772..e97c7809fa6572695377e5ca63bf86e5515ef531 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-@@ -223,10 +223,16 @@ public class CraftInventory implements Inventory {
-     }
- 
-     private int first(ItemStack item, boolean withAmount) {
-+        // Paper start
-+        return first(item, withAmount, getStorageContents());
-+    }
-+
-+    private int first(ItemStack item, boolean withAmount, ItemStack[] inventory) {
-+        // Paper end
-         if (item == null) {
-             return -1;
-         }
-        ItemStack[] inventory = this.getStorageContents();
-+        // ItemStack[] inventory = this.getStorageContents(); // Paper - let param deal
-         for (int i = 0; i < inventory.length; i++) {
-             if (inventory[i] == null) continue;
- 
-@@ -350,6 +356,17 @@ public class CraftInventory implements Inventory {
- 
-     @Override
-     public HashMap<Integer, ItemStack> removeItem(ItemStack... items) {
-+        // Paper start
-+        return removeItem(false, items);
-+    }
-+
-+    @Override
-+    public HashMap<Integer, ItemStack> removeItemAnySlot(ItemStack... items) {
-+        return removeItem(true, items);
-+    }
-+
-+    private HashMap<Integer, ItemStack> removeItem(boolean searchEntire, ItemStack... items) {
-+        // Paper end
-         Preconditions.checkArgument(items != null, "items cannot be null");
-         HashMap<Integer, ItemStack> leftover = new HashMap<Integer, ItemStack>();
- 
-@@ -361,7 +378,10 @@ public class CraftInventory implements Inventory {
-             int toDelete = item.getAmount();
- 
-             while (true) {
-                int first = this.first(item, false);
-+                // Paper start - Allow searching entire contents
-+                ItemStack[] toSearch = searchEntire ? getContents() : getStorageContents();
-+                int first = this.first(item, false, toSearch);
-+                // Paper end
- 
-                 // Drat! we don't have this type in the inventory
-                 if (first == -1) {
--- a/patches/unapplied/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/unapplied/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Sun, 2 Sep 2018 19:34:33 -0700
-Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
- chunks
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 58f261162627c3065bb1b518e0e99f5c822c022c..57f9324aa73be4fcbb9668ef7be6b6e64d57800e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -400,7 +400,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-     @Override
-     public boolean loadChunk(int x, int z, boolean generate) {
-         org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
-        ChunkAccess chunk = this.world.getChunkSource().getChunk(x, z, generate ? ChunkStatus.FULL : ChunkStatus.EMPTY, true);
-+        ChunkAccess chunk = this.world.getChunkSource().getChunk(x, z, generate || isChunkGenerated(x, z) ? ChunkStatus.FULL : ChunkStatus.EMPTY, true); // Paper
- 
-         // If generate = false, but the chunk already exists, we will get this back.
-         if (chunk instanceof ImposterProtoChunk) {
--- a/patches/unapplied/server/0251-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/unapplied/server/0251-Add-ray-tracing-methods-to-LivingEntity.patch
@ -1,69 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Mon, 3 Sep 2018 18:20:03 -0500
-Subject: [PATCH] Add ray tracing methods to LivingEntity
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index fe14ebe86ce2bc5835e51c7bbe56a5d69fa02bea..c995c8ac6785e5f8951013f3a37127573351c2c7 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3771,6 +3771,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
-     }
- 
-     // Paper start
-+
-+    public HitResult getRayTrace(int maxDistance, ClipContext.Fluid fluidCollisionOption) {
-+        if (maxDistance < 1 || maxDistance > 120) {
-+            throw new IllegalArgumentException("maxDistance must be between 1-120");
-+        }
-+
-+        Vec3 start = new Vec3(getX(), getY() + getEyeHeight(), getZ());
-+        org.bukkit.util.Vector dir = getBukkitEntity().getLocation().getDirection().multiply(maxDistance);
-+        Vec3 end = new Vec3(start.x + dir.getX(), start.y + dir.getY(), start.z + dir.getZ());
-+        ClipContext raytrace = new ClipContext(start, end, ClipContext.Block.OUTLINE, fluidCollisionOption, this);
-+
-+        return this.level().clip(raytrace);
-+    }
-+
-     public int shieldBlockingDelay = this.level().paperConfig().misc.shieldBlockingDelay;
- 
-     public int getShieldBlockingDelay() {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index f79118891ca87515cbcea8b798e434cb57bbe494..0707329670292551d966afe30818f17d079fcb3b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -201,6 +201,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         return blocks.get(0);
-     }
- 
-+    // Paper start
-+    @Override
-+    public Block getTargetBlock(int maxDistance, com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode) {
-+        return this.getTargetBlockExact(maxDistance, fluidMode.bukkit);
-+    }
-+
-+    @Override
-+    public org.bukkit.block.BlockFace getTargetBlockFace(int maxDistance, com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode) {
-+        return this.getTargetBlockFace(maxDistance, fluidMode.bukkit);
-+    }
-+
-+    @Override
-+    public org.bukkit.block.BlockFace getTargetBlockFace(int maxDistance, org.bukkit.FluidCollisionMode fluidMode) {
-+        RayTraceResult result = this.rayTraceBlocks(maxDistance, fluidMode);
-+        return result != null ? result.getHitBlockFace() : null;
-+    }
-+
-+    @Override
-+    public com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance, com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode) {
-+        RayTraceResult result = this.rayTraceBlocks(maxDistance, fluidMode.bukkit);
-+        if (result != null && result.getHitBlock() != null && result.getHitBlockFace() != null) {
-+            return new com.destroystokyo.paper.block.TargetBlockInfo(result.getHitBlock(), result.getHitBlockFace());
-+        }
-+        return null;
-+    }
-+    // Paper end
-+
-     @Override
-     public List<Block> getLastTwoTargetBlocks(Set<Material> transparent, int maxDistance) {
-         return this.getLineOfSight(transparent, maxDistance, 2);