More more more more work

2021-11-23 14:22:49 +01:00 · 2021-11-23 14:22:49 +01:00 · d7cdc72bdf
commit d7cdc72bdf
parent e9954ed32a
85 changed files with 272 additions and 261 deletions
--- a/patches/unapplied/api/0034-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/unapplied/api/0034-Add-PlayerUseUnknownEntityEvent.patch
@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jedediah Smith <jedediah@silencegreys.com>
-Date: Sat, 2 Apr 2016 05:08:36 -0400
-Subject: [PATCH] Add PlayerUseUnknownEntityEvent
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..09cfdf48ead8f03f3497646537292174241b0868
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java
-@@ -0,0 +1,46 @@
-+package com.destroystokyo.paper.event.player;
-+
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.player.PlayerEvent;
-+import org.bukkit.inventory.EquipmentSlot;
-+import org.jetbrains.annotations.NotNull;
-+
-+public class PlayerUseUnknownEntityEvent extends PlayerEvent {
-+
-+    private static final HandlerList handlers = new HandlerList();
-+    private final int entityId;
-+    private final boolean attack;
-+    @NotNull private final EquipmentSlot hand;
-+
-+    public PlayerUseUnknownEntityEvent(@NotNull Player who, int entityId, boolean attack, @NotNull EquipmentSlot hand) {
-+        super(who);
-+        this.entityId = entityId;
-+        this.attack = attack;
-+        this.hand = hand;
-+    }
-+
-+    public int getEntityId() {
-+        return this.entityId;
-+    }
-+
-+    public boolean isAttack() {
-+        return this.attack;
-+    }
-+
-+    @NotNull
-+    public EquipmentSlot getHand() {
-+        return this.hand;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}
--- a/patches/unapplied/api/0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/unapplied/api/0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@ -1,290 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Wed, 13 Apr 2016 20:20:18 -0700
-Subject: [PATCH] Add handshake event to allow plugins to handle client
- handshaking logic themselves
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..a077962fa786a3291849abfa823c7f0ec4664fce
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
-@@ -0,0 +1,277 @@
-+package com.destroystokyo.paper.event.player;
-+
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.format.NamedTextColor;
-+import org.apache.commons.lang.Validate;
-+import org.bukkit.Bukkit;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.Event;
-+import org.bukkit.event.HandlerList;
-+
-+import java.util.UUID;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * This event is fired during a player handshake.
-+ *
-+ * <p>If there are no listeners listening to this event, the logic default
-+ * to your server platform will be ran.</p>
-+ *
-+ * <p>WARNING: TAMPERING WITH THIS EVENT CAN BE DANGEROUS</p>
-+ */
-+public class PlayerHandshakeEvent extends Event implements Cancellable {
-+
-+    private static final HandlerList HANDLERS = new HandlerList();
-+    @NotNull private final String originalHandshake;
-+    @NotNull private final String originalSocketAddressHostname;
-+    private boolean cancelled;
-+    @Nullable private String serverHostname;
-+    @Nullable private String socketAddressHostname;
-+    @Nullable private UUID uniqueId;
-+    @Nullable private String propertiesJson;
-+    private boolean failed;
-+    private Component failMessage = Component.text("If you wish to use IP forwarding, please enable it in your BungeeCord config as well!", NamedTextColor.YELLOW);
-+
-+    /**
-+     * Creates a new {@link PlayerHandshakeEvent}.
-+     *
-+     * @param originalHandshake the original handshake string
-+     * @param cancelled if this event is enabled
-+     *
-+     * @deprecated in favour of {@link PlayerHandshakeEvent(String, String, boolean)}
-+     */
-+    @Deprecated
-+    public PlayerHandshakeEvent(@NotNull String originalHandshake, boolean cancelled) {
-+        this(originalHandshake, "127.0.0.1", cancelled);
-+    }
-+
-+    /**
-+     * Creates a new {@link PlayerHandshakeEvent}.
-+     *
-+     * @param originalHandshake the original handshake string
-+     * @param originalSocketAddressHostname the original socket address hostname
-+     * @param cancelled if this event is enabled
-+     */
-+    public PlayerHandshakeEvent(@NotNull String originalHandshake, @NotNull String originalSocketAddressHostname, boolean cancelled) {
-+        super(true);
-+        this.originalHandshake = originalHandshake;
-+        this.originalSocketAddressHostname = originalSocketAddressHostname;
-+        this.cancelled = cancelled;
-+    }
-+
-+    /**
-+     * Determines if this event is cancelled.
-+     *
-+     * <p>When this event is cancelled, custom handshake logic will not
-+     * be processed.</p>
-+     *
-+     * @return {@code true} if this event is cancelled, {@code false} otherwise
-+     */
-+    @Override
-+    public boolean isCancelled() {
-+        return this.cancelled;
-+    }
-+
-+    /**
-+     * Sets if this event is cancelled.
-+     *
-+     * <p>When this event is cancelled, custom handshake logic will not
-+     * be processed.</p>
-+     *
-+     * @param cancelled {@code true} if this event is cancelled, {@code false} otherwise
-+     */
-+    @Override
-+    public void setCancelled(boolean cancelled) {
-+        this.cancelled = cancelled;
-+    }
-+
-+    /**
-+     * Gets the original handshake string.
-+     *
-+     * @return the original handshake string
-+     */
-+    @NotNull
-+    public String getOriginalHandshake() {
-+        return this.originalHandshake;
-+    }
-+
-+    /**
-+     * Gets the original socket address hostname.
-+     *
-+     * <p>This does not include the port.</p>
-+     * <p>In cases where this event is manually fired and the plugin wasn't updated yet, the default is {@code "127.0.0.1"}.</p>
-+     *
-+     * @return the original socket address hostname
-+     */
-+    @NotNull
-+    public String getOriginalSocketAddressHostname() {
-+        return this.originalSocketAddressHostname;
-+    }
-+
-+    /**
-+     * Gets the server hostname string.
-+     *
-+     * <p>This should not include the port.</p>
-+     *
-+     * @return the server hostname string
-+     */
-+    @Nullable
-+    public String getServerHostname() {
-+        return this.serverHostname;
-+    }
-+
-+    /**
-+     * Sets the server hostname string.
-+     *
-+     * <p>This should not include the port.</p>
-+     *
-+     * @param serverHostname the server hostname string
-+     */
-+    public void setServerHostname(@NotNull String serverHostname) {
-+        this.serverHostname = serverHostname;
-+    }
-+
-+    /**
-+     * Gets the socket address hostname string.
-+     *
-+     * <p>This should not include the port.</p>
-+     *
-+     * @return the socket address hostname string
-+     */
-+    @Nullable
-+    public String getSocketAddressHostname() {
-+        return this.socketAddressHostname;
-+    }
-+
-+    /**
-+     * Sets the socket address hostname string.
-+     *
-+     * <p>This should not include the port.</p>
-+     *
-+     * @param socketAddressHostname the socket address hostname string
-+     */
-+    public void setSocketAddressHostname(@NotNull String socketAddressHostname) {
-+        this.socketAddressHostname = socketAddressHostname;
-+    }
-+
-+    /**
-+     * Gets the unique id.
-+     *
-+     * @return the unique id
-+     */
-+    @Nullable
-+    public UUID getUniqueId() {
-+        return this.uniqueId;
-+    }
-+
-+    /**
-+     * Sets the unique id.
-+     *
-+     * @param uniqueId the unique id
-+     */
-+    public void setUniqueId(@NotNull UUID uniqueId) {
-+        this.uniqueId = uniqueId;
-+    }
-+
-+    /**
-+     * Gets the profile properties.
-+     *
-+     * <p>This should be a valid JSON string.</p>
-+     *
-+     * @return the profile properties, as JSON
-+     */
-+    @Nullable
-+    public String getPropertiesJson() {
-+        return this.propertiesJson;
-+    }
-+
-+    /**
-+     * Determines if authentication failed.
-+     *
-+     * <p>When {@code true}, the client connecting will be disconnected
-+     * with the {@link #getFailMessage() fail message}.</p>
-+     *
-+     * @return {@code true} if authentication failed, {@code false} otherwise
-+     */
-+    public boolean isFailed() {
-+        return this.failed;
-+    }
-+
-+    /**
-+     * Sets if authentication failed and the client should be disconnected.
-+     *
-+     * <p>When {@code true}, the client connecting will be disconnected
-+     * with the {@link #getFailMessage() fail message}.</p>
-+     *
-+     * @param failed {@code true} if authentication failed, {@code false} otherwise
-+     */
-+    public void setFailed(boolean failed) {
-+        this.failed = failed;
-+    }
-+
-+    /**
-+     * Sets the profile properties.
-+     *
-+     * <p>This should be a valid JSON string.</p>
-+     *
-+     * @param propertiesJson the profile properties, as JSON
-+     */
-+    public void setPropertiesJson(@NotNull String propertiesJson) {
-+        this.propertiesJson = propertiesJson;
-+    }
-+
-+    /**
-+     * Gets the message to display to the client when authentication fails.
-+     *
-+     * @return the message to display to the client
-+     */
-+    @NotNull
-+    public Component failMessage() {
-+        return this.failMessage;
-+    }
-+
-+    /**
-+     * Sets the message to display to the client when authentication fails.
-+     *
-+     * @param failMessage the message to display to the client
-+     */
-+    public void failMessage(@NotNull Component failMessage) {
-+        this.failMessage = failMessage;
-+    }
-+
-+    /**
-+     * Gets the message to display to the client when authentication fails.
-+     *
-+     * @return the message to display to the client
-+     * @deprecated use {@link #failMessage()}
-+     */
-+    @NotNull
-+    @Deprecated
-+    public String getFailMessage() {
-+        return Bukkit.getUnsafe().legacyComponentSerializer().serialize(this.failMessage());
-+    }
-+
-+    /**
-+     * Sets the message to display to the client when authentication fails.
-+     *
-+     * @param failMessage the message to display to the client
-+     * @deprecated use {@link #failMessage(Component)}
-+     */
-+    @Deprecated
-+    public void setFailMessage(@NotNull String failMessage) {
-+        Validate.notEmpty(failMessage, "fail message cannot be null or empty");
-+        this.failMessage(Bukkit.getUnsafe().legacyComponentSerializer().deserialize(failMessage));
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return HANDLERS;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return HANDLERS;
-+    }
-+}
--- a/patches/unapplied/api/0036-Arrow-pickup-rule-API.patch
+++ b/patches/unapplied/api/0036-Arrow-pickup-rule-API.patch
@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jedediah Smith <jedediah@silencegreys.com>
-Date: Fri, 4 Mar 2016 03:13:18 -0500
-Subject: [PATCH] Arrow pickup rule API
-
-
-diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
-index 5b50a4e10e8ace8cc53ad3c8d7c3185f88d5c8db..e8e56e89e32d84af0639fe2e9b0eeabd747b6007 100644
--- a/src/main/java/org/bukkit/entity/AbstractArrow.java
-+++ b/src/main/java/org/bukkit/entity/AbstractArrow.java
-@@ -141,4 +141,38 @@ public interface AbstractArrow extends Projectile {
-          */
-         CREATIVE_ONLY
-     }
-+
-+    // Paper start
-+    /**
-+     * Gets the {@link PickupRule} for this arrow.
-+     *
-+     * <p>This is generally {@link PickupRule#ALLOWED} only if the arrow was
-+     * <b>not</b> fired from a bow with the infinity enchantment.</p>
-+     *
-+     * @return The pickup rule
-+     * @deprecated Use {@link Arrow#getPickupStatus()} as an upstream compatible replacement for this function
-+     */
-+    @Deprecated
-+    default PickupRule getPickupRule() {
-+        return PickupRule.valueOf(this.getPickupStatus().name());
-+    }
-+
-+    /**
-+     * Set the rule for which players can pickup this arrow as an item.
-+     *
-+     * @param rule The pickup rule
-+     * @deprecated Use {@link Arrow#setPickupStatus(PickupStatus)} with {@link PickupStatus} as an upstream compatible replacement for this function
-+     */
-+    @Deprecated
-+    default void setPickupRule(PickupRule rule) {
-+        this.setPickupStatus(PickupStatus.valueOf(rule.name()));
-+    }
-+
-+    @Deprecated
-+    enum PickupRule {
-+        DISALLOWED,
-+        ALLOWED,
-+        CREATIVE_ONLY;
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/api/0037-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/unapplied/api/0037-EntityRegainHealthEvent-isFastRegen-API.patch
@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Fri, 22 Apr 2016 01:43:11 -0500
-Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
-
-
-diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
-index 8feb6698f9630f099be99e52d1149cd6bc615197..d51d2ec1d04d9ea8a25a70d0d856f2355ebfcb4a 100644
--- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
-@@ -13,12 +13,31 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
-     private boolean cancelled;
-     private double amount;
-     private final RegainReason regainReason;
-+    private final boolean isFastRegen; // Paper
- 
-     public EntityRegainHealthEvent(@NotNull final Entity entity, final double amount, @NotNull final RegainReason regainReason) {
-+        // Paper start - Forward
-+        this(entity, amount, regainReason, false);
-+    }
-+
-+    public EntityRegainHealthEvent(@NotNull final Entity entity, final double amount, @NotNull final RegainReason regainReason, boolean isFastRegen) {
-+        // Paper end
-         super(entity);
-         this.amount = amount;
-         this.regainReason = regainReason;
-+        this.isFastRegen = isFastRegen; // Paper
-+    }
-+
-+    // Paper start - Add getter for isFastRegen
-+    /**
-+     * Is this event a result of the fast regeneration mechanic
-+     *
-+     * @return Whether the event is the result of a fast regeneration mechanic
-+     */
-+    public boolean isFastRegen() {
-+        return isFastRegen;
-     }
-+    // Paper end
- 
-     /**
-      * Gets the amount of regained health
--- a/patches/unapplied/api/0038-LootTable-API.patch
+++ b/patches/unapplied/api/0038-LootTable-API.patch
@ -1,402 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 1 May 2016 15:19:49 -0400
-Subject: [PATCH] LootTable API
-
-Provides API to control what Loot Table an object uses.
-
-Also provides an Event to control if a lootable inventory should
-auto replenish for a player.
-
-Provides methods to determine players looted state for an object
-
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..92d7b853a2ccaae5afa8ac141bead840942944ef
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
-@@ -0,0 +1,17 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import org.bukkit.block.Block;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Represents an Inventory that can generate loot, such as Chests inside of Fortresses and Mineshafts
-+ */
-+public interface LootableBlockInventory extends LootableInventory {
-+
-+    /**
-+     * Gets the block that is lootable
-+     * @return The Block
-+     */
-+    @NotNull
-+    Block getBlock();
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..b387894fe8001edb41ad2ad2b70ebabe065b682e
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
-@@ -0,0 +1,17 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import org.bukkit.entity.Entity;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Represents an Inventory that can generate loot, such as Minecarts inside of Mineshafts
-+ */
-+public interface LootableEntityInventory extends LootableInventory {
-+
-+    /**
-+     * Gets the entity that is lootable
-+     * @return The Entity
-+     */
-+    @NotNull
-+    Entity getEntity();
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..97815eeb231cf0706b34fa47a4f7d1bb786305b4
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
-@@ -0,0 +1,116 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import org.bukkit.entity.Player;
-+import org.bukkit.loot.Lootable;
-+
-+import java.util.UUID;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * Represents an Inventory that contains a Loot Table associated to it that will
-+ * automatically fill on first open.
-+ *
-+ * A new feature and API is provided to support automatically refreshing the contents
-+ * of the inventory based on that Loot Table after a configurable amount of time has passed.
-+ *
-+ * The behavior of how the Inventory is filled based on the loot table may vary based
-+ * on Minecraft versions and the Loot Table feature.
-+ */
-+public interface LootableInventory extends Lootable {
-+
-+    /**
-+     * Server owners have to enable whether or not an object in a world should refill
-+     *
-+     * @return If the world this inventory is currently in has Replenishable Lootables enabled
-+     */
-+    boolean isRefillEnabled();
-+
-+    /**
-+     * Whether or not this object has ever been filled
-+     * @return Has ever been filled
-+     */
-+    boolean hasBeenFilled();
-+
-+    /**
-+     * Has this player ever looted this block
-+     * @param player The player to check
-+     * @return Whether or not this player has looted this block
-+     */
-+    default boolean hasPlayerLooted(@NotNull Player player) {
-+        return hasPlayerLooted(player.getUniqueId());
-+    }
-+
-+    /**
-+     * Has this player ever looted this block
-+     * @param player The player to check
-+     * @return Whether or not this player has looted this block
-+     */
-+    boolean hasPlayerLooted(@NotNull UUID player);
-+
-+    /**
-+     * Gets the timestamp, in milliseconds, of when the player last looted this object
-+     *
-+     * @param player The player to check
-+     * @return Timestamp last looted, or null if player has not looted this object
-+     */
-+    @Nullable
-+    default Long getLastLooted(@NotNull Player player) {
-+        return getLastLooted(player.getUniqueId());
-+    }
-+
-+    /**
-+     * Gets the timestamp, in milliseconds, of when the player last looted this object
-+     *
-+     * @param player The player to check
-+     * @return Timestamp last looted, or null if player has not looted this object
-+     */
-+    @Nullable
-+    Long getLastLooted(@NotNull UUID player);
-+
-+    /**
-+     * Change the state of whether or not a player has looted this block
-+     * @param player The player to change state for
-+     * @param looted true to add player to looted list, false to remove
-+     * @return The previous state of whether the player had looted this or not
-+     */
-+    default boolean setHasPlayerLooted(@NotNull Player player, boolean looted) {
-+        return setHasPlayerLooted(player.getUniqueId(), looted);
-+    }
-+
-+    /**
-+     * Change the state of whether or not a player has looted this block
-+     * @param player The player to change state for
-+     * @param looted true to add player to looted list, false to remove
-+     * @return The previous state of whether the player had looted this or not
-+     */
-+    boolean setHasPlayerLooted(@NotNull UUID player, boolean looted);
-+
-+    /**
-+     * Returns Whether or not this object has been filled and now has a pending refill
-+     * @return Has pending refill
-+     */
-+    boolean hasPendingRefill();
-+
-+    /**
-+     * Gets the timestamp in milliseconds that the Lootable object was last refilled
-+     *
-+     * @return -1 if it was never refilled, or timestamp in milliseconds
-+     */
-+    long getLastFilled();
-+
-+    /**
-+     * Gets the timestamp in milliseconds that the Lootable object will refill
-+     *
-+     * @return -1 if it is not scheduled for refill, or timestamp in milliseconds
-+     */
-+    long getNextRefill();
-+
-+    /**
-+     * Sets the timestamp in milliseconds of the next refill for this object
-+     *
-+     * @param refillAt timestamp in milliseconds. -1 to clear next refill
-+     * @return The previous scheduled time to refill, or -1 if was not scheduled
-+     */
-+    long setNextRefill(long refillAt);
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..fd184f13f5e8ee5cf829fff4f44696e1f760430b
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
-@@ -0,0 +1,45 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.player.PlayerEvent;
-+import org.jetbrains.annotations.NotNull;
-+
-+public class LootableInventoryReplenishEvent extends PlayerEvent implements Cancellable {
-+    @NotNull private final LootableInventory inventory;
-+
-+    public LootableInventoryReplenishEvent(@NotNull Player player, @NotNull LootableInventory inventory) {
-+        super(player);
-+        this.inventory = inventory;
-+    }
-+
-+    @NotNull
-+    public LootableInventory getInventory() {
-+        return inventory;
-+    }
-+
-+    private static final HandlerList handlers = new HandlerList();
-+
-+    @NotNull
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+
-+    private boolean cancelled = false;
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        cancelled = cancel;
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java
-index b451191312e4fb19f2131c2d0a0c0337953f6c7c..db6affbc78106b2d93b41953b624a0bca0ca1d72 100644
--- a/src/main/java/org/bukkit/block/Chest.java
-+++ b/src/main/java/org/bukkit/block/Chest.java
-@@ -1,5 +1,7 @@
- package org.bukkit.block;
- 
-+import com.destroystokyo.paper.loottable.LootableBlockInventory; // Paper
-+import org.bukkit.Nameable; // Paper
- import org.bukkit.inventory.Inventory;
- import org.bukkit.loot.Lootable;
- import org.jetbrains.annotations.NotNull;
-@@ -7,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
- /**
-  * Represents a captured state of a chest.
-  */
-public interface Chest extends Container, Lootable, Lidded {
-+public interface Chest extends Container, LootableBlockInventory, Lidded { // Paper
- 
-     /**
-      * Gets the inventory of the chest block represented by this block state.
-diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java
-index 74cd194c9a98245dc52e7e352d7d6c046e1e5cf3..07af1a3f011d4b96275f919d302ac367198e923e 100644
--- a/src/main/java/org/bukkit/block/Dispenser.java
-+++ b/src/main/java/org/bukkit/block/Dispenser.java
-@@ -1,5 +1,6 @@
- package org.bukkit.block;
- 
-+import com.destroystokyo.paper.loottable.LootableBlockInventory;
- import org.bukkit.Nameable;
- import org.bukkit.loot.Lootable;
- import org.bukkit.projectiles.BlockProjectileSource;
-@@ -8,7 +9,7 @@ import org.jetbrains.annotations.Nullable;
- /**
-  * Represents a captured state of a dispenser.
-  */
-public interface Dispenser extends Container, Nameable, Lootable {
-+public interface Dispenser extends Container, Nameable, LootableBlockInventory { // Paper
- 
-     /**
-      * Gets the BlockProjectileSource object for the dispenser.
-diff --git a/src/main/java/org/bukkit/block/Dropper.java b/src/main/java/org/bukkit/block/Dropper.java
-index 424392fb5ed4628199b0e73689522aa3c90740cb..c76202321e29ad67597ca3017eb8d9baf6787383 100644
--- a/src/main/java/org/bukkit/block/Dropper.java
-+++ b/src/main/java/org/bukkit/block/Dropper.java
-@@ -1,11 +1,12 @@
- package org.bukkit.block;
- 
-+import com.destroystokyo.paper.loottable.LootableBlockInventory;
- import org.bukkit.loot.Lootable;
- 
- /**
-  * Represents a captured state of a dropper.
-  */
-public interface Dropper extends Container, Lootable {
-+public interface Dropper extends Container, LootableBlockInventory { // Paper
- 
-     /**
-      * Tries to drop a randomly selected item from the dropper's inventory,
-diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java
-index 58e493099810fb8d4705ecd49b4a5e1e1949b87b..7ade312f180b7e30871d3a3240c76325cc369c26 100644
--- a/src/main/java/org/bukkit/block/Hopper.java
-+++ b/src/main/java/org/bukkit/block/Hopper.java
-@@ -1,8 +1,9 @@
- package org.bukkit.block;
- 
-+import com.destroystokyo.paper.loottable.LootableBlockInventory;
- import org.bukkit.loot.Lootable;
- 
- /**
-  * Represents a captured state of a hopper.
-  */
-public interface Hopper extends Container, Lootable { }
-+public interface Hopper extends Container, LootableBlockInventory { } // Paper
-diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java
-index 387b2892886e1ccb2bd928e5111fb9bd41d777ab..5dc5318b0a451937228a8a059dfec1cd9de389a6 100644
--- a/src/main/java/org/bukkit/block/ShulkerBox.java
-+++ b/src/main/java/org/bukkit/block/ShulkerBox.java
-@@ -1,5 +1,6 @@
- package org.bukkit.block;
- 
-+import com.destroystokyo.paper.loottable.LootableBlockInventory;
- import org.bukkit.DyeColor;
- import org.bukkit.loot.Lootable;
- import org.jetbrains.annotations.Nullable;
-@@ -7,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
- /**
-  * Represents a captured state of a ShulkerBox.
-  */
-public interface ShulkerBox extends Container, Lootable, Lidded {
-+public interface ShulkerBox extends Container, LootableBlockInventory, Lidded { // Paper
- 
-     /**
-      * Get the {@link DyeColor} corresponding to this ShulkerBox
-diff --git a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
-index 937b99f8734d71b2ad33af142afbc251b81d9745..db69687a7ad4b18d17ab1677cae5d8dd4dcd3678 100644
--- a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
-+++ b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
-@@ -1,5 +1,6 @@
- package org.bukkit.entity.minecart;
- 
-+import com.destroystokyo.paper.loottable.LootableEntityInventory;
- import org.bukkit.entity.Minecart;
- import org.bukkit.inventory.InventoryHolder;
- import org.bukkit.loot.Lootable;
-@@ -7,7 +8,7 @@ import org.bukkit.loot.Lootable;
- /**
-  * Represents a Minecart with a Hopper inside it
-  */
-public interface HopperMinecart extends Minecart, InventoryHolder, Lootable {
-+public interface HopperMinecart extends Minecart, InventoryHolder, LootableEntityInventory {
- 
-     /**
-      * Checks whether or not this Minecart will pick up
-diff --git a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
-index 9ea403e6fd8e960d017660e0aec118abeda2c42b..238d118f7788b13cd86b7e9ea3a0fc38e2e09715 100644
--- a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
-+++ b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
-@@ -1,5 +1,6 @@
- package org.bukkit.entity.minecart;
- 
-+import com.destroystokyo.paper.loottable.LootableEntityInventory;
- import org.bukkit.entity.Minecart;
- import org.bukkit.inventory.InventoryHolder;
- import org.bukkit.loot.Lootable;
-@@ -9,5 +10,5 @@ import org.bukkit.loot.Lootable;
-  * minecarts} have their own inventory that can be accessed using methods
-  * from the {@link InventoryHolder} interface.
-  */
-public interface StorageMinecart extends Minecart, InventoryHolder, Lootable {
-+public interface StorageMinecart extends Minecart, InventoryHolder, LootableEntityInventory { // Paper
- }
-diff --git a/src/main/java/org/bukkit/loot/Lootable.java b/src/main/java/org/bukkit/loot/Lootable.java
-index 24a3d989db3bc67e7afe8459a3d4bb132f448ea7..901db852498e0658c79a57582508dab29bf0a798 100644
--- a/src/main/java/org/bukkit/loot/Lootable.java
-+++ b/src/main/java/org/bukkit/loot/Lootable.java
-@@ -36,6 +36,34 @@ public interface Lootable {
-     @Nullable
-     LootTable getLootTable();
- 
-+    // Paper start
-+    /**
-+     * Set the loot table and seed for a container or entity at the same time.
-+     *
-+     * @param table the Loot Table this {@link org.bukkit.block.Container} or {@link org.bukkit.entity.Mob} will have.
-+     * @param seed the seed to used to generate loot. Default is 0.
-+     */
-+    default void setLootTable(@Nullable LootTable table, long seed) {
-+        setLootTable(table);
-+        setSeed(seed);
-+    }
-+
-+    /**
-+     * Returns whether or not this object has a Loot Table
-+     * @return Has a loot table
-+     */
-+    default boolean hasLootTable() {
-+        return getLootTable() != null;
-+    }
-+
-+    /**
-+     * Clears the associated Loot Table to this object
-+     */
-+    default void clearLootTable() {
-+        setLootTable(null);
-+    }
-+    // Paper end
-+
-     /**
-      * Set the seed used when this Loot Table generates loot.
-      *
--- a/patches/unapplied/api/0039-Add-EntityZapEvent.patch
+++ b/patches/unapplied/api/0039-Add-EntityZapEvent.patch
@ -1,123 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaBlend <whizkid3000@hotmail.com>
-Date: Sun, 16 Oct 2016 23:19:34 -0700
-Subject: [PATCH] Add EntityZapEvent
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..3b725a489008d333630af166d2be5fc48168a6b9
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
-@@ -0,0 +1,65 @@
-+package com.destroystokyo.paper.event.entity;
-+
-+import org.apache.commons.lang.Validate;
-+import org.bukkit.entity.Entity;
-+import org.bukkit.entity.LightningStrike;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.entity.EntityEvent;
-+import org.bukkit.event.entity.EntityTransformEvent;
-+
-+import java.util.Collections;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ *  Fired when lightning strikes an entity
-+ */
-+public class EntityZapEvent extends EntityTransformEvent implements Cancellable {
-+    private static final HandlerList handlers = new HandlerList();
-+    private boolean cancelled;
-+    @NotNull private final LightningStrike bolt;
-+
-+    public EntityZapEvent(@NotNull final Entity entity, @NotNull final LightningStrike bolt, @NotNull final Entity replacementEntity) {
-+        super(entity, Collections.singletonList(replacementEntity), TransformReason.LIGHTNING);
-+        Validate.notNull(bolt);
-+        Validate.notNull(replacementEntity);
-+        this.bolt = bolt;
-+    }
-+
-+    public boolean isCancelled() {
-+        return cancelled;
-+    }
-+
-+    public void setCancelled(boolean cancel) {
-+        this.cancelled = cancel;
-+    }
-+
-+    /**
-+     * Gets the lightning bolt that is striking the entity.
-+     * @return The lightning bolt responsible for this event
-+     */
-+    @NotNull
-+    public LightningStrike getBolt() {
-+        return bolt;
-+    }
-+
-+    /**
-+     * Gets the entity that will replace the struck entity.
-+     * @return The entity that will replace the struck entity
-+     */
-+    @NotNull
-+    public Entity getReplacementEntity() {
-+        return getTransformedEntity();
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-index 0e0ed93b568fd2c0d8f6e359c31dc29cb0fa71c2..d3949edfc736b3d67a627ef378748b374769e183 100644
--- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-@@ -2,6 +2,7 @@ package org.bukkit.event.entity;
- 
- import java.util.Collections;
- import org.bukkit.entity.Entity;
-+import com.destroystokyo.paper.event.entity.EntityZapEvent;
- import org.bukkit.entity.LightningStrike;
- import org.bukkit.entity.Pig;
- import org.bukkit.entity.PigZombie;
-@@ -12,14 +13,14 @@ import org.jetbrains.annotations.NotNull;
- /**
-  * Stores data for pigs being zapped
-  */
-public class PigZapEvent extends EntityTransformEvent implements Cancellable {
-    private static final HandlerList handlers = new HandlerList();
-+public class PigZapEvent extends EntityZapEvent implements Cancellable {
-+    //private static final HandlerList handlers = new HandlerList();
-     private boolean canceled;
-     private final PigZombie pigzombie;
-     private final LightningStrike bolt;
- 
-     public PigZapEvent(@NotNull final Pig pig, @NotNull final LightningStrike bolt, @NotNull final PigZombie pigzombie) {
-        super(pig, Collections.singletonList((Entity) pigzombie), TransformReason.LIGHTNING);
-+        super(pig, bolt, pigzombie);
-         this.bolt = bolt;
-         this.pigzombie = pigzombie;
-     }
-@@ -63,6 +64,8 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
-         return pigzombie;
-     }
- 
-+    // Paper start
-+    /*
-     @NotNull
-     @Override
-     public HandlerList getHandlers() {
-@@ -73,4 +76,6 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
-     public static HandlerList getHandlerList() {
-         return handlers;
-     }
-+    */
-+    // Paper end
- }
--- a/patches/unapplied/api/0040-Misc-Utils.patch
+++ b/patches/unapplied/api/0040-Misc-Utils.patch
@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: vemacs <d@nkmem.es>
-Date: Wed, 23 Nov 2016 12:53:43 -0500
-Subject: [PATCH] Misc Utils
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..5bb677ce585b856b3d3e589e29786a29619c56a7
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java
-@@ -0,0 +1,34 @@
-+package com.destroystokyo.paper.utils;
-+
-+import java.util.concurrent.ConcurrentLinkedQueue;
-+import java.util.concurrent.atomic.LongAdder;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+public class CachedSizeConcurrentLinkedQueue<E> extends ConcurrentLinkedQueue<E> {
-+    private final LongAdder cachedSize = new LongAdder();
-+
-+    @Override
-+    public boolean add(@NotNull E e) {
-+        boolean result = super.add(e);
-+        if (result) {
-+            cachedSize.increment();
-+        }
-+        return result;
-+    }
-+
-+    @Nullable
-+    @Override
-+    public E poll() {
-+        E result = super.poll();
-+        if (result != null) {
-+            cachedSize.decrement();
-+        }
-+        return result;
-+    }
-+
-+    @Override
-+    public int size() {
-+        return cachedSize.intValue();
-+    }
-+}
--- a/patches/unapplied/api/0041-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/unapplied/api/0041-Allow-Reloading-of-Command-Aliases.patch
@ -1,108 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: willies952002 <admin@domnian.com>
-Date: Mon, 28 Nov 2016 10:16:39 -0500
-Subject: [PATCH] Allow Reloading of Command Aliases
-
-Reload the aliases stored in commands.yml
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 308d9cd655c37e8a00bb053ecd2ba2450555158f..356a270e9f831e21dc7fd947c2bec72e0840145a 100644
--- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1897,6 +1897,15 @@ public final class Bukkit {
-     public static void reloadPermissions() {
-         server.reloadPermissions();
-     }
-+
-+    /**
-+     * Reload the Command Aliases in commands.yml
-+     *
-+     * @return Whether the reload was successful
-+     */
-+    public static boolean reloadCommandAliases() {
-+        return server.reloadCommandAliases();
-+    }
-     // Paper end
- 
-     @NotNull
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 51d7ec1b9ede6a1fe11d1bddc7a58213add72cbc..c0bd764744b101856ef4fa068b5218688b156ecf 100644
--- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1672,4 +1672,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     // Spigot end
- 
-     void reloadPermissions(); // Paper
-+
-+    boolean reloadCommandAliases(); // Paper
- }
-diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java
-index bd2c7a6964722412148fae39e1b4951fc0002b9b..864c263bbd4dd6dd7c37a74b39b1a40a884d0731 100644
--- a/src/main/java/org/bukkit/command/CommandMap.java
-+++ b/src/main/java/org/bukkit/command/CommandMap.java
-@@ -128,4 +128,14 @@ public interface CommandMap {
-      */
-     @Nullable
-     public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String cmdLine, @Nullable Location location) throws IllegalArgumentException;
-+
-+    // Paper start - Expose Known Commands
-+    /**
-+     * Return a Map of known commands
-+     *
-+     * @return known commands
-+     */
-+    @NotNull
-+    public java.util.Map<String, Command> getKnownCommands();
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index adfc7aae2c0f49bbcdd358e83b04a0cf078a7d52..460fda05a62b12db2edcfb7ea8b2a5dd8e4b110d 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
-+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -297,4 +297,11 @@ public class SimpleCommandMap implements CommandMap {
-             }
-         }
-     }
-+
-+    // Paper start - Expose Known Commands
-+    @NotNull
-+    public Map<String, Command> getKnownCommands() {
-+        return knownCommands;
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-index c62da4131b17e66892678e8b618fb9ba3de93b56..0c7ba0718de2b93d013968ca0fec34ffd423990f 100644
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-@@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand {
-     public ReloadCommand(@NotNull String name) {
-         super(name);
-         this.description = "Reloads the server configuration and plugins";
-        this.usageMessage = "/reload [permissions]"; // Paper
-+        this.usageMessage = "/reload [permissions|commands|confirm]"; // Paper
-         this.setPermission("bukkit.command.reload");
-         this.setAliases(Arrays.asList("rl"));
-     }
-@@ -29,6 +29,13 @@ public class ReloadCommand extends BukkitCommand {
-                 Bukkit.getServer().reloadPermissions();
-                 Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Permissions successfully reloaded.");
-                 return true;
-+            } else if ("commands".equalsIgnoreCase(args[0])) {
-+                if (Bukkit.getServer().reloadCommandAliases()) {
-+                    Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Command aliases successfully reloaded.");
-+                } else {
-+                    Command.broadcastCommandMessage(sender, ChatColor.RED + "An error occurred while trying to reload command aliases.");
-+                }
-+                return true;
-             } else if ("confirm".equalsIgnoreCase(args[0])) {
-                 confirmed = true;
-             } else {
-@@ -53,6 +60,6 @@ public class ReloadCommand extends BukkitCommand {
-     @NotNull
-     @Override
-     public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
-        return java.util.Collections.singletonList("permissions"); // Paper
-+        return com.google.common.collect.Lists.newArrayList("permissions", "commands"); // Paper
-     }
- }
--- a/patches/unapplied/api/0042-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/unapplied/api/0042-Add-source-to-PlayerExpChangeEvent.patch
@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaBlend <whizkid3000@hotmail.com>
-Date: Thu, 8 Sep 2016 08:47:08 -0700
-Subject: [PATCH] Add source to PlayerExpChangeEvent
-
-
-diff --git a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
-index c99c9281e98e4b510dddb711b8785bcd56b3b92f..7c340f539c31a431d7d9204a8135e0bfc31863a8 100644
--- a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
-@@ -1,21 +1,43 @@
- package org.bukkit.event.player;
- 
-+import org.bukkit.entity.Entity; // Paper
- import org.bukkit.entity.Player;
- import org.bukkit.event.HandlerList;
- import org.jetbrains.annotations.NotNull;
- 
-+import org.jetbrains.annotations.Nullable; // Paper
-+
- /**
-  * Called when a players experience changes naturally
-  */
- public class PlayerExpChangeEvent extends PlayerEvent {
-     private static final HandlerList handlers = new HandlerList();
-+    // Paper start
-+    @Nullable
-+    private final Entity source;
-     private int exp;
- 
-     public PlayerExpChangeEvent(@NotNull final Player player, final int expAmount) {
-+          this(player, null, expAmount);
-+    }
-+
-+    public PlayerExpChangeEvent(@NotNull final Player player, @Nullable final Entity sourceEntity, final int expAmount) {
-          super(player);
-+         source = sourceEntity;
-          exp = expAmount;
-     }
- 
-+    /**
-+     * Get the source that provided the experience.
-+     *
-+     * @return The source of the experience
-+     */
-+    @Nullable
-+    public Entity getSource() {
-+        return source;
-+    }
-+    // Paper end
-+
-     /**
-      * Get the amount of experience the player will receive
-      *
--- a/patches/unapplied/api/0043-Add-ProjectileCollideEvent.patch
+++ b/patches/unapplied/api/0043-Add-ProjectileCollideEvent.patch
@ -1,79 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Techcable <Techcable@outlook.com>
-Date: Fri, 16 Dec 2016 21:25:39 -0600
-Subject: [PATCH] Add ProjectileCollideEvent
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..453663893021768ae21d4980ce17ffba55d9e129
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
-@@ -0,0 +1,67 @@
-+package com.destroystokyo.paper.event.entity;
-+
-+import org.bukkit.entity.Entity;
-+import org.bukkit.entity.Projectile;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.entity.EntityEvent;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Called when an projectile collides with an entity
-+ * <p>
-+ * This event is called <b>before</b> {@link org.bukkit.event.entity.EntityDamageByEntityEvent}, and cancelling it will allow the projectile to continue flying
-+ */
-+public class ProjectileCollideEvent extends EntityEvent implements Cancellable {
-+    @NotNull private final Entity collidedWith;
-+
-+    /**
-+     * Get the entity the projectile collided with
-+     *
-+     * @return the entity collided with
-+     */
-+    @NotNull
-+    public Entity getCollidedWith() {
-+        return collidedWith;
-+    }
-+
-+    public ProjectileCollideEvent(@NotNull Projectile what, @NotNull Entity collidedWith) {
-+        super(what);
-+        this.collidedWith = collidedWith;
-+    }
-+
-+    /**
-+     * Get the projectile that collided
-+     *
-+     * @return the projectile that collided
-+     */
-+    @NotNull
-+    public Projectile getEntity() {
-+        return (Projectile) super.getEntity();
-+    }
-+
-+    private static final HandlerList handlerList = new HandlerList();
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlerList;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlerList;
-+    }
-+
-+    private boolean cancelled = false;
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        this.cancelled = cancel;
-+    }
-+}
--- a/patches/unapplied/api/0044-Add-String-based-Action-Bar-API.patch
+++ b/patches/unapplied/api/0044-Add-String-based-Action-Bar-API.patch
@ -1,86 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 20 Dec 2016 15:55:55 -0500
-Subject: [PATCH] Add String based Action Bar API
-
-
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index ab25e699ea936e2dae7cce41f850b55a381a6dcb..82e4b89bf280ad3f99d94c9aaa6075449737932a 100644
--- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3,6 +3,7 @@ package org.bukkit.entity;
- import java.net.InetSocketAddress;
- import java.util.UUID;
- import com.destroystokyo.paper.Title; // Paper
-+import net.kyori.adventure.text.Component;
- import org.bukkit.DyeColor;
- import org.bukkit.Effect;
- import org.bukkit.GameMode;
-@@ -709,6 +710,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     public void sendMap(@NotNull MapView map);
- 
-     // Paper start
-+
-+    /**
-+     * Sends an Action Bar message to the client.
-+     *
-+     * Use Section symbols for legacy color codes to send formatting.
-+     *
-+     * @param message The message to send
-+     * @deprecated use {@link #sendActionBar(Component)}
-+     */
-+    @Deprecated
-+    public void sendActionBar(@NotNull String message);
-+
-+    /**
-+     * Sends an Action Bar message to the client.
-+     *
-+     * Use supplied alternative character to the section symbol to represent legacy color codes.
-+     *
-+     * @param alternateChar Alternate symbol such as '&'
-+     * @param message The message to send
-+     * @deprecated use {@link #sendActionBar(Component)}
-+     */
-+    @Deprecated
-+    public void sendActionBar(char alternateChar, @NotNull String message);
-+
-+    /**
-+     * Sends an Action Bar message to the client.
-+     *
-+     * @param message The components to send
-+     * @deprecated use {@link #sendActionBar(Component)}
-+     */
-+    @Deprecated
-+    public void sendActionBar(@NotNull net.md_5.bungee.api.chat.BaseComponent... message);
-+
-     /**
-      * Sends the component to the player
-      *
-@@ -736,9 +770,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     /**
-      * Sends an array of components as a single message to the specified screen position of this player
-      *
-+     * @deprecated This is unlikely the API you want to use. See {@link #sendActionBar(String)} for a more proper Action Bar API. This deprecated API may send unsafe items to the client.
-      * @param position the screen position
-      * @param components the components to send
-      */
-+    @Deprecated
-     public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
-         spigot().sendMessage(position, components);
-     }
-@@ -1928,6 +1964,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-         /**
-          * Sends the component to the specified screen position of this player
-          *
-+         * @deprecated This is unlikely the API you want to use. See {@link #sendActionBar(String)} for a more proper Action Bar API. This deprecated API may send unsafe items to the client.
-          * @param position the screen position
-          * @param component the components to send
-          * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
-@@ -1940,6 +1977,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-         /**
-          * Sends an array of components as a single message to the specified screen position of this player
-          *
-+         * @deprecated This is unlikely the API you want to use. See {@link #sendActionBar(String)} for a more proper Action Bar API. This deprecated API may send unsafe items to the client.
-          * @param position the screen position
-          * @param components the components to send
-          * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
--- a/patches/unapplied/api/0045-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/patches/unapplied/api/0045-Add-API-methods-to-control-if-armour-stands-can-move.patch
@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Wed, 21 Dec 2016 11:47:25 -0600
-Subject: [PATCH] Add API methods to control if armour stands can move
-
-
-diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index dc604d6ab9dcf67fa0791539d18c2f890a814ed8..91fc11dda99de506be83d40df8929bf7cd8e8d85 100644
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
-+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
-@@ -344,4 +344,21 @@ public interface ArmorStand extends LivingEntity {
-          */
-         ADDING;
-     }
-+    // Paper start
-+    /**
-+     * Tests if this armor stand can move.
-+     *
-+     * <p>The default value is {@code true}.</p>
-+     *
-+     * @return {@code true} if this armour stand can move, {@code false} otherwise
-+     */
-+    boolean canMove();
-+
-+    /**
-+     * Sets if this armor stand can move.
-+     *
-+     * @param move {@code true} if this armour stand can move, {@code false} otherwise
-+     */
-+    void setCanMove(boolean move);
-+    // Paper end
- }
--- a/patches/unapplied/api/0046-IllegalPacketEvent.patch
+++ b/patches/unapplied/api/0046-IllegalPacketEvent.patch
@ -1,89 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 4 Dec 2016 01:19:14 -0500
-Subject: [PATCH] IllegalPacketEvent
-
-Fire an event when an illegal packet is received to let plugins handle it
-
-Lets plugins change the kick message and if it should kick or not.
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..8d8e9b16f2a6707d2af7567c7682dfc5db51a737
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
-@@ -0,0 +1,74 @@
-+package com.destroystokyo.paper.event.player;
-+
-+import org.bukkit.Bukkit;
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.player.PlayerEvent;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * @deprecated Not used
-+ */
-+@Deprecated
-+public class IllegalPacketEvent extends PlayerEvent {
-+    @Nullable private final String type;
-+    @Nullable private final String ex;
-+    @Nullable private String kickMessage;
-+    private boolean shouldKick = true;
-+
-+    public IllegalPacketEvent(@NotNull Player player, @Nullable String type, @Nullable String kickMessage, @NotNull Exception e) {
-+        super(player);
-+        this.type = type;
-+        this.kickMessage = kickMessage;
-+        this.ex = e.getMessage();
-+    }
-+
-+    public boolean isShouldKick() {
-+        return shouldKick;
-+    }
-+
-+    public void setShouldKick(boolean shouldKick) {
-+        this.shouldKick = shouldKick;
-+    }
-+
-+    @Nullable
-+    public String getKickMessage() {
-+        return kickMessage;
-+    }
-+
-+    public void setKickMessage(@Nullable String kickMessage) {
-+        this.kickMessage = kickMessage;
-+    }
-+
-+    @Nullable
-+    public String getType() {
-+        return type;
-+    }
-+
-+    @Nullable
-+    public String getExceptionMessage() {
-+        return ex;
-+    }
-+
-+    private static final HandlerList handlers = new HandlerList();
-+
-+    @NotNull
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+
-+    public static void process(@NotNull Player player, @Nullable String type, @Nullable String kickMessage, @NotNull Exception exception) {
-+        IllegalPacketEvent event = new IllegalPacketEvent(player, type, kickMessage, exception);
-+        event.callEvent();
-+        if (event.shouldKick) {
-+            player.kickPlayer(kickMessage);
-+        }
-+        Bukkit.getLogger().severe(player.getName() + "/" + type + ": " + exception.getMessage());
-+    }
-+}
--- a/patches/unapplied/api/0047-Fireworks-API-s.patch
+++ b/patches/unapplied/api/0047-Fireworks-API-s.patch
@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 28 Dec 2016 01:18:55 -0500
-Subject: [PATCH] Fireworks API's
-
-Get the Entity being boosted
-Get the firework launcher
-
-diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java
-index 05e86cb9d826cdf14490fa649348d46c51adbfdb..d616d5941b3c7b85e350e845901da798601b9a3c 100644
--- a/src/main/java/org/bukkit/entity/Firework.java
-+++ b/src/main/java/org/bukkit/entity/Firework.java
-@@ -43,4 +43,15 @@ public interface Firework extends Projectile {
-      * @param shotAtAngle the new shotAtAngle
-      */
-     void setShotAtAngle(boolean shotAtAngle);
-+
-+    // Paper start
-+    @org.jetbrains.annotations.Nullable
-+    public java.util.UUID getSpawningEntity();
-+    /**
-+     * If this firework is boosting an entity, return it
-+     * @return The entity being boosted
-+     */
-+    @org.jetbrains.annotations.Nullable
-+    public LivingEntity getBoostedEntity();
-+    // Paper end
- }
--- a/patches/unapplied/api/0048-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/unapplied/api/0048-PlayerTeleportEndGatewayEvent.patch
@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 31 Dec 2016 20:29:33 -0500
-Subject: [PATCH] PlayerTeleportEndGatewayEvent
-
-Allows you to access the Gateway being used in a teleport event
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..b64ab6eecd8bc4ca9c109b9d83c82861d6260793
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java
-@@ -0,0 +1,29 @@
-+package com.destroystokyo.paper.event.player;
-+
-+import org.bukkit.Location;
-+import org.bukkit.block.EndGateway;
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.player.PlayerTeleportEvent;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Fired when a teleport is triggered for an End Gateway
-+ */
-+public class PlayerTeleportEndGatewayEvent extends PlayerTeleportEvent {
-+    @NotNull private final EndGateway gateway;
-+
-+    public PlayerTeleportEndGatewayEvent(@NotNull Player player, @NotNull Location from, @NotNull Location to, @NotNull EndGateway gateway) {
-+        super(player, from, to, PlayerTeleportEvent.TeleportCause.END_GATEWAY);
-+        this.gateway = gateway;
-+    }
-+
-+    /**
-+     * The gateway triggering the teleport
-+     *
-+     * @return EndGateway used
-+     */
-+    @NotNull
-+    public EndGateway getGateway() {
-+        return gateway;
-+    }
-+}
--- a/patches/unapplied/api/0049-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/unapplied/api/0049-Provide-E-TE-Chunk-count-stat-methods.patch
@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 7 Jan 2017 15:23:03 -0500
-Subject: [PATCH] Provide E/TE/Chunk count stat methods
-
-Provides counts without the ineffeciency of using .getEntities().size()
-which creates copy of the collections.
-
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 49be21d2676a93c384f37c09fe84eba2ffc11781..98c74a6b4f126f2a3e65f95e55561f652c10c4b9 100644
--- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -40,6 +40,33 @@ import org.jetbrains.annotations.Nullable;
-  */
- public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient, Metadatable, net.kyori.adventure.audience.ForwardingAudience { // Paper
- 
-+    // Paper start
-+    /**
-+     * @return The amount of Entities in this world
-+     */
-+    int getEntityCount();
-+
-+    /**
-+     * @return The amount of Tile Entities in this world
-+     */
-+    int getTileEntityCount();
-+
-+    /**
-+     * @return The amount of Tickable Tile Entities in this world
-+     */
-+    int getTickableTileEntityCount();
-+
-+    /**
-+     * @return The amount of Chunks in this world
-+     */
-+    int getChunkCount();
-+
-+    /**
-+     * @return The amount of Players in this world
-+     */
-+    int getPlayerCount();
-+    // Paper end
-+
-     /**
-      * Gets the {@link Block} at the given coordinates
-      *
--- a/patches/unapplied/api/0050-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/unapplied/api/0050-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@ -1,122 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 19 Dec 2017 16:28:32 -0500
-Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
-
-Adds lots of information about why this orb exists.
-
-Replaces isFromBottle() with logic that persists entity reloads too.
-
-diff --git a/src/main/java/org/bukkit/entity/ExperienceOrb.java b/src/main/java/org/bukkit/entity/ExperienceOrb.java
-index c286edfd827e185a76e44c44faace19a80325d7a..dec70bbfaf73a9d525b2c45682b804c684e1645b 100644
--- a/src/main/java/org/bukkit/entity/ExperienceOrb.java
-+++ b/src/main/java/org/bukkit/entity/ExperienceOrb.java
-@@ -1,5 +1,8 @@
- package org.bukkit.entity;
- 
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable; // Paper
-+
- /**
-  * Represents an Experience Orb.
-  */
-@@ -18,4 +21,99 @@ public interface ExperienceOrb extends Entity {
-      * @param value Amount of experience
-      */
-     public void setExperience(int value);
-+
-+    // Paper start
-+    /**
-+     * Check if this orb was spawned from a {@link ThrownExpBottle}
-+     *
-+     * @return if orb was spawned from a bottle
-+     * @deprecated Use getSpawnReason() == EXP_BOTTLE
-+     */
-+    @Deprecated
-+    default boolean isFromBottle() {
-+        return getSpawnReason() == SpawnReason.EXP_BOTTLE;
-+    }
-+
-+    /**
-+     * Reasons for why this Experience Orb was spawned
-+     */
-+    enum SpawnReason {
-+        /**
-+         * Spawned by a player dying
-+         */
-+        PLAYER_DEATH,
-+        /**
-+         * Spawned by an entity dying after being damaged by a player
-+         */
-+        ENTITY_DEATH,
-+        /**
-+         * Spawned by player using a furnace
-+         */
-+        FURNACE,
-+        /**
-+         * Spawned by player breeding animals
-+         */
-+        BREED,
-+        /**
-+         * Spawned by player trading with a villager
-+         */
-+        VILLAGER_TRADE,
-+        /**
-+         * Spawned by player fishing
-+         */
-+        FISHING,
-+        /**
-+         * Spawned by player breaking a block that gives experience points such as Diamond Ore
-+         */
-+        BLOCK_BREAK,
-+        /**
-+         * Spawned by Bukkit API
-+         */
-+        CUSTOM,
-+        /**
-+         * Spawned by a player throwing an experience points bottle
-+         */
-+        EXP_BOTTLE,
-+        /**
-+         * Spawned by a player using a grindstone
-+         */
-+        GRINDSTONE,
-+        /**
-+         * We do not know why it was spawned
-+         */
-+        UNKNOWN
-+    }
-+
-+    /**
-+     * If this experience orb was triggered to be spawned by
-+     * an entity such as a player, due to events such as killing entity,
-+     * breaking blocks, smelting in a furnace, etc, this will return the UUID
-+     * of the entity that triggered this orb to drop.
-+     *
-+     * In the case of an entity being killed, this will be the killers UUID.
-+     *
-+     * @return UUID of the player that triggered this orb to drop, or null if unknown/no triggering entity
-+     */
-+    @Nullable java.util.UUID getTriggerEntityId();
-+
-+    /**
-+     * If this experience orb was spawned in relation to another
-+     * entity, such as a player or other living entity death, or breeding,
-+     * return the source entity UUID.
-+     *
-+     * In the case of breeding, this will be the new baby entities UUID.
-+     * In the case of an entity being killed, this will be the dead entities UUID.
-+     *
-+     * @return The UUID of the entity that sourced this experience orb
-+     */
-+    @Nullable java.util.UUID getSourceEntityId();
-+
-+    /**
-+     * Gets the reason that this experience orb was spawned. For any case that we
-+     * do not know, such as orbs spawned before this API was added, UNKNOWN is returned.
-+     * @return The reason for this orb being spawned.
-+     */
-+    @NotNull
-+    SpawnReason getSpawnReason();
-+    // Paper end
- }
--- a/patches/unapplied/api/0051-Expose-WorldBorder-isInBounds-Location-check.patch
+++ b/patches/unapplied/api/0051-Expose-WorldBorder-isInBounds-Location-check.patch
@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Sat, 21 Jan 2017 17:03:10 -0600
-Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check
-
-
-diff --git a/src/main/java/org/bukkit/WorldBorder.java b/src/main/java/org/bukkit/WorldBorder.java
-index 7e8f5649ce0eb0090899514b1e228601eb644613..afb7b136b461202026290624836446cff9f9e45d 100644
--- a/src/main/java/org/bukkit/WorldBorder.java
-+++ b/src/main/java/org/bukkit/WorldBorder.java
-@@ -117,4 +117,18 @@ public interface WorldBorder {
-      * @return if this location is inside the border or not
-      */
-     public boolean isInside(@NotNull Location location);
-+
-+    // Paper start
-+    /**
-+     * Checks if the location is within the boundaries of this border.
-+     * 
-+     * @param location specific location to check
-+     * @return true if the location is within the bounds of this border, false otherwise.
-+     * @deprecated use {@link #isInside(Location)} for an upstream compatible replacement
-+     */
-+    @Deprecated
-+    public default boolean isInBounds(@NotNull Location location) {
-+        return this.isInside(location);
-+    }
-+    // Paper end
- }
--- a/patches/unapplied/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/unapplied/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch
@ -1,60 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Fri, 9 Jun 2017 07:24:24 -0700
-Subject: [PATCH] Add configuration option to prevent player names from being
- suggested
-
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 356a270e9f831e21dc7fd947c2bec72e0840145a..282bd71697aff52d43bce0a3543a3ec50a5b7b1b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1906,6 +1906,16 @@ public final class Bukkit {
-     public static boolean reloadCommandAliases() {
-         return server.reloadCommandAliases();
-     }
-+
-+    /**
-+     * Checks if player names should be suggested when a command returns {@code null} as
-+     * their tab completion result.
-+     *
-+     * @return true if player names should be suggested
-+     */
-+    public static boolean suggestPlayerNamesWhenNullTabCompletions() {
-+        return server.suggestPlayerNamesWhenNullTabCompletions();
-+    }
-     // Paper end
- 
-     @NotNull
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c0bd764744b101856ef4fa068b5218688b156ecf..2de18d69ad80fe872b36a4975b354cb144b3a302 100644
--- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1674,4 +1674,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     void reloadPermissions(); // Paper
- 
-     boolean reloadCommandAliases(); // Paper
-+
-+    // Paper start - allow preventing player name suggestions by default
-+    /**
-+     * Checks if player names should be suggested when a command returns {@code null} as
-+     * their tab completion result.
-+     *
-+     * @return true if player names should be suggested
-+     */
-+    boolean suggestPlayerNamesWhenNullTabCompletions();
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index c4dcafac892169a7bfcc065701fffb43c6cfdf44..b1152f4dede61383232cc6713d448840612eac13 100644
--- a/src/main/java/org/bukkit/command/Command.java
-+++ b/src/main/java/org/bukkit/command/Command.java
-@@ -99,7 +99,7 @@ public abstract class Command {
-         Validate.notNull(args, "Arguments cannot be null");
-         Validate.notNull(alias, "Alias cannot be null");
- 
-        if (args.length == 0) {
-+        if (args.length == 0 || !sender.getServer().suggestPlayerNamesWhenNullTabCompletions()) { // Paper - allow preventing player name suggestions by default) {
-             return ImmutableList.of();
-         }
- 
--- a/patches/unapplied/api/0053-Fix-upstream-javadocs.patch
+++ b/patches/unapplied/api/0053-Fix-upstream-javadocs.patch
@ -1,116 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Sat, 10 Jun 2017 16:59:40 -0500
-Subject: [PATCH] Fix upstream javadocs
-
-Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 282bd71697aff52d43bce0a3543a3ec50a5b7b1b..fa3cd5395ec29d7c51c792720acbb2394f238c45 100644
--- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1163,6 +1163,8 @@ public final class Bukkit {
- 
-     /**
-      * Gets every player that has ever played on this server.
-+     * <p>
-+     * <b>This method can be expensive as it loads all the player data files from the disk.</b>
-      *
-      * @return an array containing all previous players
-      */
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2de18d69ad80fe872b36a4975b354cb144b3a302..d1e5e679e0a7482a87a9a049ed0ce5c1b9891c90 100644
--- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -980,6 +980,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
- 
-     /**
-      * Gets every player that has ever played on this server.
-+     * <p>
-+     * <b>This method can be expensive as it loads all the player data files from the disk.</b>
-      *
-      * @return an array containing all previous players
-      */
-diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index 91fc11dda99de506be83d40df8929bf7cd8e8d85..7dc631ebd009f5f5c3ac1699c3f3515c47609c05 100644
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
-+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
-@@ -360,5 +360,8 @@ public interface ArmorStand extends LivingEntity {
-      * @param move {@code true} if this armour stand can move, {@code false} otherwise
-      */
-     void setCanMove(boolean move);
-+
-+    @Override
-+    org.bukkit.inventory.@NotNull EntityEquipment getEquipment();
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index db4ba67618d29f72d695c66c27d771795565a1d0..0ab94ddd3b88eee8040233a89823bd2fadc78d55 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
-+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -21,6 +21,11 @@ import org.jetbrains.annotations.Nullable;
-  */
- public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder {
- 
-+    // Paper start
-+    @Override
-+    org.bukkit.inventory.@NotNull EntityEquipment getEquipment();
-+    // Paper end
-+
-     /**
-      * Returns the name of this player
-      *
-diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
-index be9334a8b5fba9181ad63c211697e798be63da25..0514a141cb93a650be38c63d4336d46e4304f4b6 100644
--- a/src/main/java/org/bukkit/entity/Mob.java
-+++ b/src/main/java/org/bukkit/entity/Mob.java
-@@ -8,6 +8,10 @@ import org.jetbrains.annotations.Nullable;
-  */
- public interface Mob extends LivingEntity, Lootable {
- 
-+    // Paper start
-+    @Override
-+    org.bukkit.inventory.@org.jetbrains.annotations.NotNull EntityEquipment getEquipment();
-+    // Paper end
-     /**
-      * Instructs this Mob to set the specified LivingEntity as its target.
-      * <p>
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 82e4b89bf280ad3f99d94c9aaa6075449737932a..4771a1537646217ad0836f7d5ed62940339b44c6 100644
--- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -727,7 +727,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      *
-      * Use supplied alternative character to the section symbol to represent legacy color codes.
-      *
-     * @param alternateChar Alternate symbol such as '&'
-+     * @param alternateChar Alternate symbol such as '&amp;'
-      * @param message The message to send
-      * @deprecated use {@link #sendActionBar(Component)}
-      */
-diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
-index 1b2267f4e8ebded198773ec80e2bff2c861c7084..1a58734d919fae247eeb85dd785fd59990856505 100644
--- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
-@@ -78,7 +78,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
-      *
-      * @return Location the player moved to
-      */
-    @Nullable
-+    @NotNull // Paper
-     public Location getTo() {
-         return to;
-     }
-diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-index 99d900b2394b6c210ccf845768dae72864f32270..515587a958041e94f03c48ae87812abc39e1791c 100644
--- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
-+++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-@@ -106,7 +106,7 @@ public interface PlayerInventory extends Inventory {
-      *
-      * @return the ItemStack in the given slot
-      */
-    @NotNull
-+    @Nullable
-     public ItemStack getItem(@NotNull EquipmentSlot slot);
- 
-     /**
--- a/patches/unapplied/api/0054-Item-canEntityPickup.patch
+++ b/patches/unapplied/api/0054-Item-canEntityPickup.patch
@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 5 May 2017 03:57:08 -0500
-Subject: [PATCH] Item#canEntityPickup
-
-
-diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index 3f2736fbddd8661e764bc2f8d0499bd13ca91df5..c404a5b8efea7c780db5ddae19456753808abb3d 100644
--- a/src/main/java/org/bukkit/entity/Item.java
-+++ b/src/main/java/org/bukkit/entity/Item.java
-@@ -75,4 +75,20 @@ public interface Item extends Entity {
-      */
-     @Nullable
-     public UUID getThrower();
-+
-+    // Paper Start
-+    /**
-+     * Gets if non-player entities can pick this Item up
-+     *
-+     * @return True if non-player entities can pickup
-+     */
-+     public boolean canMobPickup();
-+
-+    /**
-+     * Sets if non-player entities can pick this Item up
-+     *
-+     * @param canMobPickup True to allow non-player entity pickup
-+     */
-+    public void setCanMobPickup(boolean canMobPickup);
-+    // Paper end
- }