Update Upstream

2019-05-05 19:58:04 -07:00
parent 52cd8744e0
commit f9f71eb14e
321 changed files with 809 additions and 856 deletions
--- a/Spigot-API-Patches/Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-API-Patches/Ability-to-apply-mending-to-XP-API.patch
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.

 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 247ed072..c7bc13e7 100644
+index b90e211a..df1d3c78 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/Access-items-by-EquipmentSlot.patch
+++ b/Spigot-API-Patches/Access-items-by-EquipmentSlot.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Access items by EquipmentSlot


 diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-index ef55b146..eb71f01e 100644
+index 88ce9dc6..96916ec9 100644
 --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
 +++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
@@ -0,0 +0,0 @@ public interface PlayerInventory extends Inventory {
- 
+     @Override
     @Nullable
     public HumanEntity getHolder();
 +
--- a/Spigot-API-Patches/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-API-Patches/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.

 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index aed01189..f6782e0d 100644
+index 222a9a7b..3ab914fb 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
@@ -0,0 +0,0 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
--- a/Spigot-API-Patches/Add-Ban-Methods-to-Player-Objects.patch
+++ b/Spigot-API-Patches/Add-Ban-Methods-to-Player-Objects.patch
@@ -8,7 +8,7 @@ Allows a more logical API for banning players.
 player.banPlayer("Breaking the rules");

 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 11eedda6..aed01189 100644
+index ffc8ad37..222a9a7b 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
@@ -0,0 +0,0 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -74,7 +74,7 @@ index 11eedda6..aed01189 100644
     /**
      * Checks if this player is whitelisted or not
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 06154a5c..a840b49d 100644
+index 8f87b165..214fe2d9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-EntityZapEvent.patch
+++ b/Spigot-API-Patches/Add-EntityZapEvent.patch
@@ -76,7 +76,7 @@ index 00000000..3b725a48
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-index 0074423f..0eaa8df9 100644
+index 0e0ed93b..d3949edf 100644
 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
@@ -0,0 +0,0 @@ package org.bukkit.event.entity;
--- a/Spigot-API-Patches/Add-Heightmap-API.patch
+++ b/Spigot-API-Patches/Add-Heightmap-API.patch
@@ -46,7 +46,7 @@ index 00000000..4cd9b5ed
 +    SOLID_OR_LIQUID_NO_LEAVES;
 +}
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index c12d2a26..1eef404e 100644
+index 2a40da99..3e1ca4c9 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
@@ -0,0 +0,0 @@ public class Location implements Cloneable, ConfigurationSerializable {
@@ -84,7 +84,7 @@ index c12d2a26..1eef404e 100644
      * Creates explosion at this location with given power
      *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 696cd649..5469ee4f 100644
+index 951eba31..2da92d39 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/Spigot-API-Patches/Add-ItemStack-Recipe-API-helper-methods.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add ItemStack Recipe API helper methods
 Allows using ExactChoice Recipes with easier methodss

 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index 038ed0a6..2181f09b 100644
+index d742c405..222a12ba 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
@@ -0,0 +0,0 @@ public class ShapedRecipe implements Recipe, Keyed {
@@ -24,7 +24,7 @@ index 038ed0a6..2181f09b 100644
      * Get a copy of the ingredients map.
      *
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 823645c5..062924ea 100644
+index 84062dd7..ddcf84e6 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
@@ -0,0 +0,0 @@ public class ShapelessRecipe implements Recipe, Keyed {
--- a/Spigot-API-Patches/Add-Material-Tags.patch
+++ b/Spigot-API-Patches/Add-Material-Tags.patch
@@ -614,7 +614,7 @@ index 00000000..328c5147
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java
-index 596384b1..763befad 100644
+index 61993528..5f9d3482 100644
 --- a/src/test/java/org/bukkit/TestServer.java
 +++ b/src/test/java/org/bukkit/TestServer.java
@@ -0,0 +0,0 @@ public final class TestServer implements InvocationHandler {
--- a/Spigot-API-Patches/Add-String-based-Action-Bar-API.patch
+++ b/Spigot-API-Patches/Add-String-based-Action-Bar-API.patch
@@ -5,7 +5,7 @@ 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 c237073a..219556ed 100644
+index eb2e392d..27ecae8b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/Add-World.getEntity-UUID-API.patch
+++ b/Spigot-API-Patches/Add-World.getEntity-UUID-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add World.getEntity(UUID) API


 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 9579437b..8d23ad74 100644
+index eb5860b2..3f934c80 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/Spigot-API-Patches/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -226,10 +226,10 @@ index f5e3929a..8648e8fb 100644
         return key;
     }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index f6a7f97b..d040a740 100644
+index d0e4c8ee..d0221b29 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -0,0 +0,0 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
+@@ -0,0 +0,0 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
     @NotNull
     Spigot spigot();
     // Spigot end
--- a/Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch
+++ b/Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch
@@ -42,7 +42,7 @@ index d4e74d29..6cfd9f3c 100644
 
         StringBuilder pluginList = new StringBuilder();
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index ca29394d..ed7455c3 100644
+index bc7bf6a3..31a70b29 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
--- a/Spigot-API-Patches/Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -85,7 +85,7 @@ index 50cc311b..c62da413 100644
     }
 }
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index ef38b2af..e4a0f938 100644
+index aa0c809a..4cbec1f1 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
--- a/Spigot-API-Patches/Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-API-Patches/Add-configuration-option-to-prevent-player-names-fro.patch
@@ -46,7 +46,7 @@ index f248400e..2778ce92 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
-index 30597d30..6206ff44 100644
+index 7f153000..1e126487 100644
 --- a/src/main/java/org/bukkit/command/PluginCommand.java
 +++ b/src/main/java/org/bukkit/command/PluginCommand.java
@@ -0,0 +0,0 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
--- a/Spigot-API-Patches/Add-exception-reporting-event.patch
+++ b/Spigot-API-Patches/Add-exception-reporting-event.patch
@@ -462,7 +462,7 @@ index 00000000..5582999f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 9d0ae63f..911d90fd 100644
+index f020cb04..adfc7aae 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -0,0 +0,0 @@ import java.util.HashMap;
@@ -504,7 +504,7 @@ index 9d0ae63f..911d90fd 100644
     }
 
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 47327376..ef38b2af 100644
+index 78a2d2f8..aa0c809a 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -0,0 +0,0 @@ import java.util.WeakHashMap;
@@ -579,9 +579,9 @@ index 47327376..ef38b2af 100644
 +    }
 +    // Paper end
 +
+     @Override
     public void clearPlugins() {
         synchronized (this) {
-             disablePlugins();
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
                             ));
                 }
--- a/Spigot-API-Patches/Add-getI18NDisplayName-API.patch
+++ b/Spigot-API-Patches/Add-getI18NDisplayName-API.patch
@@ -29,7 +29,7 @@ index 8e602cf5..dca77bba 100644
     // Paper end
 }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 4ee01be5..3ff3458e 100644
+index 44f3bec7..9526cfe0 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
--- a/Spigot-API-Patches/Add-getNearbyXXX-methods-to-Location.patch
+++ b/Spigot-API-Patches/Add-getNearbyXXX-methods-to-Location.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add "getNearbyXXX" methods to Location


 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 34e90167..f3ae58ee 100644
+index 4f695faf..5730d5f4 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
@@ -0,0 +0,0 @@ import org.bukkit.util.Vector;
@@ -41,6 +41,7 @@ index 34e90167..f3ae58ee 100644
 +     */
 +    @NotNull
 +    public Collection<Entity> getNearbyEntities(double x, double y, double z) {
+        World world = this.getWorld();
 +        if (world == null) {
 +            throw new IllegalArgumentException("Location has no world");
 +        }
@@ -263,6 +264,7 @@ index 34e90167..f3ae58ee 100644
 +     */
 +    @NotNull
 +    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends Entity> clazz, double xRadius, double yRadius, double zRadius, @Nullable Predicate<T> predicate) {
+        World world = this.getWorld();
 +        if (world == null) {
 +            throw new IllegalArgumentException("Location has no world");
 +        }
--- a/Spigot-API-Patches/Add-hand-to-bucket-events.patch
+++ b/Spigot-API-Patches/Add-hand-to-bucket-events.patch
@@ -30,7 +30,7 @@ index cdf2e201..5e93f1bb 100644
     @Override
     public HandlerList getHandlers() {
 diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
-index d0ccba06..280ca87b 100644
+index d2990a20..dfc76add 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
@@ -0,0 +0,0 @@ import org.bukkit.block.Block;
@@ -79,9 +79,9 @@ index d0ccba06..280ca87b 100644
 +    }
 +    // Paper end
 +
+     @Override
     public boolean isCancelled() {
         return cancelled;
-     }
 diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
 index cc1b03eb..15be7128 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
--- a/Spigot-API-Patches/Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-API-Patches/Add-method-to-open-already-placed-sign.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to open already placed sign


 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 037e2393..04f0e08f 100644
+index 5b5fb303..cdbac95b 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -0,0 +0,0 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
--- a/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add methods for working with arrows stuck in living entities


 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 5427c99a..ab666fb9 100644
+index 2dbb81c1..a62f10e2 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
--- a/Spigot-API-Patches/Add-player-view-distance-API.patch
+++ b/Spigot-API-Patches/Add-player-view-distance-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add player view distance API


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index ca0dda5a..801c7f01 100644
+index 329e2b01..145c78c2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-API-Patches/Add-setPlayerProfile-API-for-Skulls.patch
@@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo
 which commonly cause rate limit issues with Mojang API

 diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java
-index 6325f583..27675ecd 100644
+index 943d751f..a6914f01 100644
 --- a/src/main/java/org/bukkit/block/Skull.java
 +++ b/src/main/java/org/bukkit/block/Skull.java
@@ -0,0 +0,0 @@ import org.bukkit.block.data.BlockData;
@@ -18,7 +18,7 @@ index 6325f583..27675ecd 100644
 
 /**
  * Represents a captured state of a skull block.
-@@ -0,0 +0,0 @@ public interface Skull extends BlockState {
+@@ -0,0 +0,0 @@ public interface Skull extends TileState {
      */
     public void setOwningPlayer(@NotNull OfflinePlayer player);
 
@@ -40,7 +40,7 @@ index 6325f583..27675ecd 100644
      * Gets the rotation of the skull in the world (or facing direction if this
      * is a wall mounted skull).
 diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
-index 1583764b..43cdc4c6 100644
+index 35a39203..8b2465ea 100644
 --- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-sun-related-API.patch
+++ b/Spigot-API-Patches/Add-sun-related-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API


 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index dd51aa31..696cd649 100644
+index 150c5af2..951eba31 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/Additional-world.getNearbyEntities-API-s.patch
+++ b/Spigot-API-Patches/Additional-world.getNearbyEntities-API-s.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
 Provides more methods to get nearby entities, and filter by types and predicates

 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index ac12a8fb..14f97491 100644
+index d8d42c84..bcf5f8aa 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/Spigot-API-Patches/Allow-Blocks-to-be-accessed-via-a-long-key.patch
@@ -18,7 +18,7 @@ Y range: [0, 1023]
 X, Z range: [-67 108 864, 67 108 863]

 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 8e444f7f..e546407e 100644
+index 884862ab..6dc39989 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
@@ -48,7 +48,7 @@ index 8e444f7f..e546407e 100644
      * @return A new location where X/Y/Z are the center of the block
      */
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 99527eb5..446d91c5 100644
+index a06d7a0d..4d35efb0 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-API-Patches/Allow-Reloading-of-Command-Aliases.patch
@@ -56,7 +56,7 @@ index bd2c7a69..864c263b 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 911d90fd..8d352eeb 100644
+index adfc7aae..460fda05 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -0,0 +0,0 @@ public class SimpleCommandMap implements CommandMap {
--- a/Spigot-API-Patches/Arrow-pickup-rule-API.patch
+++ b/Spigot-API-Patches/Arrow-pickup-rule-API.patch
@@ -4,14 +4,14 @@ Date: Fri, 4 Mar 2016 03:13:18 -0500
 Subject: [PATCH] Arrow pickup rule API


-diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
-index 99f73a2b..b63f2fd9 100644
--- a/src/main/java/org/bukkit/entity/Arrow.java
-+++ b/src/main/java/org/bukkit/entity/Arrow.java
-@@ -0,0 +0,0 @@ public interface Arrow extends Projectile {
-     @Override
-     Spigot spigot();
-     // Spigot end
+diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
+index 4460f6c9..a1990fef 100644
+--- a/src/main/java/org/bukkit/entity/AbstractArrow.java
+++ b/src/main/java/org/bukkit/entity/AbstractArrow.java
+@@ -0,0 +0,0 @@ public interface AbstractArrow extends Projectile {
+          */
+         CREATIVE_ONLY
+     }
 +
 +    // Paper start
 +    /**
--- a/Spigot-API-Patches/Async-Chunks-API.patch
+++ b/Spigot-API-Patches/Async-Chunks-API.patch
@@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.

 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7e245356..99527eb5 100644
+index dd0ab741..a06d7a0d 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -371,10 +371,10 @@ index 7e245356..99527eb5 100644
 
     /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 5098eade..b0ba2d97 100644
+index 2d3cee14..f41243f9 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      */
     public boolean teleport(@NotNull Entity destination, @NotNull TeleportCause cause);
 
--- a/Spigot-API-Patches/Automatically-disable-plugins-that-fail-to-load.patch
+++ b/Spigot-API-Patches/Automatically-disable-plugins-that-fail-to-load.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Automatically disable plugins that fail to load


 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 2618906f..85139364 100644
+index 82e379d1..12601db6 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
--- a/Spigot-API-Patches/Change-the-reserved-channel-check-to-be-sensible.patch
+++ b/Spigot-API-Patches/Change-the-reserved-channel-check-to-be-sensible.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Change the reserved channel check to be sensible


 diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
-index 8227b375..cc750eb3 100644
+index 1d061412..6fda7f3a 100644
 --- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
 +++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
@@ -0,0 +0,0 @@ public class StandardMessenger implements Messenger {
@@ -16,9 +16,9 @@ index 8227b375..cc750eb3 100644
 +        return channel.equals("minecraft:register") || channel.equals("minecraft:unregister"); // Paper
     }
 
-     public void registerOutgoingPluginChannel(@NotNull Plugin plugin, @NotNull String channel) {
+     @Override
 diff --git a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
-index c15fa003..31ff2f61 100644
+index dce3d619..7e2335ed 100644
 --- a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
 +++ b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
@@ -0,0 +0,0 @@ public class StandardMessengerTest {
--- a/Spigot-API-Patches/Close-Plugin-Class-Loaders-on-Disable.patch
+++ b/Spigot-API-Patches/Close-Plugin-Class-Loaders-on-Disable.patch
@@ -53,14 +53,12 @@ index 41e26451..86cc5025 100644
      * Gets a {@link Permission} from its fully qualified name
      *
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index e4a0f938..269bb5ca 100644
+index 4cbec1f1..da3cd63b 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
-         }
-     }
 
-+    // Paper start - close Classloader on disable
+     @Override
     public void disablePlugins() {
 +        disablePlugins(false);
 +    }
@@ -74,11 +72,12 @@ index e4a0f938..269bb5ca 100644
         }
     }
 
-+    // Paper start - close Classloader on disable
+     @Override
     public void disablePlugin(@NotNull final Plugin plugin) {
 +        disablePlugin(plugin, false);
 +    }
 +
+    @Override
 +    public void disablePlugin(@NotNull final Plugin plugin, boolean closeClassloader) {
 +        // Paper end - close Classloader on disable
         if (plugin.isEnabled()) {
@@ -89,7 +88,7 @@ index e4a0f938..269bb5ca 100644
                 handlePluginException("Error occurred (in the plugin loader) while disabling "
                         + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
- 
+     @Override
     public void clearPlugins() {
         synchronized (this) {
 -            disablePlugins();
@@ -98,7 +97,7 @@ index e4a0f938..269bb5ca 100644
             lookupNames.clear();
             HandlerList.unregisterAll();
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 024d8393..ca29394d 100644
+index 06b6724f..bc7bf6a3 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -111,8 +110,8 @@ index 024d8393..ca29394d 100644
                 // Paper end
             }
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
-     }
 
+     @Override
     public void disablePlugin(@NotNull Plugin plugin) {
 +    // Paper start - close Classloader on disable
 +        disablePlugin(plugin, false); // Retain old behavior unless requested
--- a/Spigot-API-Patches/Complete-resource-pack-API.patch
+++ b/Spigot-API-Patches/Complete-resource-pack-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Complete resource pack API


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1de43bd3..c237073a 100644
+index abe00d72..eb2e392d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/Custom-replacement-for-eaten-items.patch
+++ b/Spigot-API-Patches/Custom-replacement-for-eaten-items.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom replacement for eaten items


 diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
-index ee0f95b1..864c0a9e 100644
+index c2793f3e..373f4b5b 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
@@ -0,0 +0,0 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
@@ -43,7 +43,7 @@ index ee0f95b1..864c0a9e 100644
 +    }
 +    // Paper end
 +
+     @Override
     public boolean isCancelled() {
         return this.isCancelled;
-     }
 --
--- a/Spigot-API-Patches/Display-warning-on-deprecated-recipe-API.patch
+++ b/Spigot-API-Patches/Display-warning-on-deprecated-recipe-API.patch
@@ -10,24 +10,24 @@ on the players login.
 Plugin authors need to define a key to keep it consistent between server restarts.

 diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index 83c72eda..038ed0a6 100644
+index d74b3114..d742c405 100644
 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
@@ -0,0 +0,0 @@ public class ShapedRecipe implements Recipe, Keyed {
-     @Deprecated
     public ShapedRecipe(@NotNull ItemStack result) {
+         Preconditions.checkArgument(result.getType() != Material.AIR, "Recipe must have non-AIR result.");
         this.key = NamespacedKey.randomKey();
 +        new Throwable("Warning: A plugin is creating a recipe using a Deprecated method. This will cause you to receive warnings stating 'Tried to load unrecognized recipe: bukkit:<ID>'. Please ask the author to give their recipe a static key using NamespacedKey.").printStackTrace();
         this.output = new ItemStack(result);
     }
 
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index ef28e75d..823645c5 100644
+index 68447fb8..84062dd7 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
@@ -0,0 +0,0 @@ public class ShapelessRecipe implements Recipe, Keyed {
-     @Deprecated
     public ShapelessRecipe(@NotNull ItemStack result) {
+         Preconditions.checkArgument(result.getType() != Material.AIR, "Recipe must have non-AIR result.");
         this.key = NamespacedKey.randomKey();
 +        new Throwable("Warning: A plugin is creating a recipe using a Deprecated method. This will cause you to receive warnings stating 'Tried to load unrecognized recipe: bukkit:<ID>'. Please ask the author to give their recipe a static key using NamespacedKey.").printStackTrace();
         this.output = new ItemStack(result);
--- a/Spigot-API-Patches/Entity-Origin-API.patch
+++ b/Spigot-API-Patches/Entity-Origin-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity Origin API


 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index f948f1fc..fa7ab5af 100644
+index 699c31d9..c8439d64 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
     @Override
     Spigot spigot();
     // Spigot end
--- a/Spigot-API-Patches/Entity-fromMobSpawner.patch
+++ b/Spigot-API-Patches/Entity-fromMobSpawner.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity#fromMobSpawner()


 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index fa7ab5af..a1edcf02 100644
+index c8439d64..35d0909b 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      */
     @Nullable
     Location getOrigin();
--- a/Spigot-API-Patches/Entity-getChunk-API.patch
+++ b/Spigot-API-Patches/Entity-getChunk-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
 Get the chunk the entity is currently registered to

 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index a1edcf02..9391bbf0 100644
+index 35d0909b..adca48f1 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -0,0 +0,0 @@ package org.bukkit.entity;
@@ -17,7 +17,7 @@ index a1edcf02..9391bbf0 100644
 import org.bukkit.EntityEffect;
 import org.bukkit.Location;
 import org.bukkit.Nameable;
-@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      * @return True if entity spawned from a mob spawner
      */
     boolean fromMobSpawner();
--- a/Spigot-API-Patches/Entity-getEntitySpawnReason.patch
+++ b/Spigot-API-Patches/Entity-getEntitySpawnReason.patch
@@ -10,10 +10,10 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.

 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index b0ba2d97..61aa4999 100644
+index f41243f9..29229c64 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      */
     @NotNull
     Chunk getChunk();
--- a/Spigot-API-Patches/Expand-Explosions-API.patch
+++ b/Spigot-API-Patches/Expand-Explosions-API.patch
@@ -6,7 +6,7 @@ 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/Location.java b/src/main/java/org/bukkit/Location.java
-index f3ae58ee..b5a6ac16 100644
+index 5730d5f4..b226d7e4 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
@@ -0,0 +0,0 @@ import java.util.HashMap;
@@ -30,7 +30,7 @@ index f3ae58ee..b5a6ac16 100644
 +     * @return false if explosion was canceled, otherwise true
 +     */
 +    public boolean createExplosion(float power) {
-+        return world.createExplosion(this, power);
+        return this.getWorld().createExplosion(this, power);
 +    }
 +
 +    /**
@@ -44,7 +44,7 @@ index f3ae58ee..b5a6ac16 100644
 +     * @return false if explosion was canceled, otherwise true
 +     */
 +    public boolean createExplosion(float power, boolean setFire) {
-+        return world.createExplosion(this, power, setFire);
+        return this.getWorld().createExplosion(this, power, setFire);
 +    }
 +
 +    /**
@@ -57,7 +57,7 @@ index f3ae58ee..b5a6ac16 100644
 +     * @return false if explosion was canceled, otherwise true
 +     */
 +    public boolean createExplosion(float power, boolean setFire, boolean breakBlocks) {
-+        return world.createExplosion(this, power, setFire, breakBlocks);
+        return this.getWorld().createExplosion(this, power, setFire, breakBlocks);
 +    }
 +
 +    /**
@@ -70,7 +70,7 @@ index f3ae58ee..b5a6ac16 100644
 +     * @return false if explosion was canceled, otherwise true
 +     */
 +    public boolean createExplosion(@Nullable Entity source, float power) {
-+        return world.createExplosion(source, this, power, true, true);
+        return this.getWorld().createExplosion(source, this, power, true, true);
 +    }
 +
 +    /**
@@ -85,7 +85,7 @@ index f3ae58ee..b5a6ac16 100644
 +     * @return false if explosion was canceled, otherwise true
 +     */
 +    public boolean createExplosion(@Nullable Entity source, float power, boolean setFire) {
-+        return world.createExplosion(source, this, power, setFire, true);
+        return this.getWorld().createExplosion(source, this, power, setFire, true);
 +    }
 +
 +    /**
@@ -99,14 +99,14 @@ index f3ae58ee..b5a6ac16 100644
 +     * @return false if explosion was canceled, otherwise true
 +     */
 +    public boolean createExplosion(@NotNull Entity source, float power, boolean setFire, boolean breakBlocks) {
-+        return world.createExplosion(source, source.getLocation(), power, setFire, breakBlocks);
+        return this.getWorld().createExplosion(source, source.getLocation(), power, setFire, breakBlocks);
 +    }
 +
     /**
      * Returns a list of entities within a bounding box centered around a Location.
      *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index a709ac47..9579437b 100644
+index 28afb932..eb5860b2 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/Expand-Location-Manipulation-API.patch
+++ b/Spigot-API-Patches/Expand-Location-Manipulation-API.patch
@@ -6,11 +6,11 @@ Subject: [PATCH] Expand Location Manipulation API
 Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z);

 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index b5a6ac16..8e444f7f 100644
+index b226d7e4..884862ab 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
@@ -0,0 +0,0 @@ public class Location implements Cloneable, ConfigurationSerializable {
-     public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
+     public boolean isChunkLoaded() { return this.getWorld().isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
 
     // Paper start
 +
--- a/Spigot-API-Patches/Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-API-Patches/Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -515,7 +515,7 @@ index 68cb7442..69aae30a 100644
      * Options which can be applied to redstone dust particles - a particle
      * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 14f97491..a709ac47 100644
+index bcf5f8aa..28afb932 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-API-Patches/Expose-attack-cooldown-methods-for-Player.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a840b49d..1b3a6a91 100644
+index 214fe2d9..024528ba 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch
@@ -21,7 +21,7 @@ index ffebffd8..f5e3929a 100644
      */
     @Deprecated
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 0e6dd6e1..ac12a8fb 100644
+index 80608e7a..d8d42c84 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -140,7 +140,7 @@ index 734f5ac7..5efa4e60 100644
      */
     @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 219556ed..c21785d5 100644
+index 27ecae8b..c30f9791 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -287,7 +287,7 @@ index 1ca8de5e..0dba5d01 100644
     public PlayerLoginEvent(@NotNull final Player player, @NotNull String hostname, @NotNull final InetAddress address, @NotNull final Result result, @NotNull final String message, @NotNull final InetAddress realAddress) { // Spigot
         this(player, hostname, address, realAddress); // Spigot
 diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
-index 8b901845..374fe364 100644
+index 1b2267f4..1a58734d 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
@@ -0,0 +0,0 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
--- a/Spigot-API-Patches/Flip-some-Spigot-API-null-annotations.patch
+++ b/Spigot-API-Patches/Flip-some-Spigot-API-null-annotations.patch
@@ -31,7 +31,7 @@ index 3b883b93..9f56e7f8 100644
         return server.getTag(registry, tag, clazz);
     }
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 7713f183..c12d2a26 100644
+index 4e69f277..2a40da99 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
@@ -0,0 +0,0 @@ public class Location implements Cloneable, ConfigurationSerializable {
@@ -48,19 +48,19 @@ index 7713f183..c12d2a26 100644
      * @param pitch The absolute rotation on the y-plane, in degrees
      */
 -    public Location(@Nullable final World world, final double x, final double y, final double z, final float yaw, final float pitch) {
-+    public Location(@UndefinedNullability final World world, final double x, final double y, final double z, final float yaw, final float pitch) { // Paper
-         this.world = world;
-         this.x = x;
-         this.y = y;
+    public Location(@UndefinedNullability final World world, final double x, final double y, final double z, final float yaw, final float pitch) {
+         if (world != null) {
+             this.world = new WeakReference<>(world);
+         }
@@ -0,0 +0,0 @@ public class Location implements Cloneable, ConfigurationSerializable {
-      *
-      * @return World that contains this location
+      * @throws IllegalArgumentException when world is unloaded
+      * @see #isWorldLoaded()
      */
 -    @Nullable
 +    @UndefinedNullability
     public World getWorld() {
-         return world;
-     }
+         if (this.world == null) {
+             return null;
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
 index 63a661bd..2f2be03f 100644
 --- a/src/main/java/org/bukkit/Server.java
@@ -105,7 +105,7 @@ index dca77bba..56734f8e 100644
 
     /**
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 76da06d1..4f72cd7c 100644
+index 6d18de76..495161f6 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -0,0 +0,0 @@ import java.util.Set; // Paper
--- a/Spigot-API-Patches/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-API-Patches/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -68,7 +68,7 @@ index c5435c42..246e081b 100644
      * Gets the name of the update folder. The update folder is used to safely
      * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 801c7f01..fd88fd65 100644
+index 145c78c2..bc4ec3f2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/ItemStack-API-additions-for-quantity-flags-lore.patch
+++ b/Spigot-API-Patches/ItemStack-API-additions-for-quantity-flags-lore.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack API additions for quantity/flags/lore


 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 7a4ace35..72e268c1 100644
+index f129121e..690abbba 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -0,0 +0,0 @@ package org.bukkit.inventory;
--- a/Spigot-API-Patches/ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-API-Patches/ItemStack-getMaxItemUseDuration.patch
@@ -6,7 +6,7 @@ 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/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 3ff3458e..345dc8bd 100644
+index 9526cfe0..f129121e 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
--- a/Spigot-API-Patches/LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-API-Patches/LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -6,7 +6,7 @@ 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/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 01c49322..95567daa 100644
+index bf5d3096..7322bf6d 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -0,0 +0,0 @@ import org.bukkit.World;
--- a/Spigot-API-Patches/Location.isChunkLoaded-API.patch
+++ b/Spigot-API-Patches/Location.isChunkLoaded-API.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Location.isChunkLoaded() API


 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 39e57fe1..5c6e25c8 100644
+index 44e3bca6..6021e672 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
@@ -0,0 +0,0 @@ public class Location implements Cloneable, ConfigurationSerializable {
         return this;
     }
 
-+    public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
+    public boolean isChunkLoaded() { return this.getWorld().isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
     @Override
     public boolean equals(Object obj) {
         if (obj == null) {
--- a/Spigot-API-Patches/Location.toBlockLocation-toCenterLocation.patch
+++ b/Spigot-API-Patches/Location.toBlockLocation-toCenterLocation.patch
@@ -6,13 +6,13 @@ Subject: [PATCH] Location.toBlockLocation/toCenterLocation()
 Convert location objects to their block coordinates, or the center of the block

 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 5c6e25c8..34e90167 100644
+index 6021e672..4f695faf 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
@@ -0,0 +0,0 @@ public class Location implements Cloneable, ConfigurationSerializable {
     }
 
-     public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
+     public boolean isChunkLoaded() { return this.getWorld().isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
 +
 +    // Paper start
 +    /**
--- a/Spigot-API-Patches/Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-API-Patches/Make-shield-blocking-delay-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make shield blocking delay configurable


 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 49c79028..01c49322 100644
+index 5ca11bb9..bf5d3096 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
--- a/Spigot-API-Patches/Mob-Spawner-API-Enhancements.patch
+++ b/Spigot-API-Patches/Mob-Spawner-API-Enhancements.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Mob Spawner API Enhancements


 diff --git a/src/main/java/org/bukkit/block/CreatureSpawner.java b/src/main/java/org/bukkit/block/CreatureSpawner.java
-index 5773e99e..31c5a006 100644
+index e73fb0ef..2ff0f24d 100644
 --- a/src/main/java/org/bukkit/block/CreatureSpawner.java
 +++ b/src/main/java/org/bukkit/block/CreatureSpawner.java
-@@ -0,0 +0,0 @@ public interface CreatureSpawner extends BlockState {
+@@ -0,0 +0,0 @@ public interface CreatureSpawner extends TileState {
      * @param spawnRange the new spawn range
      */
     public void setSpawnRange(int spawnRange);
--- a/Spigot-API-Patches/POM-changes.patch
+++ b/Spigot-API-Patches/POM-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] POM changes


 diff --git a/pom.xml b/pom.xml
-index 75681af7..ec6e4d14 100644
+index 0bc8d481..be4e1ca5 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -0,0 +0,0 @@
@@ -33,12 +33,10 @@ index 75681af7..ec6e4d14 100644
 
     <properties>
 -        <skipTests>true</skipTests>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
 +        <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
 +        <!-- Paper - #Logic -->
-+        <maven.compiler.source>1.8</maven.compiler.source>
-+        <maven.compiler.target>1.8</maven.compiler.target>
+         <maven.compiler.source>1.8</maven.compiler.source>
+         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
--- a/Spigot-API-Patches/Performance-Concurrency-Improvements-to-Permissions.patch
+++ b/Spigot-API-Patches/Performance-Concurrency-Improvements-to-Permissions.patch
@@ -18,7 +18,7 @@ Optimized it to simply be a single get call cutting permission map
 lookups in half.

 diff --git a/src/main/java/org/bukkit/permissions/PermissibleBase.java b/src/main/java/org/bukkit/permissions/PermissibleBase.java
-index 27c14c0f..72fff64e 100644
+index 497775f7..c94e4cdb 100644
 --- a/src/main/java/org/bukkit/permissions/PermissibleBase.java
 +++ b/src/main/java/org/bukkit/permissions/PermissibleBase.java
@@ -0,0 +0,0 @@ public class PermissibleBase implements Permissible {
@@ -50,6 +50,7 @@ index 27c14c0f..72fff64e 100644
         return perm.getDefault().getValue(isOp());
     }
 
+     @Override
     @NotNull
 -    public PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value) {
 +    public synchronized PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value) { // Paper - synchronized
@@ -57,8 +58,8 @@ index 27c14c0f..72fff64e 100644
             throw new IllegalArgumentException("Permission name cannot be null");
         } else if (plugin == null) {
@@ -0,0 +0,0 @@ public class PermissibleBase implements Permissible {
-     }
 
+     @Override
     @NotNull
 -    public PermissionAttachment addAttachment(@NotNull Plugin plugin) {
 +    public synchronized PermissionAttachment addAttachment(@NotNull Plugin plugin) { // Paper - synchronized
@@ -66,26 +67,26 @@ index 27c14c0f..72fff64e 100644
             throw new IllegalArgumentException("Plugin cannot be null");
         } else if (!plugin.isEnabled()) {
@@ -0,0 +0,0 @@ public class PermissibleBase implements Permissible {
-         return result;
     }
 
+     @Override
 -    public void removeAttachment(@NotNull PermissionAttachment attachment) {
 +    public synchronized void removeAttachment(@NotNull PermissionAttachment attachment) { // Paper - synchronized
         if (attachment == null) {
             throw new IllegalArgumentException("Attachment cannot be null");
         }
@@ -0,0 +0,0 @@ public class PermissibleBase implements Permissible {
-         }
     }
 
+     @Override
 -    public void recalculatePermissions() {
 +    public synchronized void recalculatePermissions() { // Paper - synchronized
         clearPermissions();
         Set<Permission> defaults = Bukkit.getServer().getPluginManager().getDefaultPermissions(isOp());
         Bukkit.getServer().getPluginManager().subscribeToDefaultPerms(isOp(), parent);
@@ -0,0 +0,0 @@ public class PermissibleBase implements Permissible {
-     }
 
+     @Override
     @Nullable
 -    public PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value, int ticks) {
 +    public synchronized PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value, int ticks) { // Paper
@@ -93,8 +94,8 @@ index 27c14c0f..72fff64e 100644
             throw new IllegalArgumentException("Permission name cannot be null");
         } else if (plugin == null) {
@@ -0,0 +0,0 @@ public class PermissibleBase implements Permissible {
-     }
 
+     @Override
     @Nullable
 -    public PermissionAttachment addAttachment(@NotNull Plugin plugin, int ticks) {
 +    public synchronized PermissionAttachment addAttachment(@NotNull Plugin plugin, int ticks) { // Paper - synchronized
@@ -102,8 +103,8 @@ index 27c14c0f..72fff64e 100644
             throw new IllegalArgumentException("Plugin cannot be null");
         } else if (!plugin.isEnabled()) {
@@ -0,0 +0,0 @@ public class PermissibleBase implements Permissible {
-     }
 
+     @Override
     @NotNull
 -    public Set<PermissionAttachmentInfo> getEffectivePermissions() {
 +    public synchronized Set<PermissionAttachmentInfo> getEffectivePermissions() { // Paper - synchronized
--- a/Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch
@@ -384,7 +384,7 @@ index 00000000..4fe18540
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fd88fd65..1de43bd3 100644
+index bc4ec3f2..abe00d72 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Player-affects-spawning-API.patch
+++ b/Spigot-API-Patches/Player-affects-spawning-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player affects spawning API


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 942cb386..ca0dda5a 100644
+index 4f8ae7a8..329e2b01 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/Player.setPlayerProfile-API.patch
+++ b/Spigot-API-Patches/Player.setPlayerProfile-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.

 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c7bc13e7..06154a5c 100644
+index df1d3c78..8f87b165 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ package org.bukkit.entity;
--- a/Spigot-API-Patches/PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-API-Patches/PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer


 diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
-index c7599116..5777d380 100644
+index 951ea2cc..18d82c11 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
@@ -41,10 +41,11 @@ index c7599116..5777d380 100644
 +    }
 +    // Paper End
 +
+     @Override
     public boolean isCancelled() {
         return cancel;
-     }
- 
+@@ -0,0 +0,0 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
+     @Override
     public void setCancelled(boolean cancel) {
         this.cancel = cancel;
 +        this.flyAtPlayer = !cancel; // Paper
--- a/Spigot-API-Patches/Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/Spigot-API-Patches/Provide-Chunk-Coordinates-as-a-Long-API.patch
@@ -44,7 +44,7 @@ index e583f86d..7302b6e3 100644
      * Gets the world containing this chunk
      *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 8d23ad74..7e245356 100644
+index 3f934c80..dd0ab741 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-API-Patches/Provide-E-TE-Chunk-count-stat-methods.patch
@@ -7,7 +7,7 @@ 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 05a82e4f..0e6dd6e1 100644
+index 17b4f38d..80608e7a 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
--- a/Spigot-API-Patches/Remove-deadlock-risk-in-firing-async-events.patch
+++ b/Spigot-API-Patches/Remove-deadlock-risk-in-firing-async-events.patch
@@ -16,12 +16,12 @@ which results in a hard crash.
 This change removes the synchronize and adds some protection around enable/disable

 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 9391bbf0..5098eade 100644
+index adca48f1..2d3cee14 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
  */
- public interface Entity extends Metadatable, CommandSender, Nameable {
+ public interface Entity extends Metadatable, CommandSender, Nameable, PersistentDataHolder {
 
 -    /**
 +    /*
@@ -29,31 +29,31 @@ index 9391bbf0..5098eade 100644
      *
      * @return a new copy of Location containing the position of this entity
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 269bb5ca..5d99a41a 100644
+index da3cd63b..583f8ee4 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
-      * @param plugin Plugin to check
      * @return true if the plugin is enabled, otherwise false
      */
+     @Override
 -    public boolean isPluginEnabled(@Nullable Plugin plugin) {
 +    public synchronized boolean isPluginEnabled(@Nullable Plugin plugin) { // Paper - synchronize
         if ((plugin != null) && (plugins.contains(plugin))) {
             return plugin.isEnabled();
         } else {
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
-         }
     }
 
+     @Override
 -    public void enablePlugin(@NotNull final Plugin plugin) {
 +    public synchronized void enablePlugin(@NotNull final Plugin plugin) { // Paper - synchronize
         if (!plugin.isEnabled()) {
             List<Command> pluginCommands = PluginCommandYamlParser.parse(plugin);
 
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
-         disablePlugin(plugin, false);
     }
 
+     @Override
 -    public void disablePlugin(@NotNull final Plugin plugin, boolean closeClassloader) {
 +    public synchronized void disablePlugin(@NotNull final Plugin plugin, boolean closeClassloader) { // Paper - synchronize
         // Paper end - close Classloader on disable
@@ -68,8 +68,8 @@ index 269bb5ca..5d99a41a 100644
     /**
      * Calls an event with the given details.
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
-      * @param event Event details
      */
+     @Override
     public void callEvent(@NotNull Event event) {
 -        if (event.isAsynchronous()) {
 -            if (Thread.holdsLock(this)) {
@@ -97,7 +97,7 @@ index 269bb5ca..5d99a41a 100644
         RegisteredListener[] listeners = handlers.getRegisteredListeners();
 
 diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
-index 5e986de8..2b50fe63 100644
+index 17dbe913..bae26ce7 100644
 --- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java
 +++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
@@ -0,0 +0,0 @@ public class PluginManagerTest {
--- a/Spigot-API-Patches/Shoulder-Entities-Release-API.patch
+++ b/Spigot-API-Patches/Shoulder-Entities-Release-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Shoulder Entities Release API


 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index f76bc85c..037e2393 100644
+index 6277f392..5b5fb303 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -0,0 +0,0 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
--- a/Spigot-API-Patches/Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/Spigot-API-Patches/Support-cancellation-supression-of-EntityDismount-Ve.patch
@@ -21,7 +21,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!

 diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
-index 69c9e499..f0c0bae5 100644
+index 963b9ead..a976c32d 100644
 --- a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
 +++ b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
@@ -0,0 +0,0 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable {
@@ -45,8 +45,8 @@ index 69c9e499..f0c0bae5 100644
 
     /**
@@ -0,0 +0,0 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable {
-     }
 
+     @Override
     public void setCancelled(boolean cancel) {
 +        // Paper start
 +        if (cancel && !isCancellable) {
--- a/Spigot-API-Patches/Timings-v2.patch
+++ b/Spigot-API-Patches/Timings-v2.patch
@@ -3416,7 +3416,7 @@ index 00000000..ca1893e9
 +
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index b3d5a302..9d0ae63f 100644
+index 81e4fa57..f020cb04 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -0,0 +0,0 @@ import org.bukkit.command.defaults.BukkitCommand;
@@ -3437,8 +3437,8 @@ index b3d5a302..9d0ae63f 100644
 
     public void setFallbackCommands() {
@@ -0,0 +0,0 @@ public class SimpleCommandMap implements CommandMap {
-      * {@inheritDoc}
      */
+     @Override
     public boolean register(@NotNull String label, @NotNull String fallbackPrefix, @NotNull Command command) {
 +        command.timings = co.aikar.timings.TimingsManager.getCommandTiming(fallbackPrefix, command); // Paper
         label = label.toLowerCase(java.util.Locale.ENGLISH).trim();
@@ -3731,7 +3731,7 @@ index 6023e4f6..00000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 36a42a80..942cb386 100644
+index 06762a69..4f8ae7a8 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3747,7 +3747,7 @@ index 36a42a80..942cb386 100644
 
     @NotNull
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 17ddbe61..47327376 100644
+index f648c598..78a2d2f8 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
@@ -3768,14 +3768,14 @@ index 17ddbe61..47327376 100644
 
         return result;
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
-      */
+     @Override
     @Nullable
     public synchronized Plugin getPlugin(@NotNull String name) {
 -        return lookupNames.get(name.replace(' ', '_'));
 +        return lookupNames.get(name.replace(' ', '_').toLowerCase(java.util.Locale.ENGLISH)); // Paper
     }
 
-     @NotNull
+     @Override
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
             throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
         }
@@ -3787,8 +3787,8 @@ index 17ddbe61..47327376 100644
         } else {
             getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
-     }
 
+     @Override
     public boolean useTimings() {
 -        return useTimings;
 +        return co.aikar.timings.Timings.isTimingsEnabled(); // Spigot
@@ -3804,7 +3804,7 @@ index 17ddbe61..47327376 100644
     }
 }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 92983c1e..2618906f 100644
+index 1173e433..82e379d1 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -3821,8 +3821,9 @@ index 92983c1e..2618906f 100644
 
 -            final CustomTimingsHandler timings = new CustomTimingsHandler("Plugin: " + plugin.getDescription().getFullName() + " Event: " + listener.getClass().getName() + "::" + method.getName()+"("+eventClass.getSimpleName()+")", pluginParentTimer); // Spigot
 -            EventExecutor executor = new EventExecutor() {
-                public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException {
 +            EventExecutor executor = new co.aikar.timings.TimedEventExecutor(new EventExecutor() { // Paper
+                 @Override
+-                public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException {
 +                public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException { // Paper
                     try {
                         if (!eventClass.isAssignableFrom(event.getClass())) {
--- a/Spigot-API-Patches/Use-ASM-for-event-executors.patch
+++ b/Spigot-API-Patches/Use-ASM-for-event-executors.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.

 diff --git a/pom.xml b/pom.xml
-index 81861781..2f68fba2 100644
+index b7f7eeff..8f2730df 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -0,0 +0,0 @@
@@ -412,7 +412,7 @@ index a850f078..9026e108 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 85139364..024d8393 100644
+index 12601db6..06b6724f 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -420,6 +420,7 @@ index 85139364..024d8393 100644
             }
 
 -            EventExecutor executor = new co.aikar.timings.TimedEventExecutor(new EventExecutor() { // Paper
+-                @Override
 -                public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException { // Paper
 -                    try {
 -                        if (!eventClass.isAssignableFrom(event.getClass())) {
--- a/Spigot-API-Patches/ensureServerConversions-API.patch
+++ b/Spigot-API-Patches/ensureServerConversions-API.patch
@@ -29,7 +29,7 @@ index cbcbe8c8..8e602cf5 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 7b709457..4ee01be5 100644
+index bab86d80..44f3bec7 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
--- a/Spigot-API-Patches/isChunkGenerated-API.patch
+++ b/Spigot-API-Patches/isChunkGenerated-API.patch
@@ -5,18 +5,19 @@ Subject: [PATCH] isChunkGenerated API


 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index e546407e..7713f183 100644
+index 6dc39989..4e69f277 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
-@@ -0,0 +0,0 @@
- package org.bukkit;
- 
+@@ -0,0 +0,0 @@ package org.bukkit;
+ import com.google.common.base.Preconditions;
+ import java.lang.ref.Reference;
+ import java.lang.ref.WeakReference;
 +import com.google.common.base.Preconditions; // Paper
 import java.util.HashMap;
 import java.util.Map;
 import org.bukkit.block.Block;
@@ -0,0 +0,0 @@ public class Location implements Cloneable, ConfigurationSerializable {
-     public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
+     public boolean isChunkLoaded() { return this.getWorld().isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
 
     // Paper start
 +    /**
@@ -25,6 +26,7 @@ index e546407e..7713f183 100644
 +     * @return true if a chunk has been generated at this location
 +     */
 +    public boolean isGenerated() {
+        World world = this.getWorld();
 +        Preconditions.checkNotNull(world, "Location has no world!");
 +        return world.isChunkGenerated(locToBlock(x) >> 4, locToBlock(z) >> 4);
 +    }
@@ -32,7 +34,7 @@ index e546407e..7713f183 100644
     /**
      * Sets the position of this Location and returns itself
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 446d91c5..dd51aa31 100644
+index 4d35efb0..150c5af2 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {