Merge branch 'pre/1.13' of https://github.com/PaperMC/Paper into AnvilDamageEvent

LICENSE.md

@@ -34,4 +34,6 @@ Brokkonaut <hannos17@gmx.de>
 vemacs <d@nkmem.es>
 stonar96 <minecraft.stonar96@gmail.com>
 Hugo Manrique <hugmanrique@gmail.com>
+Andrew Steinborn <git@steinborn.me>
+willies952002 <admin@domnian.com>
 ```

Spigot-API-Patches/Add-BeaconEffectEvent.patch

@@ -91,4 +91,6 @@ index 00000000..6579ae99
 +        return handlers;
 +    }
 +}
---
+-- 
+2.17.0 (Apple Git-106)
+

Spigot-API-Patches/Add-PlayerLocaleChangeEvent.patch

@@ -60,4 +60,6 @@ index 00000000..29dd763a
 +        return handlers;
 +    }
 +}
---
+-- 
+2.17.0 (Apple Git-106)
+

Spigot-API-Patches/Add-async-chunk-load-API.patch

@@ -0,0 +1,90 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Mon, 29 Feb 2016 17:43:33 -0600
+Subject: [PATCH] Add async chunk load API
+
+
+diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
+index 550c26be..121033e9 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 {
+      */
+     public Chunk getChunkAt(Block block);
+ 
++    /**
++     * Used by {@link World#getChunkAtAsync(Location,ChunkLoadCallback)} methods
++     * to request a {@link Chunk} to be loaded, with this callback receiving
++     * the chunk when it is finished.
++     *
++     * This callback will be executed on synchronously on the main thread.
++     *
++     * Timing and order this callback is fired is intentionally not defined and
++     * and subject to change.
++     */
++    public static interface ChunkLoadCallback {
++        public void onLoad(Chunk chunk);
++    }
++
++    /**
++     * Requests a {@link Chunk} to be loaded at the given coordinates
++     *
++     * This method makes no guarantee on how fast the chunk will load,
++     * and will return the chunk to the callback at a later time.
++     *
++     * You should use this method if you need a chunk but do not need it
++     * immediately, and you wish to let the server control the speed
++     * of chunk loads, keeping performance in mind.
++     *
++     * The {@link ChunkLoadCallback} will always be executed synchronously
++     * on the main Server Thread.
++     *
++     * @param x Chunk X-coordinate of the chunk - (world coordinate / 16)
++     * @param z Chunk Z-coordinate of the chunk - (world coordinate / 16)
++     * @param cb Callback to receive the chunk when it is loaded.
++     *           will be executed synchronously
++     */
++    public void getChunkAtAsync(int x, int z, ChunkLoadCallback cb);
++
++    /**
++     * Requests a {@link Chunk} to be loaded at the given {@link Location}
++     *
++     * This method makes no guarantee on how fast the chunk will load,
++     * and will return the chunk to the callback at a later time.
++     *
++     * You should use this method if you need a chunk but do not need it
++     * immediately, and you wish to let the server control the speed
++     * of chunk loads, keeping performance in mind.
++     *
++     * The {@link ChunkLoadCallback} will always be executed synchronously
++     * on the main Server Thread.
++     *
++     * @param location Location of the chunk
++     * @param cb Callback to receive the chunk when it is loaded.
++     *           will be executed synchronously
++     */
++    public void getChunkAtAsync(Location location, ChunkLoadCallback cb);
++
++    /**
++     * Requests {@link Chunk} to be loaded that contains the given {@link Block}
++     *
++     * This method makes no guarantee on how fast the chunk will load,
++     * and will return the chunk to the callback at a later time.
++     *
++     * You should use this method if you need a chunk but do not need it
++     * immediately, and you wish to let the server control the speed
++     * of chunk loads, keeping performance in mind.
++     *
++     * The {@link ChunkLoadCallback} will always be executed synchronously
++     * on the main Server Thread.
++     *
++     * @param block Block to get the containing chunk from
++     * @param cb Callback to receive the chunk when it is loaded.
++     *           will be executed synchronously
++     */
++    public void getChunkAtAsync(Block block, ChunkLoadCallback cb);
++
+     /**
+      * Checks if the specified {@link Chunk} is loaded
+      *
+--

Spigot-API-Patches/Add-command-to-reload-permissions.yml-and-require-co.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0844862c..bce4ba1b 100644
+index 471ae811..d6686820 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ public final class Bukkit {
@@ -24,7 +24,7 @@ index 0844862c..bce4ba1b 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1ad2cba4..b6a2141c 100644
+index 56b0fdb5..5a4528c4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {

Spigot-API-Patches/Add-configuration-option-to-prevent-player-names-fro.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 70495c15..c918d67c 100644
+index 35e18341..9558645f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ public final class Bukkit {
@@ -27,7 +27,7 @@ index 70495c15..c918d67c 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 94d709f4..96044f4b 100644
+index 12efd654..da0d08b3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {

Spigot-API-Patches/Add-getI18NDisplayName-API.patch

@@ -28,7 +28,7 @@ index 045c26d9..47bbc0f9 100644
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 14b6b6b3..ca7a958f 100644
+index 4940e726..e52a39ec 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 {

Spigot-API-Patches/Add-getTPS-method.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 68b5e1c9..f3252e20 100644
+index b56c09d3..477a5833 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ public final class Bukkit {
@@ -26,7 +26,7 @@ index 68b5e1c9..f3252e20 100644
       * Get the advancement specified by this key.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 331bb061..eb98c600 100644
+index 4ddb8b02..1fa6f53e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {

Spigot-API-Patches/Add-player-view-distance-API.patch

@@ -29,4 +29,6 @@ index 25e44028..7f215f1a 100644
      // Spigot start
      public class Spigot extends Entity.Spigot
      {
---
+-- 
+2.17.0 (Apple Git-106)
+

Spigot-API-Patches/Allow-Reloading-of-Command-Aliases.patch

@@ -6,7 +6,7 @@ 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 bce4ba1b..70495c15 100644
+index d6686820..35e18341 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ public final class Bukkit {
@@ -26,7 +26,7 @@ index bce4ba1b..70495c15 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b6a2141c..94d709f4 100644
+index 5a4528c4..12efd654 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {

Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/pom.xml b/pom.xml
-index 44a8b2a5..c176dd7b 100644
+index a58d4424..a771e156 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@

Spigot-API-Patches/Basic-PlayerProfile-API.patch

@@ -7,14 +7,12 @@ Provides basic elements of a PlayerProfile to be used by future API/events
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
 new file mode 100644
-index 00000000..e060c38a
+index 00000000..1a69e5f7
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
 @@ -0,0 +0,0 @@
 +package com.destroystokyo.paper.profile;
 +
-+import com.mojang.authlib.GameProfile;
-+
 +import javax.annotation.Nonnull;
 +import javax.annotation.Nullable;
 +import java.util.Collection;
@@ -153,12 +151,6 @@ index 00000000..e060c38a
 +    default boolean hasTextures() {
 +        return hasProperty("textures");
 +    }
-+
-+    /**
-+     * @deprecated Will be removed in 1.13
-+     */
-+    @Deprecated
-+    GameProfile getGameProfile();
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
 new file mode 100644
@@ -239,7 +231,7 @@ index 00000000..d17061e6
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c918d67c..01a226d9 100644
+index 9558645f..86e72f95 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ import org.bukkit.generator.ChunkGenerator;
@@ -291,7 +283,7 @@ index c918d67c..01a226d9 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 96044f4b..6c96fc14 100644
+index da0d08b3..878255a4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ import org.bukkit.generator.ChunkGenerator;

Spigot-API-Patches/EnderDragon-Events.patch

@@ -0,0 +1,207 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Sat, 21 Jul 2018 01:51:05 -0500
+Subject: [PATCH] EnderDragon Events
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java
+new file mode 100644
+index 00000000..2ac57af3
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java
+@@ -0,0 +0,0 @@
++package com.destroystokyo.paper.event.entity;
++
++import org.bukkit.entity.AreaEffectCloud;
++import org.bukkit.entity.DragonFireball;
++import org.bukkit.entity.LivingEntity;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.entity.EntityEvent;
++
++import java.util.Collection;
++
++/**
++ * Fired when a DragonFireball collides with a block/entity and spawns an AreaEffectCloud
++ */
++public class EnderDragonFireballHitEvent extends EntityEvent implements Cancellable {
++    private final Collection<LivingEntity> targets;
++    private final AreaEffectCloud areaEffectCloud;
++
++    public EnderDragonFireballHitEvent(DragonFireball fireball, Collection<LivingEntity> targets, AreaEffectCloud areaEffectCloud) {
++        super(fireball);
++        this.targets = targets;
++        this.areaEffectCloud = areaEffectCloud;
++    }
++
++    /**
++     * The fireball involved in this event
++     */
++    @Override
++    public DragonFireball getEntity() {
++        return (DragonFireball) super.getEntity();
++    }
++
++    /**
++     * The living entities hit by fireball
++     * <p></p>
++     * May be null if no entities were hit
++     */
++    public Collection<LivingEntity> getTargets() {
++        return targets;
++    }
++
++    /**
++     * The area effect cloud spawned in this collision
++     */
++    public AreaEffectCloud getAreaEffectCloud() {
++        return areaEffectCloud;
++    }
++
++    private static final HandlerList handlers = new HandlerList();
++
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    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/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java
+new file mode 100644
+index 00000000..59f87633
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java
+@@ -0,0 +0,0 @@
++package com.destroystokyo.paper.event.entity;
++
++import org.bukkit.entity.AreaEffectCloud;
++import org.bukkit.entity.EnderDragon;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.entity.EntityEvent;
++
++/**
++ * Fired when an EnderDragon spawns an AreaEffectCloud by shooting flames
++ */
++public class EnderDragonFlameEvent extends EntityEvent implements Cancellable {
++    private final AreaEffectCloud areaEffectCloud;
++
++    public EnderDragonFlameEvent(EnderDragon enderDragon, AreaEffectCloud areaEffectCloud) {
++        super(enderDragon);
++        this.areaEffectCloud = areaEffectCloud;
++    }
++
++    /**
++     * The enderdragon involved in this event
++     */
++    @Override
++    public EnderDragon getEntity() {
++        return (EnderDragon) super.getEntity();
++    }
++
++    /**
++     * The area effect cloud spawned in this collision
++     */
++    public AreaEffectCloud getAreaEffectCloud() {
++        return areaEffectCloud;
++    }
++
++    private static final HandlerList handlers = new HandlerList();
++
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    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/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java
+new file mode 100644
+index 00000000..296ae244
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java
+@@ -0,0 +0,0 @@
++package com.destroystokyo.paper.event.entity;
++
++import org.bukkit.entity.DragonFireball;
++import org.bukkit.entity.EnderDragon;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.entity.EntityEvent;
++
++/**
++ * Fired when an EnderDragon shoots a fireball
++ */
++public class EnderDragonShootFireballEvent extends EntityEvent implements Cancellable {
++    private final DragonFireball fireball;
++
++    public EnderDragonShootFireballEvent(EnderDragon entity, DragonFireball fireball) {
++        super(entity);
++        this.fireball = fireball;
++    }
++
++    /**
++     * The enderdragon shooting the fireball
++     */
++    @Override
++    public EnderDragon getEntity() {
++        return (EnderDragon) super.getEntity();
++    }
++
++    /**
++     * The fireball being shot
++     */
++    public DragonFireball getFireball() {
++        return fireball;
++    }
++
++    private static final HandlerList handlers = new HandlerList();
++
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++
++    private boolean cancelled = false;
++
++    @Override
++    public boolean isCancelled() {
++        return cancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel) {
++        cancelled = cancel;
++    }
++}
+--

Spigot-API-Patches/Entity-Origin-API.patch

@@ -25,7 +25,7 @@ index 28b169d2..9b0f97f1 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index 9d34e691..b0b1defc 100644
+index 0cd830d9..170a9aee 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
 @@ -0,0 +0,0 @@ public interface FallingBlock extends Entity {

Spigot-API-Patches/Expand-Location-Manipulation-API.patch

@@ -0,0 +1,64 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Wed, 25 Jul 2018 01:36:07 -0400
+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 d0d86e1a..253f0c2d 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
+ 
+     // Paper start
++
++    /**
++     * Sets the position of this Location and returns itself
++     *
++     * This mutates this object, clone first.
++     * @param x X coordinate
++     * @param y Y coordinate
++     * @param z Z coordinate
++     * @return self (not cloned)
++     */
++    public Location set(double x, double y, double z) {
++        this.x = x;
++        this.y = y;
++        this.z = z;
++        return this;
++    }
++
++    /**
++     * Takes the x/y/z from base and adds the specified x/y/z to it and returns self
++     *
++     * This mutates this object, clone first.
++     * @param base The base coordinate to modify
++     * @param x X coordinate to add to base
++     * @param y Y coordinate to add to base
++     * @param z Z coordinate to add to base
++     * @return self (not cloned)
++     */
++    public Location add(Location base, double x, double y, double z) {
++        return this.set(base.x + x, base.y + y, base.z + z);
++    }
++
++    /**
++     * Takes the x/y/z from base and subtracts the specified x/y/z to it and returns self
++     *
++     * This mutates this object, clone first.
++     * @param base The base coordinate to modify
++     * @param x X coordinate to subtract from base
++     * @param y Y coordinate to subtract from base
++     * @param z Z coordinate to subtract from base
++     * @return self (not cloned)
++     */
++    public Location subtract(Location base, double x, double y, double z) {
++        return this.set(base.x - x, base.y - y, base.z - z);
++    }
++
+     /**
+      * @return A new location where X/Y/Z are on the Block location (integer value of X/Y/Z)
+      */
+--

Spigot-API-Patches/Expose-server-CommandMap.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f3252e20..a291ebd6 100644
+index 477a5833..73c85063 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ import org.bukkit.boss.BarColor;
@@ -39,7 +39,7 @@ index f3252e20..a291ebd6 100644
      {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index eb98c600..2b43ac1f 100644
+index 1fa6f53e..70e19580 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ import org.bukkit.boss.BarColor;

Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
 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/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
-index 1ed8f7e4..bd5238ce 100644
+index 43239f84..fe8d3468 100644
 --- a/src/main/java/org/bukkit/NamespacedKey.java
 +++ b/src/main/java/org/bukkit/NamespacedKey.java
 @@ -0,0 +0,0 @@ public final class NamespacedKey {

Spigot-API-Patches/Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

@@ -37,7 +37,7 @@ index a291ebd6..0844862c 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/Server.java b/src/main/java/org/bukkit/Server.java
-index 2b43ac1f..d8ce8173 100644
+index 901199e3..1ad2cba4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {

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 a240311e..c5befd8c 100644
+index 84a399e0..4a27f4fc 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;

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 ca7a958f..a240311e 100644
+index e52a39ec..84a399e0 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 {

Spigot-API-Patches/Made-EntityDismountEvent-Cancellable.patch

@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nik Gil <nikmanG@users.noreply.github.com>
-Date: Mon, 29 Feb 2016 19:42:10 -0600
-Subject: [PATCH] Made EntityDismountEvent Cancellable
-
-
-diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-index 24d4942a..ce989bb1 100644
---- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-+++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-@@ -0,0 +0,0 @@
- package org.spigotmc.event.entity;
- 
- import org.bukkit.entity.Entity;
-+import org.bukkit.event.Cancellable;
- import org.bukkit.event.HandlerList;
- import org.bukkit.event.entity.EntityEvent;
- 
-@@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityEvent;
-  * Called when an entity stops riding another entity.
-  *
-  */
--public class EntityDismountEvent extends EntityEvent
-+public class EntityDismountEvent extends EntityEvent implements Cancellable // Paper - implement Cancellable
- {
- 
-     private static final HandlerList handlers = new HandlerList();
-@@ -0,0 +0,0 @@ public class EntityDismountEvent extends EntityEvent
-     {
-         return handlers;
-     }
-+
-+    // Paper start - Implement cancellable methods
-+    @Override
-+    public boolean isCancelled() {
-+        return cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancelled) {
-+        this.cancelled = cancelled;
-+    }
-+    // Paper end
- }
---

Spigot-API-Patches/POM-changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 3e6c8707..c2d0651e 100644
+index e946bccf..7374304f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -21,7 +21,7 @@ index 3e6c8707..c2d0651e 100644
 +    </parent>
 +
 +    <artifactId>paper-api</artifactId>
-     <version>1.13-pre7-R0.1-SNAPSHOT</version>
+     <version>1.13-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Spigot-API</name>

Spigot-API-Patches/Player-Tab-List-and-Title-APIs.patch

@@ -497,4 +497,6 @@ index f4d1ade5..65b7a076 100644
      // Paper end
  
      /**
---
+-- 
+2.17.0 (Apple Git-106)
+

Spigot-API-Patches/PlayerElytraBoostEvent.patch

@@ -0,0 +1,93 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Sat, 21 Jul 2018 01:59:53 -0500
+Subject: [PATCH] PlayerElytraBoostEvent
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
+new file mode 100644
+index 00000000..cecb2182
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
+@@ -0,0 +0,0 @@
++package com.destroystokyo.paper.event.player;
++
++import org.bukkit.entity.Firework;
++import org.bukkit.entity.Player;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.player.PlayerEvent;
++import org.bukkit.inventory.ItemStack;
++
++/**
++ * Fired when a player boosts elytra flight with a firework
++ */
++public class PlayerElytraBoostEvent extends PlayerEvent implements Cancellable {
++    private static final HandlerList handlers = new HandlerList();
++    private boolean cancelled = false;
++    private final ItemStack itemStack;
++    private Firework firework;
++    private boolean consume = true;
++
++    public PlayerElytraBoostEvent(Player player, ItemStack itemStack, Firework firework) {
++        super(player);
++        this.itemStack = itemStack;
++        this.firework = firework;
++    }
++
++    /**
++     * Get the firework itemstack used
++     *
++     * @return ItemStack of firework
++     */
++    public ItemStack getItemStack() {
++        return itemStack;
++    }
++
++    /**
++     * Get the firework entity that was spawned
++     *
++     * @return Firework entity
++     */
++    public Firework getFirework() {
++        return firework;
++    }
++
++    /**
++     * Get whether to consume the firework or not
++     *
++     * @return True to consume
++     */
++    public boolean shouldConsume() {
++        return consume;
++    }
++
++    /**
++     * Set whether to consume the firework or not
++     *
++     * @param consume True to consume
++     */
++    public void setShouldConsume(boolean consume) {
++        this.consume = consume;
++    }
++
++    @Override
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++
++    @Override
++    public boolean isCancelled() {
++        return cancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel) {
++        cancelled = cancel;
++    }
++}
+--

Spigot-API-Patches/Profile-Lookup-Events.patch

@@ -6,34 +6,15 @@ Subject: [PATCH] Profile Lookup Events
 Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in profile data, and cache the responses from
 profiles that had to be looked up.
 
-diff --git a/pom.xml b/pom.xml
-index bd9146dd..44a8b2a5 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -0,0 +0,0 @@
-             <!-- Trove Provided by CraftBukkit -->
-             <scope>provided</scope>
-         </dependency>
-+        <!-- Paper - Add Authlib for Profile API -->
-+        <dependency>
-+            <groupId>com.mojang</groupId>
-+            <artifactId>authlib</artifactId>
-+            <version>1.5.25</version> <!-- keep in sync with major MC versions -->
-+            <scope>compile</scope> <!-- expose to Plugins -->
-+        </dependency>
-         <dependency>
-             <groupId>co.aikar</groupId>
-             <artifactId>fastutil-lite</artifactId>
 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java
 new file mode 100644
-index 00000000..3b6995a7
+index 00000000..160c98fe
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java
 @@ -0,0 +0,0 @@
 +package com.destroystokyo.paper.event.profile;
 +
 +import com.destroystokyo.paper.profile.PlayerProfile;
-+import com.mojang.authlib.GameProfile;
 +import org.bukkit.Bukkit;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.HandlerList;
@@ -60,16 +41,6 @@ index 00000000..3b6995a7
 +
 +    /**
 +     * @return The profile that was recently looked up. This profile can be mutated
-+     * @deprecated will be removed with 1.13, use {@link #getPlayerProfile()}
-+     */
-+    @Deprecated
-+    @Nonnull
-+    public GameProfile getProfile() {
-+        return profile.getGameProfile();
-+    }
-+
-+    /**
-+     * @return The profile that was recently looked up. This profile can be mutated
 +     */
 +    @Nonnull
 +    public PlayerProfile getPlayerProfile() {
@@ -87,7 +58,7 @@ index 00000000..3b6995a7
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java
 new file mode 100644
-index 00000000..aa0666d5
+index 00000000..e5a5986a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java
 @@ -0,0 +0,0 @@
@@ -96,8 +67,6 @@ index 00000000..aa0666d5
 +import com.destroystokyo.paper.profile.PlayerProfile;
 +import com.destroystokyo.paper.profile.ProfileProperty;
 +import com.google.common.collect.ArrayListMultimap;
-+import com.google.common.collect.Multimap;
-+import com.mojang.authlib.properties.Property;
 +import org.bukkit.Bukkit;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.HandlerList;
@@ -162,48 +131,6 @@ index 00000000..aa0666d5
 +    }
 +
 +    /**
-+     * Get the properties for this profile
-+     *
-+     * @return the property map to attach to the new {@link PlayerProfile}
-+     * @deprecated will be removed with 1.13  Use {@link #getProfileProperties()}
-+     */
-+    @Deprecated
-+    @Nonnull
-+    public Multimap<String, Property> getProperties() {
-+        Multimap<String, Property> props = ArrayListMultimap.create();
-+
-+        for (ProfileProperty property : properties) {
-+            props.put(property.getName(), new Property(property.getName(), property.getValue(), property.getSignature()));
-+        }
-+        return props;
-+    }
-+
-+    /**
-+     * Completely replaces all Properties with the new provided properties
-+     * @param properties the properties to set on the new profile
-+     * @deprecated will be removed with 1.13 Use {@link #setProfileProperties(Set)}
-+     */
-+    @Deprecated
-+    public void setProperties(Multimap<String, Property> properties) {
-+        this.properties = new HashSet<>();
-+        properties.values().forEach(property -> {
-+            this.properties.add(new ProfileProperty(property.getName(), property.getValue(), property.getSignature()));
-+        });
-+    }
-+
-+    /**
-+     * Adds additional properties, without removing the original properties
-+     * @param properties the properties to add to the existing properties
-+     * @deprecated will be removed with 1.13 use {@link #addProfileProperties(Set)}
-+     */
-+    @Deprecated
-+    public void addProperties(Multimap<String, Property> properties) {
-+        properties.values().forEach(property -> {
-+            this.properties.add(new ProfileProperty(property.getName(), property.getValue(), property.getSignature()));
-+        });
-+    }
-+
-+    /**
 +     * @return The currently pending prepopulated properties.
 +     * Any property in this Set will be automatically prefilled on this Profile
 +     */

Spigot-API-Patches/ProfileWhitelistVerifyEvent.patch

@@ -9,7 +9,7 @@ Allows you to do dynamic whitelisting and change of kick message
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
 new file mode 100644
-index 00000000..662e79e3
+index 00000000..a11f811e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
 @@ -0,0 +0,0 @@
@@ -39,7 +39,6 @@ index 00000000..662e79e3
 +package com.destroystokyo.paper.event.profile;
 +
 +import com.destroystokyo.paper.profile.PlayerProfile;
-+import com.mojang.authlib.GameProfile;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.HandlerList;
 +
@@ -81,15 +80,6 @@ index 00000000..662e79e3
 +    }
 +
 +    /**
-+     * The gameprofile of the player trying to connect
-+     * @deprecated Will be removed in 1.13, use #{@link #getPlayerProfile()}
-+     */
-+    @Deprecated
-+    public GameProfile getProfile() {
-+        return profile.getGameProfile();
-+    }
-+
-+    /**
 +     * @return The profile of the player trying to connect
 +     */
 +    public PlayerProfile getPlayerProfile() {

Spigot-API-Patches/Timings-v2.patch

@@ -3004,7 +3004,7 @@ index 00000000..df592d85
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0f42a66a..68b5e1c9 100644
+index ff7f436c..b56c09d3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ public final class Bukkit {
@@ -3016,7 +3016,7 @@ index 0f42a66a..68b5e1c9 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 053a24dc..0d41f7db 100644
+index a766ee96..4ddb8b02 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {

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 5e2024ca..bd9146dd 100644
+index a8a87820..a58d4424 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@

Spigot-API-Patches/ensureServerConversions-API.patch

@@ -28,7 +28,7 @@ index 762c43d6..045c26d9 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 73f79b22..14b6b6b3 100644
+index 3c91cbe6..4940e726 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 {

Spigot-API-Patches/getPlayerUniqueId-API.patch

@@ -34,7 +34,7 @@ index 01a226d9..b389677a 100644
       * Gets the plugin manager for interfacing with plugins.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e7aab4bb..17ac4241 100644
+index 6c96fc14..f5aee1c5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {

Spigot-Server-Patches/API-to-get-a-BlockState-without-a-snapshot.patch

@@ -13,10 +13,10 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
 If Tile Entity was null, correct Sign to return empty lines instead of null
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 2cfe2202e..909432d51 100644
+index 6021a3401f..536fd37254 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
-@@ -0,0 +0,0 @@ public abstract class TileEntity implements KeyedObject {
+@@ -0,0 +0,0 @@ public abstract class TileEntity implements KeyedObject { // Paper
      }
  
      // CraftBukkit start - add method
@@ -29,7 +29,7 @@ index 2cfe2202e..909432d51 100644
          if (world == null) return null;
          // Spigot start
          org.bukkit.block.Block block = world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ());
-@@ -0,0 +0,0 @@ public abstract class TileEntity implements KeyedObject {
+@@ -0,0 +0,0 @@ public abstract class TileEntity implements KeyedObject { // Paper
              return null;
          }
          // Spigot end
@@ -39,7 +39,7 @@ index 2cfe2202e..909432d51 100644
          return null;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index bbf7b5088..c94b5c817 100644
+index d6e4adf147..8cb08c5584 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -0,0 +0,0 @@ public class CraftBlock implements Block {
@@ -64,7 +64,7 @@ index bbf7b5088..c94b5c817 100644
  
          switch (material) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 0558cafe3..d4d9c5fc5 100644
+index 0558cafe31..d4d9c5fc50 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -0,0 +0,0 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -114,7 +114,7 @@ index 0558cafe3..d4d9c5fc5 100644
  
      private T createSnapshot(T tileEntity, World world) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index 7a8d44529..97b4e6910 100644
+index 7a8d445299..97b4e6910d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -0,0 +0,0 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements

Spigot-Server-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/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index 3204d94c5..e4ed9e206 100644
+index 3204d94c54..e4ed9e2066 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -0,0 +0,0 @@ public class EnchantmentManager {
@@ -22,7 +22,7 @@ index 3204d94c5..e4ed9e206 100644
          List list = enchantment.a(entityliving);
  
 diff --git a/src/main/java/net/minecraft/server/Enchantments.java b/src/main/java/net/minecraft/server/Enchantments.java
-index 0f4aad20f..3a5263fd9 100644
+index 0f4aad20fe..3a5263fd9f 100644
 --- a/src/main/java/net/minecraft/server/Enchantments.java
 +++ b/src/main/java/net/minecraft/server/Enchantments.java
 @@ -0,0 +0,0 @@ public class Enchantments {
@@ -35,7 +35,7 @@ index 0f4aad20f..3a5263fd9 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index a87ef5fb8..b8bfc7577 100644
+index a87ef5fb8c..b8bfc75771 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -0,0 +0,0 @@ public class EntityExperienceOrb extends Entity {
@@ -52,7 +52,7 @@ index a87ef5fb8..b8bfc7577 100644
          return i * 2;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 43e357e39..7021a81be 100644
+index 23200bb597..9f69000cb2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 7dbc6f437..02bbb0d1d 100644
+index 91cd6e0f61..f02b28059c 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -0,0 +0,0 @@

Spigot-Server-Patches/Activation-Range-Improvements.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Activation Range Improvements
 Fixes and adds new Immunities to improve gameplay behavior
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index e2e1095118..34dcd01ded 100644
+index b347567699..53b25dd805 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityUnleashEvent;
@@ -18,7 +18,7 @@ index e2e1095118..34dcd01ded 100644
      private float b;
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1bef317758..c1618f8c36 100644
+index 8dbff3c370..3da4bc356a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
@@ -31,15 +31,15 @@ index 1bef317758..c1618f8c36 100644
      protected int ticksFarFromPlayer;
      protected float aZ;
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 2698579603..864ca3cc6e 100644
+index bb86ecb2fb..5cd8c3f288 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -0,0 +0,0 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
          return this.bR != null;
      }
  
-+    public boolean inCaravan() { return this.em(); } // Paper - OBFHELPER
-     public boolean em() {
++    public boolean inCaravan() { return this.en(); } // Paper - OBFHELPER
+     public boolean en() {
          return this.bQ != null;
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java

Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 4c615baea..52a1036fd 100644
+index cf11a2225..578d96640 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
@@ -17,7 +17,7 @@ index 4c615baea..52a1036fd 100644
      public EntityArmorStand(World world) {
          super(EntityTypes.ARMOR_STAND, world);
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
-     public boolean de() {
+     public boolean df() {
          return false;
      }
 +
@@ -31,7 +31,7 @@ index 4c615baea..52a1036fd 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08ad..8a06cb165 100644
+index 2b66a08ad..124c3185b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -0,0 +0,0 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -39,6 +39,7 @@ index 2b66a08ad..8a06cb165 100644
          getHandle().setMarker(marker);
      }
 +
++    // Paper start
 +    @Override
 +    public boolean canMove() {
 +        return getHandle().canMove;
@@ -48,5 +49,6 @@ index 2b66a08ad..8a06cb165 100644
 +    public void setCanMove(boolean move) {
 +        getHandle().canMove = move;
 +    }
++    // Paper end
  }
 --

Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch

@@ -13,7 +13,7 @@ starting point for future additions in this area.
 Fixes GH-559
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 1cdbdf6d0..da109e35a 100644
+index 1df2b463a..abdbd4989 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -0,0 +0,0 @@ public final class CraftItemFactory implements ItemFactory {
@@ -26,7 +26,7 @@ index 1cdbdf6d0..da109e35a 100644
          case CHEST:
          case TRAPPED_CHEST:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index cadff64bf..b1e0d6185 100644
+index e2699564a..aad380c3b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -0,0 +0,0 @@ public final class CraftItemStack extends ItemStack {
@@ -40,7 +40,7 @@ index cadff64bf..b1e0d6185 100644
              case TRAPPED_CHEST:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 new file mode 100644
-index 000000000..30941c7b0
+index 000000000..0e8acf12e
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 @@ -0,0 +0,0 @@
@@ -219,8 +219,8 @@ index 000000000..30941c7b0
 +    }
 +
 +    @Override
-+    void deserializeInternal(NBTTagCompound tag) {
-+        super.deserializeInternal(tag);
++    void deserializeInternal(NBTTagCompound tag, Object context) {
++        super.deserializeInternal(tag, context);
 +
 +        if (tag.hasKey(ENTITY_TAG.NBT)) {
 +            entityTag = tag.getCompound(ENTITY_TAG.NBT);
@@ -354,7 +354,7 @@ index 000000000..30941c7b0
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index e43a24989..df4bbba57 100644
+index f21c1e846..a5fcf6bd5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {

Spigot-Server-Patches/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch

@@ -0,0 +1,86 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Sat, 21 Jul 2018 08:25:40 -0400
+Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
+
+Add -Ddebug.entities=true to your JVM flags to gain more information
+
+diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+index a2101d44f9..f05545e357 100644
+--- a/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/server/Entity.java
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+     protected CraftEntity bukkitEntity;
+ 
+     EntityTrackerEntry tracker; // Paper
++    Throwable addedToWorldStack; // Paper - entity debug
+     public CraftEntity getBukkitEntity() {
+         if (bukkitEntity == null) {
+             bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
+diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
+index b048343b7c..747d99dbe6 100644
+--- a/src/main/java/net/minecraft/server/WorldServer.java
++++ b/src/main/java/net/minecraft/server/WorldServer.java
+@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+     private boolean Q;
+ 
+     // CraftBukkit start
++    private static final boolean DEBUG_ENTITIES = Boolean.getBoolean("debug.entities"); // Paper
++    private static Throwable getAddToWorldStackTrace(Entity entity) {
++        return new Throwable(entity + " Added to world at " + new java.util.Date());
++    }
+     public final int dimension;
+ 
+     // Add env and gen to constructor
+@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+     private boolean j(Entity entity) {
+         if (entity.dead) {
+             WorldServer.a.warn("Tried to add entity {} but it was marked as removed already: " + entity); // CraftBukkit // Paper
++            if (DEBUG_ENTITIES) getAddToWorldStackTrace(entity).printStackTrace();
+             return false;
+         } else {
+             UUID uuid = entity.getUniqueID();
+@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+                     this.g.remove(entity1);
+                 } else {
+                     if (!(entity instanceof EntityHuman)) {
+-                        WorldServer.a.error("Keeping entity {} that already exists with UUID {} - " + entity1, EntityTypes.getName(entity1.P()), uuid.toString()); // CraftBukkit // Paper
++                        WorldServer.a.error("Keeping entity {} that already exists with UUID {}", entity1, uuid.toString()); // CraftBukkit // Paper
+                         WorldServer.a.error("Deleting duplicate entity {}", entity); // Paper
++                        if (DEBUG_ENTITIES) {
++                            if (entity1.addedToWorldStack != null) {
++                                entity1.addedToWorldStack.printStackTrace();
++                            }
++                            getAddToWorldStackTrace(entity).printStackTrace();
++                        }
+                         return false;
+                     }
+ 
+@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+     protected void b(Entity entity) {
+         super.b(entity);
+         this.entitiesById.a(entity.getId(), entity);
+-        this.entitiesByUUID.put(entity.getUniqueID(), entity);
++        // Paper start
++        if (DEBUG_ENTITIES) {
++            entity.addedToWorldStack = getAddToWorldStackTrace(entity);
++        }
++
++        Entity old = this.entitiesByUUID.put(entity.getUniqueID(), entity);
++        if (old != null && old.getId() != entity.getId() && old.valid) {
++            Logger logger = LogManager.getLogger();
++            logger.error("Overwrote an existing entity " + old + " with " + entity);
++            if (DEBUG_ENTITIES) {
++                if (old.addedToWorldStack != null) {
++                    old.addedToWorldStack.printStackTrace();
++                } else {
++                    logger.error("Oddly, the old entity was not added to the world in the normal way. Plugins?");
++                }
++                entity.addedToWorldStack.printStackTrace();
++            }
++        }
++        // Paper end
+         Entity[] aentity = entity.bi();
+ 
+         if (aentity != null) {
+--

Spigot-Server-Patches/Add-EntityZapEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityZapEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 286382399f..2c7677b480 100644
+index 34b6b01a30..670f26c827 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -0,0 +0,0 @@ public class EntityPig extends EntityAnimal {
@@ -22,7 +22,7 @@ index 286382399f..2c7677b480 100644
              if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
                  return;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 6c66f7deb5..f14d118427 100644
+index 32893a32c9..45df38bad4 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -0,0 +0,0 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {

Spigot-Server-Patches/Add-MinecraftKey-Information-to-Objects.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add MinecraftKey Information to Objects
 Stores the reference to the objects respective MinecraftKey
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index a0ebc1eaa..e4c771a39 100644
+index e8f7b7292d..7ff8e70b24 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -0,0 +0,0 @@ public class PaperCommand extends Command {
@@ -18,15 +18,8 @@ index a0ebc1eaa..e4c771a39 100644
  
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
-@@ -0,0 +0,0 @@ public class PaperCommand extends Command {
- 
-         Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Paper config reload complete.");
-     }
--    
-+
- }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 515c9d875..53fc37088 100644
+index 29c7043c86..628fda8e7c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityPortalEvent;
@@ -47,32 +40,26 @@ index 515c9d875..53fc37088 100644
      private int id;
      public boolean j;
      public final List<Entity> passengers;
-@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
-         } else {
-             this.defaultActivationState = false;
-         }
-+        // Paper start
-+        this.entityKey = EntityTypes.getName(entitytypes);
-+        this.entityKeyString = this.entityKey != null ? this.entityKey.toString() : null;
-+        // Paper end
-         // Spigot end
- 
-         this.datawatcher = new DataWatcher(this);
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
          return true;
      }
  
 +    // Paper start
-+    public final MinecraftKey entityKey;
-+    public final String entityKeyString;
++    private MinecraftKey entityKey;
++    private String entityKeyString;
 +
 +    @Override
 +    public MinecraftKey getMinecraftKey() {
++        if (entityKey == null) {
++            this.entityKey = EntityTypes.getName(this.getEntityType());
++            this.entityKeyString = this.entityKey != null ? this.entityKey.toString() : null;
++        }
 +        return entityKey;
 +    }
 +
 +    @Override
 +    public String getMinecraftKeyString() {
++        getMinecraftKey(); // Try to load if it doesn't exists. see: https://github.com/PaperMC/Paper/issues/1280
 +        return entityKeyString;
 +    }
      @Nullable
@@ -82,13 +69,13 @@ index 515c9d875..53fc37088 100644
 -
 -        return entitytypes.a() && minecraftkey != null ? minecraftkey.toString() : null;
 +        EntityTypes type = this.getEntityType();
-+        return type != null && type.isPersistable() ? entityKeyString : null;
++        return type != null && type.isPersistable() ? getMinecraftKeyString() : null;
 +        // Paper end
      }
  
      protected abstract void a(NBTTagCompound nbttagcompound);
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 557a3f97f..97cfd6695 100644
+index 9a513b4e3a..fa268f3543 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -0,0 +0,0 @@ public class EntityTypes<T extends Entity> {
@@ -101,7 +88,7 @@ index 557a3f97f..97cfd6695 100644
      }
 diff --git a/src/main/java/net/minecraft/server/KeyedObject.java b/src/main/java/net/minecraft/server/KeyedObject.java
 new file mode 100644
-index 000000000..61c2b993c
+index 0000000000..743142d030
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/KeyedObject.java
 @@ -0,0 +0,0 @@
@@ -110,11 +97,12 @@ index 000000000..61c2b993c
 +public interface KeyedObject {
 +    MinecraftKey getMinecraftKey();
 +    default String getMinecraftKeyString() {
-+        return getMinecraftKey().toString();
++        MinecraftKey key = getMinecraftKey();
++        return key != null ? key.toString() : null;
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 093e7eb7f..b09325097 100644
+index 8a0453245d..5ca7fef518 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
@@ -122,7 +110,7 @@ index 093e7eb7f..b09325097 100644
  import org.bukkit.inventory.InventoryHolder; // CraftBukkit
  
 -public abstract class TileEntity {
-+public abstract class TileEntity implements KeyedObject {
++public abstract class TileEntity implements KeyedObject { // Paper
  
      public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getTileEntityTimings(this); // Spigot
      private static final Logger a = LogManager.getLogger();
@@ -132,24 +120,25 @@ index 093e7eb7f..b09325097 100644
      protected BlockPosition position;
      protected boolean d;
 @@ -0,0 +0,0 @@ public abstract class TileEntity {
-     public TileEntity(TileEntityTypes<?> tileentitytypes) {
-         this.position = BlockPosition.ZERO;
          this.e = tileentitytypes;
-+        // Paper start
-+        this.tileEntityKey = TileEntityTypes.a(tileentitytypes);
-+        this.tileEntityKeyString = tileEntityKey != null ? tileEntityKey.toString() : null;
      }
  
-+    public final MinecraftKey tileEntityKey;
-+    public final String tileEntityKeyString;
++    // Paper start
++    private String tileEntityKeyString = null;
++    private MinecraftKey tileEntityKey = null;
 +
 +    @Override
 +    public MinecraftKey getMinecraftKey() {
++        if (tileEntityKey == null) {
++            tileEntityKey = TileEntityTypes.a(this.getTileEntityType());
++            tileEntityKeyString = tileEntityKey != null ? tileEntityKey.toString() : null;
++        }
 +        return tileEntityKey;
 +    }
 +
 +    @Override
 +    public String getMinecraftKeyString() {
++        getMinecraftKey(); // Try to load if it doesn't exists.
 +        return tileEntityKeyString;
 +    }
 +    // Paper end

Spigot-Server-Patches/Add-PlayerArmorChangeEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 38baecd862..2f325f695e 100644
+index b596a616fe..999a02cad3 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@

Spigot-Server-Patches/Add-PlayerJumpEvent.patch

@@ -5,19 +5,19 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index f08c0ba60..1b944abea 100644
+index b20cab58b1..1bfe9d0e7a 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
          return 0;
      }
  
-+    public void jump() { this.cG(); } // Paper - OBFHELPER
-     public void cG() {
-         super.cG();
++    public void jump() { this.cH(); } // Paper - OBFHELPER
+     public void cH() {
+         super.cH();
          this.a(StatisticList.JUMP);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 383ef87ba..480b93aa0 100644
+index 932eeb19db..7465c548af 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ import org.bukkit.inventory.CraftingInventory;
@@ -33,7 +33,7 @@ index 383ef87ba..480b93aa0 100644
                              d8 = d5 - this.p;
                              d9 = d6 - this.q;
                              if (this.player.onGround && !packetplayinflying.b() && d8 > 0.0D) {
--                                this.player.cG();
+-                                this.player.cH();
 +                                // Paper start - Add player jump event
 +                                Player player = this.getPlayer();
 +                                Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location.

Spigot-Server-Patches/Add-ProjectileCollideEvent.patch

@@ -46,7 +46,7 @@ index 3e3619d79f..58cc4824cf 100644
                  this.a(movingobjectposition);
  
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 8630184d4b..7440e4a2a9 100644
+index 4f801e8fec..1804a49de9 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -0,0 +0,0 @@ public class EntityFishingHook extends Entity {

Spigot-Server-Patches/Add-SentientNPC-Interface-to-Entities.patch

@@ -14,7 +14,7 @@ This interface lets you identify NPC entities capable of sentience, and able to
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/CraftSentientNPC.java b/src/main/java/com/destroystokyo/paper/entity/CraftSentientNPC.java
 new file mode 100644
-index 000000000..a60ba1349
+index 0000000000..a60ba13495
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/CraftSentientNPC.java
 @@ -0,0 +0,0 @@
@@ -44,7 +44,7 @@ index 000000000..a60ba1349
 +
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java
-index 086980e76..ccce080ab 100644
+index 086980e76d..ccce080ab8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java
 @@ -0,0 +0,0 @@
@@ -62,7 +62,7 @@ index 086980e76..ccce080ab 100644
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
-index cc115cc36..3a4e6f0c7 100644
+index cc115cc368..3a4e6f0c7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
 @@ -0,0 +0,0 @@
@@ -89,7 +89,7 @@ index cc115cc36..3a4e6f0c7 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java
-index 09d42141f..30004e5e8 100644
+index 09d42141fb..30004e5e8c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java
 @@ -0,0 +0,0 @@
@@ -124,7 +124,7 @@ index 09d42141f..30004e5e8 100644
      @Override
      public EntityCreature getHandle() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java
-index f374c7b88..9e6f523bf 100644
+index f374c7b880..9e6f523bf1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java
 @@ -0,0 +0,0 @@
@@ -141,7 +141,7 @@ index f374c7b88..9e6f523bf 100644
      public CraftFlying(CraftServer server, EntityFlying entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-index 6bf30c834..3768b9573 100644
+index 6bf30c834c..3768b9573a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 @@ -0,0 +0,0 @@

Spigot-Server-Patches/Add-SkullMeta.setPlayerProfile-API.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/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 52de1439e..960ae59ae 100644
+index e9e2c1445..d894fadef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -0,0 +0,0 @@ package org.bukkit.craftbukkit.inventory;

Spigot-Server-Patches/Add-UnknownCommandEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9fe7c6a0d..69cfe5c4d 100644
+index 47b4c01067..ca696b2417 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.util.Versioning;

Spigot-Server-Patches/Add-ability-to-configure-frosted_ice-properties.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add ability to configure frosted_ice properties
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ff9929a05..0c50cb4bd 100644
+index b6ef1d437..8d54af6bb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {

Spigot-Server-Patches/Add-async-chunk-load-API.patch

@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Sat, 21 Jul 2018 16:55:04 -0400
+Subject: [PATCH] Add async chunk load API
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+index 0f4a894ebb..995e02f1d2 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -0,0 +0,0 @@ public class CraftWorld implements World {
+         }
+     }
+ 
++    // Paper start - Async chunk load API
++    public void getChunkAtAsync(final int x, final int z, final ChunkLoadCallback callback) {
++        final ChunkProviderServer cps = this.world.getChunkProviderServer();
++        callback.onLoad(cps.getChunkAt(x, z).bukkitChunk); // TODO: Add back async variant
++        /*cps.getChunkAt(x, z, new Runnable() {
++            @Override
++            public void run() {
++                callback.onLoad(cps.getChunkAt(x, z).bukkitChunk);
++            }
++        });*/
++    }
++
++    public void getChunkAtAsync(Block block, ChunkLoadCallback callback) {
++        getChunkAtAsync(block.getX() >> 4, block.getZ() >> 4, callback);
++    }
++
++    public void getChunkAtAsync(Location location, ChunkLoadCallback callback) {
++        getChunkAtAsync(location.getBlockX() >> 4, location.getBlockZ() >> 4, callback);
++    }
++    // Paper end
++
+     public Chunk getChunkAt(int x, int z) {
+         return this.world.getChunkProviderServer().getChunkAt(x, z).bukkitChunk;
+     }
+--

Spigot-Server-Patches/Add-config-to-disable-ender-dragon-legacy-check.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add config to disable ender dragon legacy check
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ef4bfb480..1607619bd 100644
+index ddb5ced79..270138804 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {

Spigot-Server-Patches/Add-configurable-despawn-distances-for-living-entiti.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable despawn distances for living entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1d9dd0e0b..22c1113a1 100644
+index de8680e4d..02f7e506e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -30,7 +30,7 @@ index 1d9dd0e0b..22c1113a1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 27b01d1ee..c8c191667 100644
+index 3744d01ec..27c97530f 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {

Spigot-Server-Patches/Add-configurable-portal-search-radius.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable portal search radius
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0743db5ac..1ba09df9c 100644
+index 7d1f6cde9..c98286999 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {

Spigot-Server-Patches/Add-configuration-option-to-prevent-player-names-fro.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ea6fcb39f..dbafef023 100644
+index 644e011017..329950802f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ public class PaperConfig {
@@ -20,7 +20,7 @@ index ea6fcb39f..dbafef023 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1b6a849e2..470e334f7 100644
+index 35b26d6128..8412e71d71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/Add-exception-reporting-event.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event
 
 diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
 new file mode 100644
-index 000000000..93397188b
+index 0000000000..93397188b7
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
 @@ -0,0 +0,0 @@
@@ -50,7 +50,7 @@ index 000000000..93397188b
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 2d55abd7a..7ea4b9b5c 100644
+index 0d80d811a3..e3f7ec6100 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@
@@ -98,7 +98,7 @@ index 2d55abd7a..7ea4b9b5c 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 51bc23daf..bb96a7392 100644
+index d025d949e3..0e04d65981 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ import java.util.concurrent.ExecutionException;
@@ -140,7 +140,7 @@ index 51bc23daf..bb96a7392 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index 33e5aaf2c..f13534917 100644
+index 33e5aaf2c0..f135349174 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -0,0 +0,0 @@
@@ -167,7 +167,7 @@ index 33e5aaf2c..f13534917 100644
                         }
                          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PersistentCollection.java b/src/main/java/net/minecraft/server/PersistentCollection.java
-index 0ffca4301..86d8fd0d9 100644
+index 6b5600ba5f..72f3867203 100644
 --- a/src/main/java/net/minecraft/server/PersistentCollection.java
 +++ b/src/main/java/net/minecraft/server/PersistentCollection.java
 @@ -0,0 +0,0 @@
@@ -194,7 +194,7 @@ index 0ffca4301..86d8fd0d9 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 94364baae..c80d724f0 100644
+index 31899549d5..cc7cad8be4 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -0,0 +0,0 @@
@@ -221,7 +221,7 @@ index 94364baae..c80d724f0 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index d394645a5..384628ccc 100644
+index 0e91aeec38..ff473a263f 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -0,0 +0,0 @@
@@ -240,7 +240,7 @@ index d394645a5..384628ccc 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index aec9cdae5..6d842df62 100644
+index b12e767db9..342a15db5e 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -0,0 +0,0 @@ import org.apache.logging.log4j.LogManager;
@@ -268,7 +268,7 @@ index aec9cdae5..6d842df62 100644
                              }
  
 diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index 4ff243dab..67b2e41c7 100644
+index 4ff243dabe..67b2e41c7c 100644
 --- a/src/main/java/net/minecraft/server/VillageSiege.java
 +++ b/src/main/java/net/minecraft/server/VillageSiege.java
 @@ -0,0 +0,0 @@
@@ -288,7 +288,7 @@ index 4ff243dab..67b2e41c7 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 26b2a1fd4..d51ed0f80 100644
+index 30cafca041..fa75ed4963 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@
@@ -325,7 +325,7 @@ index 26b2a1fd4..d51ed0f80 100644
                          this.tileEntityListTick.remove(tileTickPosition--);
                          continue;
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 93b9134d6..26753fac5 100644
+index 93b9134d6e..26753fac5e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -0,0 +0,0 @@ import java.util.concurrent.atomic.AtomicReference;

Spigot-Server-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/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 9e2fc4947..4b9ecb4a6 100644
+index e06ac23852..6f1659b221 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -0,0 +0,0 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {

Spigot-Server-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/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 1620d9a74e..506d0d4e48 100644
+index 9079f5e903..b25ce0c58f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

Spigot-Server-Patches/Add-missing-coverages-for-getTileEntity-in-order-to-.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e766e2536..c5da2cde3 100644
+index 8f6ce6bf1a..5d5f6f6328 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {

Spigot-Server-Patches/Add-option-to-make-parrots-stay-on-shoulders-despite.patch

@@ -11,7 +11,7 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0b748d402..99fe720e8 100644
+index 4991138dfe..87c599338a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -26,7 +26,7 @@ index 0b748d402..99fe720e8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 83bfb6611..0486dee2c 100644
+index 06b663c4db..42c6249535 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,7 +39,7 @@ index 83bfb6611..0486dee2c 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index aa93b5945..383ef87ba 100644
+index 08ef17dfe1..d4701d8d56 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

Spigot-Server-Patches/Add-option-to-remove-invalid-statistics.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to remove invalid statistics
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 459c86bce..ea6fcb39f 100644
+index 315d85090..644e01101 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 459c86bce..ea6fcb39f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 172f72fd8..7ba12c23d 100644
+index 07e7db455..34c57e26f 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 @@ -0,0 +0,0 @@ public class ServerStatisticManager extends StatisticManager {

Spigot-Server-Patches/Add-server-name-parameter.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index d9059129d..aad208f47 100644
+index 38e696aa94..c552c624e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -0,0 +0,0 @@ public class Main {

Spigot-Server-Patches/Add-setting-for-proxy-online-mode-status.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add setting for proxy online mode status
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 011cbf5e3..cf06f8ac3 100644
+index 5538dfd9d8..0e5773bae4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index 011cbf5e3..cf06f8ac3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index f13534917..85c7a96c5 100644
+index f135349174..85c7a96c5a 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -0,0 +0,0 @@ public class NameReferencingFileConverter {
@@ -33,7 +33,7 @@ index f13534917..85c7a96c5 100644
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 06b59657f..6c7151536 100644
+index 761db58b29..3bbf9b0189 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/Add-some-Debug-to-Chunk-Entity-slices.patch

@@ -0,0 +1,75 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Mon, 23 Jul 2018 22:44:23 -0400
+Subject: [PATCH] Add some Debug to Chunk Entity slices
+
+If we detect unexpected state, log and try to recover
+
+This should hopefully avoid duplicate entities ever being created
+if the entity was to end up in 2 different chunk slices
+
+diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
+index aa75cc4205..56a74c6062 100644
+--- a/src/main/java/net/minecraft/server/Chunk.java
++++ b/src/main/java/net/minecraft/server/Chunk.java
+@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
+         entity.ae = this.locX;
+         entity.af = k;
+         entity.ag = this.locZ;
+-        this.entitySlices[k].add(entity);
++
+         // Paper start
++        List<Entity> entitySlice = this.entitySlices[k];
++        boolean inThis = entitySlice.contains(entity);
++        if (entity.entitySlice != null || inThis) {
++            if (entity.entitySlice == entitySlice || inThis) {
++                LogManager.getLogger().warn(entity + " was already in this chunk section! Report this to https://github.com/PaperMC/Paper/issues/1223");
++                new Throwable().printStackTrace();
++                return;
++            } else {
++                LogManager.getLogger().warn(entity + " is still in another ChunkSection! Report this to https://github.com/PaperMC/Paper/issues/1223");
++
++                Chunk chunk = entity.getCurrentChunk();
++                if (chunk != null) {
++                    if (chunk != this) {
++                        LogManager.getLogger().warn(entity + " was in another chunk at that! " + chunk.locX + "," + chunk.locZ);
++                    }
++                    chunk.removeEntity(entity);
++                } else {
++                    removeEntity(entity);
++                }
++                new Throwable().printStackTrace();
++            }
++        }
++        entity.entitySlice = entitySlice;
++        entitySlice.add(entity);
++
+         this.markDirty();
+         if (entity instanceof EntityItem) {
+             itemCounts[k]++;
+@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
+         if (!this.entitySlices[i].remove(entity)) {
+             return;
+         }
++        if (entitySlices[i] == entity.entitySlice) {
++            entity.entitySlice = null;
++        } else {
++            LogManager.getLogger().warn(entity + " was removed from a entitySlice we did not expect. Report this to https://github.com/PaperMC/Paper/issues/1223");
++            new Throwable().printStackTrace();
++        }
+         this.markDirty();
+         if (entity instanceof EntityItem) {
+             itemCounts[i]--;
+diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+index e657778469..85358902ff 100644
+--- a/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/server/Entity.java
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+             }
+         }
+     };
++    Object entitySlice = null;
+     // Paper end
+     static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
+         return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
+--

Spigot-Server-Patches/Add-system-property-to-disable-book-size-limits.patch

@@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without
 limiting incoming data from packets in some other way.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index 6ff1a2dcd..64a939952 100644
+index 6ff1a2dcd6..64a9399527 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -0,0 +0,0 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {

Spigot-Server-Patches/Add-velocity-warnings.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 703d38f0c..a9d60b8d2 100644
+index d7e77a849a..e701b37cb4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {
@@ -17,7 +17,7 @@ index 703d38f0c..a9d60b8d2 100644
      private final class BooleanWrapper {
          private boolean value = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 34246369c..03a3328b0 100644
+index 34246369c5..03a3328b06 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -66,7 +66,7 @@ index 34246369c..03a3328b0 100644
      public double getHeight() {
          return getHandle().length;
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 91b8aa6a1..0c106ea9c 100644
+index 91b8aa6a16..0c106ea9c5 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -0,0 +0,0 @@ public class WatchdogThread extends Thread

Spigot-Server-Patches/All-chunks-are-slime-spawn-chunks-toggle.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] All chunks are slime spawn chunks toggle
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 43aa73e1d..0743db5ac 100644
+index d91b48b0a..7d1f6cde9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 43aa73e1d..0743db5ac 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index 3167c3f5f..3b13b697a 100644
+index 31e066b54..eeaf98e82 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -0,0 +0,0 @@ public class EntitySlime extends EntityInsentient implements IMonster {

Spigot-Server-Patches/Allow-Reloading-of-Command-Aliases.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6c7151536..1b6a849e2 100644
+index 3bbf9b0189..35b26d6128 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/Allow-Reloading-of-Custom-Permissions.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4db5aacc4..1c9637ff7 100644
+index 030d68a704..83364efb50 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/Allow-for-toggling-of-spawn-chunks.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow for toggling of spawn chunks
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 22c1113a1..0094d1a87 100644
+index 02f7e506e..cef0c47ac 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 22c1113a1..0094d1a87 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e6b916a5d..05d363171 100644
+index 562a85b72..6ca7a2069 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

Spigot-Server-Patches/Allow-nerfed-mobs-to-jump.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow nerfed mobs to jump
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 45bddf3f4..1d9dd0e0b 100644
+index cacf58607..de8680e4d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -31,7 +31,7 @@ index 4ed5192c6..489beed26 100644
          this.b.o(this.a);
          this.a = false;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 5de20721c..27b01d1ee 100644
+index d24ff109c..3744d01ec 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -56,7 +56,7 @@ index 5de20721c..27b01d1ee 100644
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
-index 4d8876cae..2cb9d1b5a 100644
+index 0d9505138..38a0b2db1 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 @@ -0,0 +0,0 @@ public class PathfinderGoalFloat extends PathfinderGoal {
@@ -65,15 +65,12 @@ index 4d8876cae..2cb9d1b5a 100644
          this.a = entityinsentient;
 +        if (entityinsentient.getWorld().paperConfig.nerfedMobsShouldJump) entityinsentient.goalFloat = this; // Paper
          this.a(4);
-         if (entityinsentient.getNavigation() instanceof Navigation) {
-             ((Navigation) entityinsentient.getNavigation()).c(true);
-@@ -0,0 +0,0 @@ public class PathfinderGoalFloat extends PathfinderGoal {
- 
+         entityinsentient.getNavigation().d(true);
      }
  
 +    public boolean validConditions() { return this.a(); } // Paper - OBFHELPER
      public boolean a() {
-         return this.a.isInWater() || this.a.ax();
+         return this.a.isInWater() && this.a.bY() > 0.4D || this.a.ax();
      }
  
 +    public void update() { this.e(); } // Paper - OBFHELPER

Spigot-Server-Patches/Allow-spawning-Item-entities-with-World.spawnEntity.patch

@@ -8,7 +8,7 @@ This API has more capabilities than .dropItem with the Consumer function
 Item can be set inside of the Consumer pre spawn function.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1afb480f8..f7eaecb3f 100644
+index 62638d4e25..affbb93bfd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -0,0 +0,0 @@ public class CraftWorld implements World {

Spigot-Server-Patches/Allow-specifying-a-custom-authentication-servers-dow.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index dbafef023..ec89ecfca 100644
+index 329950802f..7a2c703022 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@
@@ -27,7 +27,7 @@ index dbafef023..ec89ecfca 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index bab13a4fd..d0e719f44 100644
+index 005efbc111..6249b0e686 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -0,0 +0,0 @@ public class LoginListener implements PacketLoginInListener, ITickable {

Spigot-Server-Patches/AsyncTabCompleteEvent.patch

@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7e96c4eb4..ab2bd6dae 100644
+index bfaeaa7559..90ac83b5b1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -24,8 +24,8 @@ index 7e96c4eb4..ab2bd6dae 100644
 -        PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer());
 +        // PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer()); // Paper - run this async
          // CraftBukkit start
-         if (chatSpamField.addAndGet(this, 5) > 500 && !this.minecraftServer.getPlayerList().isOp(this.player.getProfile())) {
--            this.disconnect(new ChatMessage("disconnect.spam", new Object[0]));
+         if (chatSpamField.addAndGet(this, 2) > 500 && !this.minecraftServer.getPlayerList().isOp(this.player.getProfile())) {
+             this.disconnect(new ChatMessage("disconnect.spam", new Object[0]));
 +            minecraftServer.postToMainThread(() -> this.disconnect(new ChatMessage("disconnect.spam", new Object[0]))); // Paper
              return;
          }
@@ -85,7 +85,7 @@ index 7e96c4eb4..ab2bd6dae 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0ef1186b9..d605e5792 100644
+index 213eb3f4aa..ed8d0de9fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {
@@ -98,7 +98,7 @@ index 0ef1186b9..d605e5792 100644
  
          return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 1e3aae3b8..95d13c146 100644
+index 1e3aae3b8f..95d13c146b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -0,0 +0,0 @@ public class ConsoleCommandCompleter implements Completer {

Spigot-Server-Patches/Auto-Save-Improvements.patch

@@ -12,7 +12,7 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
 Adds incremental player auto saving too
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 621c585e7..459c86bce 100644
+index 4bdb0a5f9c..315d85090a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ public class PaperConfig {
@@ -32,7 +32,7 @@ index 621c585e7..459c86bce 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0e6c18b32..c182ceffb 100644
+index ec6b550ff6..499230af60 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ package com.destroystokyo.paper;
@@ -64,9 +64,21 @@ index 0e6c18b32..c182ceffb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 6c6924937..5163bd11b 100644
+index c27073d27c..06d6814b83 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
+@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
+     private final TickList<Block> t;
+     private final TickList<FluidType> u;
+     private boolean v;
+-    private boolean w;
++    private boolean w; public boolean hasEntities() { return w; } // Paper - OBFHELPER
+     private long lastSaved;
+-    private boolean y;
++    private boolean y; public boolean isModified() { return y; } // Paper - OBFHELPER
+     private int z;
+     private long A; public long getInhabitedTime() { return A; } // Paper - OBFHELPER
+     private int B;
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
              if (this.w && this.world.getTime() != this.lastSaved || this.y) {
                  return true;
@@ -76,13 +88,15 @@ index 6c6924937..5163bd11b 100644
          }
 -
 -        return this.y;
-+        // This !flag section should say if y(isModified) or w(hasEntities), then check auto save
-+        return ((this.y || this.w) && this.world.getTime() >= this.lastSaved + world.paperConfig.autoSavePeriod); // Paper - Make world configurable and incremental
++        // Paper start - Make world configurable and incremental
++        // This !flag section should say if isModified or hasEntities, then check auto save
++        return ((isModified() || hasEntities()) && this.world.getTime() >= this.lastSaved + world.paperConfig.autoSavePeriod);
++        // Paper end
      }
  
      public boolean isEmpty() {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 2e72a294d..1e6ea3084 100644
+index a5139b0b0d..aa8d25e765 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@
@@ -102,7 +116,7 @@ index 2e72a294d..1e6ea3084 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5aafa4e23..f5fae7ba8 100644
+index 982e18f8af..1879c32381 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -114,17 +128,17 @@ index 5aafa4e23..f5fae7ba8 100644
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 49b2c27c6..bf020293d 100644
+index d25e5c508a..3447afcad8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
+     public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
+     public ConsoleReader reader;
+     public static int currentTick = 0; // Paper - Further improve tick loop
++    public boolean serverAutoSave = false; // Paper
+     public final Thread primaryThread;
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
-     public File bukkitDataPackFolder;
-+    public boolean serverAutoSave = false; // Paper
-     // CraftBukkit end
-     // Spigot start
-     public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
              this.n.b().a(agameprofile);
          }
@@ -161,7 +175,7 @@ index 49b2c27c6..bf020293d 100644
          this.methodProfiler.a("snooper");
          if (getSnooperEnabled() && !this.j.d() && this.ticks > 100) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 6b7d81933..3ee587014 100644
+index d0c547cc99..12f6812d67 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
@@ -200,7 +214,7 @@ index 6b7d81933..3ee587014 100644
      public WhiteList getWhitelist() {
          return this.whitelist;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e3d62fc9c..72b3a6d40 100644
+index 96002184bb..bf07155bc1 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {

Spigot-Server-Patches/Auto-fix-bad-Y-levels-on-player-login.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f5fae7ba8..dc32dc80d 100644
+index 1879c32381..b76c28147b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

Spigot-Server-Patches/Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch

@@ -10,7 +10,7 @@ to the object directly on the Entity/TileEntity object we can directly grab.
 Use that local value instead to reduce lookups in many hot places.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 2612d4207..b3cdc0b7d 100644
+index 7a7d656926..b37fa3829b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@@ -22,7 +22,7 @@ index 2612d4207..b3cdc0b7d 100644
          this.a(entity, entity.af);
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d8ce3efc9..35db0e184 100644
+index 00eb342f8c..127dcedc97 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

Spigot-Server-Patches/Avoid-NPE-in-PathfinderGoalTempt.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Avoid NPE in PathfinderGoalTempt
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
-index 154202700..64b1ac71b 100644
+index 8ca996e652..1b82479418 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 @@ -0,0 +0,0 @@ public class PathfinderGoalTempt extends PathfinderGoal {

Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation
 Per Paper issue 294
 
 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
-index be8d07f41..9808561eb 100644
+index be8d07f41e..9808561eb3 100644
 --- a/src/main/java/net/minecraft/server/ServerConnection.java
 +++ b/src/main/java/net/minecraft/server/ServerConnection.java
 @@ -0,0 +0,0 @@ public class ServerConnection {

Spigot-Server-Patches/Avoid-hopper-searches-if-there-are-no-items.patch

@@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 Combined, this adds up a lot.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index b0060c363..2d55abd7a 100644
+index 39aeabff74..ea7d82f099 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@@ -38,7 +38,7 @@ index b0060c363..2d55abd7a 100644
 +            inventoryEntityCounts[k]++;
 +        }
          entity.setCurrentChunk(this);
-         entityCounts.increment(entity.entityKeyString);
+         entityCounts.increment(entity.getMinecraftKeyString());
          // Paper end
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
          if (!this.entitySlices[i].remove(entity)) {
@@ -50,7 +50,7 @@ index b0060c363..2d55abd7a 100644
 +            inventoryEntityCounts[i]--;
 +        }
          entity.setCurrentChunk(null);
-         entityCounts.decrement(entity.entityKeyString);
+         entityCounts.decrement(entity.getMinecraftKeyString());
          // Paper end
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
              if (!this.entitySlices[k].isEmpty()) {

Spigot-Server-Patches/Basic-PlayerProfile-API.patch

@@ -7,7 +7,7 @@ Establishes base extension of profile systems for future edits too
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 new file mode 100644
-index 000000000..9ad5853de
+index 0000000000..9ad5853de3
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 @@ -0,0 +0,0 @@
@@ -294,7 +294,7 @@ index 000000000..9ad5853de
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 new file mode 100644
-index 000000000..25836b975
+index 0000000000..25836b975b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 @@ -0,0 +0,0 @@
@@ -330,7 +330,7 @@ index 000000000..25836b975
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 new file mode 100644
-index 000000000..3bcdb8f93
+index 0000000000..3bcdb8f93f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -0,0 +0,0 @@
@@ -353,7 +353,7 @@ index 000000000..3bcdb8f93
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 new file mode 100644
-index 000000000..4b2a67423
+index 0000000000..4b2a67423f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -0,0 +0,0 @@
@@ -388,7 +388,7 @@ index 000000000..4b2a67423
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 new file mode 100644
-index 000000000..3aceb0ea8
+index 0000000000..3aceb0ea8a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 @@ -0,0 +0,0 @@
@@ -404,7 +404,7 @@ index 000000000..3aceb0ea8
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 02940d697..4539b5601 100644
+index 381542e0d2..80927de08b 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -0,0 +0,0 @@
@@ -429,7 +429,7 @@ index 02940d697..4539b5601 100644
       * Calculates distance between 2 entities
       * @param e1
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 39a8b1d69..4654e22c8 100644
+index 41ee97b1a4..8e72220f37 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -450,7 +450,7 @@ index 39a8b1d69..4654e22c8 100644
          return this.V;
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index a47a51a41..4c476f757 100644
+index a47a51a412..4c476f757c 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -0,0 +0,0 @@ public class UserCache {
@@ -486,7 +486,7 @@ index a47a51a41..4c476f757 100644
  
          private UserCacheEntry(GameProfile gameprofile, Date date) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 69cfe5c4d..0ef1186b9 100644
+index ca696b2417..213eb3f4aa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.util.CraftNamespacedKey;

Spigot-Server-Patches/Be-a-bit-more-informative-in-maxHealth-exception.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 13100e5d21..1620d9a74e 100644
+index ae402a2bf4..9079f5e903 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

Spigot-Server-Patches/Block-Enderpearl-Travel-Exploit.patch

@@ -12,7 +12,7 @@ This disables that by not saving the thrower when the chunk is unloaded.
 This is mainly useful for survival servers that do not allow freeform teleporting.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b07ff9587..f1db4becd 100644
+index 9daa8f66a..3467da7c8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {

Spigot-Server-Patches/Block-player-logins-during-server-shutdown.patch

@@ -5,13 +5,13 @@ Subject: [PATCH] Block player logins during server shutdown
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 89a11a496..bab13a4fd 100644
+index b6e8296824..85eff6e2dd 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -0,0 +0,0 @@ public class LoginListener implements PacketLoginInListener, ITickable {
      }
  
-     public void X_() {
+     public void Y_() {
 +        // Paper start - Do not allow logins while the server is shutting down
 +        if (!MinecraftServer.getServer().isRunning()) {
 +            this.disconnect(new ChatMessage(org.spigotmc.SpigotConfig.restartMessage));

Spigot-Server-Patches/Bound-Treasure-Maps-to-World-Border.patch

@@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.
 
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 263ea953a..8b8b468f3 100644
+index 263ea953ad..8b8b468f39 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -0,0 +0,0 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
@@ -23,7 +23,7 @@ index 263ea953a..8b8b468f3 100644
  
                                  if (structurestart != StructureGenerator.a) {
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index ec5386fd5..08424a88b 100644
+index ec5386fd50..08424a88bf 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -0,0 +0,0 @@ public class WorldBorder {

Spigot-Server-Patches/Cache-user-authenticator-threads.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Cache user authenticator threads
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 2f6d79b03..89a11a496 100644
+index eb936a0445..fae8a13973 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -0,0 +0,0 @@ public class LoginListener implements PacketLoginInListener, ITickable {

Spigot-Server-Patches/Call-PaperServerListPingEvent-for-legacy-pings.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 new file mode 100644
-index 000000000..74c012fd4
+index 0000000000..74c012fd40
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 @@ -0,0 +0,0 @@
@@ -84,7 +84,7 @@ index 000000000..74c012fd4
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index 07c53f505..91acfceec 100644
+index 07c53f5057..91acfceec8 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -0,0 +0,0 @@ import java.net.InetSocketAddress;

Spigot-Server-Patches/Call-PortalCreateEvent-for-exit-portals.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Call PortalCreateEvent for exit portals
 
 
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 402d8d7d6..f36373450 100644
+index 402d8d7d63..f363734500 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -0,0 +0,0 @@ package net.minecraft.server;

Spigot-Server-Patches/Cap-Entity-Collisions.patch

@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5df8b1143f..0b748d402b 100644
+index b95f259a9..4991138df 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 5df8b1143f..0b748d402b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b47bf97387..db7e37aee6 100644
+index 78b7b8be9..6db20aa75 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index b47bf97387..db7e37aee6 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 9f493e43d4..fc0e440798 100644
+index f9a76ce27..3b4867bfc 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {

Spigot-Server-Patches/Chunk-Save-Reattempt.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt
 We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 8701777cc..ad3bd3808 100644
+index b247d5f07..f007af2e1 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -28,7 +28,7 @@ index 8701777cc..ad3bd3808 100644
  
                  flag = true;
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index c80d724f0..3f9aa5923 100644
+index cc7cad8be..b8b514c87 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -0,0 +0,0 @@ public class RegionFile {

Spigot-Server-Patches/Chunk-Save-Stats-Debug-Option.patch

@@ -8,7 +8,7 @@ Adds a command line flag to enable stats on how chunk saves are processing.
 Stats on current queue, how many was processed and how many were queued.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 9145401bc..ef35eb7ec 100644
+index c1a42e61e7..c96f1b2753 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -55,7 +55,7 @@ index 9145401bc..ef35eb7ec 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 20aa20a98..de2231bb0 100644
+index 859148cb86..ea8684747d 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {

Spigot-Server-Patches/Chunk-registration-fixes.patch

@@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 067b92f3e..04b5521cd 100644
+index 45ab70167a..5d3378be0b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

Spigot-Server-Patches/Chunk-save-queue-improvements.patch

@@ -26,7 +26,7 @@ Then finally, Sleeping will by default be removed, but due to known issues with
 But if sleeps are to remain enabled, we at least lower the sleep interval so it doesn't have as much negative impact.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 36689db74..3898ad8fa 100644
+index d48ef7e85..280cfd553 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ public class PaperConfig {
@@ -41,7 +41,7 @@ index 36689db74..3898ad8fa 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 3a0e52d88..8701777cc 100644
+index 5001fd11d..b247d5f07 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +0,0 @@ import java.util.function.Consumer;
@@ -75,21 +75,6 @@ index 3a0e52d88..8701777cc 100644
      private final File c;
      private final DataFixer d;
      private PersistentStructureLegacy e;
-@@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
-                     }
-                 };
-             } else {
--                if (this.b.containsKey(chunkcoordintpair) && this.a(this.b.get(chunkcoordintpair).get()) == ChunkStatus.Type.LEVELCHUNK || this.a(this.b(world, chunkcoordintpair.x, chunkcoordintpair.z)) == ChunkStatus.Type.LEVELCHUNK) {
-+                // Paper start
-+                Supplier<NBTTagCompound> existingSave;
-+                synchronized (this) {
-+                    existingSave = this.b.get(chunkcoordintpair);
-+                }
-+                if (existingSave != null && this.a(existingSave.get()) == ChunkStatus.Type.LEVELCHUNK || this.a(this.b(world, chunkcoordintpair.x, chunkcoordintpair.z)) == ChunkStatus.Type.LEVELCHUNK) { // Paper - extract existingSave to synchronized lookup
-+                    // Paper end
-                     return;
-                 }
- 
 @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                      }
                  };

Spigot-Server-Patches/Configurable-Allowance-of-Permanent-Chunk-Loaders.patch

@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Sat, 21 Apr 2018 11:21:48 -0400
+Subject: [PATCH] Configurable Allowance of Permanent Chunk Loaders
+
+This disables the behavior that allows players to keep chunks permanently loaded
+by default and allows server operators to enable it if they wish.
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+index ba6d5b7ff5..b9f5f49055 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+@@ -0,0 +0,0 @@ public class PaperWorldConfig {
+                 break;
+         }
+     }
++    public boolean allowPermaChunkLoaders = false;
++    private void allowPermaChunkLoaders() {
++        allowPermaChunkLoaders = getBoolean("game-mechanics.allow-permanent-chunk-loaders", allowPermaChunkLoaders);
++        log("Allow Perma Chunk Loaders: " + (allowPermaChunkLoaders ? "enabled" : "disabled"));
++    }
+ }
+diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
+index 7d77c5fb31..fd8430a68f 100644
+--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
++++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
+@@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
+         Long2ObjectMap long2objectmap = this.chunks;
+ 
+         synchronized (this.chunks) {
+-            Chunk chunk = this.getLoadedChunkAt(i, j);
++            Chunk chunk = world.paperConfig.allowPermaChunkLoaders ? getLoadedChunkAt(i, j) : getChunkIfLoaded(i, j); // Paper - Configurable perma chunk loaders
+ 
+             return chunk != null ? chunk : this.loadChunkAt(i, j);
+         }
+--

Spigot-Server-Patches/Configurable-Alternative-LootPool-Luck-Formula.patch

@@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas.
 I would love to see this change in Vanilla, so Mojang please pull :)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b602bbf12..62bce1806 100644
+index 03846919f..5a17ce3d2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ public class PaperConfig {

Spigot-Server-Patches/Configurable-Bed-Search-Radius.patch

@@ -10,7 +10,7 @@ player at their bed should it of became obstructed.
 Defaults to vanilla 1.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1607619bd..692206127 100644
+index 270138804..7bd7aa0d9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {

Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch

@@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f64a5ef35..5df8b1143 100644
+index 872001d04..b95f259a9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index f64a5ef35..5df8b1143 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index abfd9adbd..dcc14aa11 100644
+index 45df38bad..e8fdf8625 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -0,0 +0,0 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {

Spigot-Server-Patches/Configurable-Chunk-IO-Thread-Base-Count.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable Chunk IO Thread Base Count
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b5795b6d3..36689db74 100644
+index e4ed7d674..d48ef7e85 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ public class PaperConfig {

Spigot-Server-Patches/Configurable-Chunk-Inhabited-Timer.patch

@@ -9,7 +9,7 @@ aspects of vanilla gameplay to this factor.
 For people who want all chunks to be treated equally, you can disable the timer.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1c2209270..17fb883f6 100644
+index b3b3baddc..613964ce0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -23,7 +23,7 @@ index 1c2209270..17fb883f6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 1c0580f79..744b5bc6d 100644
+index 5d1812ab0..695c6d3b7 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {

Spigot-Server-Patches/Configurable-Chunks-Sends-per-Tick-setting.patch

@@ -8,7 +8,7 @@ Vanilla already had this limited, make it configurable.
 Limit how much exploration lags the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 605e84173..703642c0b 100644
+index 1c642e636..87c0feb25 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {

Spigot-Server-Patches/Configurable-Disabling-Cat-Chest-Detection.patch

@@ -1,11 +1,12 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
-Subject: [PATCH] Disable chest cat detection
+Subject: [PATCH] Configurable Disabling Cat Chest Detection
 
+Offers a gameplay feature to stop cats from blocking chests
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 26d8dbb60..43aa73e1d 100644
+index f8d2aae08..d91b48b0a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -19,7 +20,7 @@ index 26d8dbb60..43aa73e1d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
-index d55122c66..f8be07258 100644
+index 0f6902747..1ad39aca3 100644
 --- a/src/main/java/net/minecraft/server/BlockChest.java
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
 @@ -0,0 +0,0 @@ public class BlockChest extends BlockTileEntity implements IFluidSource, IFluidC

Spigot-Server-Patches/Configurable-Grass-Spread-Tick-Rate.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable Grass Spread Tick Rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 17fb883f6..eb09be512 100644
+index 613964ce0..bb1c1c57c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {

Spigot-Server-Patches/Configurable-Keep-Spawn-Loaded-range-per-world.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index eb09be512..6ac58e5ec 100644
+index bb1c1c57cc..667a0dde8c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index eb09be512..6ac58e5ec 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1027b0588..b7aa9e869 100644
+index 96d31f8749..071a1e30f7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -37,9 +37,33 @@ index 1027b0588..b7aa9e869 100644
 +                    // Paper end
                      arraylist.add(new ChunkCoordIntPair(blockposition.getX() + i >> 4, blockposition.getZ() + j >> 4));
                  }
++            } // Paper
++            if (this.isRunning()) { // Paper
++                int expected = arraylist.size(); // Paper
++
+ 
+                 CompletableFuture completablefuture = worldserver.getChunkProviderServer().a((Iterable) arraylist, (chunk) -> {
+                     set.add(chunk.getPos());
++                    if (set.size() < expected && set.size() % 25 == 0) this.a(new ChatMessage("menu.preparingSpawn", new Object[0]), set.size() * 100 / expected); // Paper
+                 });
+ 
+                 while (!completablefuture.isDone()) {
+@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
+ 
+                         throw new RuntimeException(executionexception.getCause());
+                     } catch (TimeoutException timeoutexception) {
+-                        this.a(new ChatMessage("menu.preparingSpawn", new Object[0]), set.size() * 100 / 625);
++                        this.a(new ChatMessage("menu.preparingSpawn", new Object[0]), set.size() * 100 / expected); // Paper
+                     }
+                 }
+ 
+-                this.a(new ChatMessage("menu.preparingSpawn", new Object[0]), set.size() * 100 / 625);
++                this.a(new ChatMessage("menu.preparingSpawn", new Object[0]), set.size() * 100 / expected); // Paper
+             }
+         }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index cc1492e4d..2c6774082 100644
+index 6ec1ee26dc..a4c8e62e22 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -54,7 +78,7 @@ index cc1492e4d..2c6774082 100644
  
      public void a(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f90dc11f2..06b59657f 100644
+index f3af4ba520..761db58b29 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {
@@ -67,7 +91,7 @@ index f90dc11f2..06b59657f 100644
              for (int j = -short1; j <= short1; j += 16) {
                  for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0b2a9d09d..ff3558363 100644
+index 29a5ac639e..e3e45ed48a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -0,0 +0,0 @@ public class CraftWorld implements World {

Spigot-Server-Patches/Configurable-Max-Chunk-Gens-per-Tick.patch

@@ -0,0 +1,109 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Mon, 1 Jan 2018 16:10:24 -0500
+Subject: [PATCH] Configurable Max Chunk Gens per Tick
+
+Limit the number of generations that can occur in a single tick, forcing them
+to be spread out more.
+
+Defaulting to 10 as an average generation is going to be 3-6ms, which means 10 will
+likely cause the server to lose TPS, but constrain how much.
+
+This should result in no noticeable speed reduction in generation for servers not
+lagging, and let larger servers reduce this value according to their own desires.
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+index 87c0feb25..f3ab146d3 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+@@ -0,0 +0,0 @@ public class PaperWorldConfig {
+         }
+         log("Max Chunk Sends Per Tick: " + maxChunkSendsPerTick);
+     }
++
++    public int maxChunkGensPerTick = 10;
++    private void maxChunkGensPerTick() {
++        maxChunkGensPerTick = getInt("max-chunk-gens-per-tick", maxChunkGensPerTick);
++        if (maxChunkGensPerTick <= 0) {
++            maxChunkGensPerTick = Integer.MAX_VALUE;
++            log("Max Chunk Gens Per Tick: Unlimited (NOT RECOMMENDED)");
++        } else {
++            log("Max Chunk Gens Per Tick: " + maxChunkGensPerTick);
++        }
++    }
+ }
+diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
+index 344b95233..fcd9f5491 100644
+--- a/src/main/java/net/minecraft/server/PlayerChunk.java
++++ b/src/main/java/net/minecraft/server/PlayerChunk.java
+@@ -0,0 +0,0 @@ public class PlayerChunk {
+     // CraftBukkit start - add fields
+     // You know the drill, https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/browse
+     // All may seem good at first, but there's deeper issues if you play for a bit
++    boolean chunkExists; // Paper
+     private boolean loadInProgress = false;
+     private Runnable loadedRunnable = new Runnable() {
+         public void run() {
+@@ -0,0 +0,0 @@ public class PlayerChunk {
+         this.playerChunkMap = playerchunkmap;
+         this.location = new ChunkCoordIntPair(i, j);
+         this.chunk = playerchunkmap.getWorld().getChunkProviderServer().getOrLoadChunkAt(i, j);
++        this.chunkExists = this.chunk != null || ChunkIOExecutor.hasQueuedChunkLoad(playerChunkMap.getWorld(), i, j); // Paper
+         markChunkUsed(); // Paper - delay chunk unloads
+     }
+ 
+diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
+index 9fd07f859..e29aaab2d 100644
+--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
++++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
+@@ -0,0 +0,0 @@ public class PlayerChunkMap {
+             // Spigot start
+             org.spigotmc.SlackActivityAccountant activityAccountant = this.world.getMinecraftServer().slackActivityAccountant;
+             activityAccountant.startActivity(0.5);
++            int chunkGensAllowed = world.paperConfig.maxChunkGensPerTick; // Paper
+             // Spigot end
+ 
+             Iterator iterator1 = this.h.iterator();
+@@ -0,0 +0,0 @@ public class PlayerChunkMap {
+ 
+                 if (playerchunk1.f() == null) {
+                     boolean flag = playerchunk1.a(PlayerChunkMap.b);
++                    // Paper start
++                    if (flag && !playerchunk1.chunkExists && chunkGensAllowed-- <= 0) {
++                        continue;
++                    }
++                    // Paper end
+ 
+                     if (playerchunk1.a(flag)) {
+                         iterator1.remove();
+diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
+index 9aaca21a7..f50d55c8e 100644
+--- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
++++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
+@@ -0,0 +0,0 @@ public class ChunkIOExecutor {
+     public static void tick() {
+         instance.finishActive();
+     }
++
++    // Paper start
++    public static boolean hasQueuedChunkLoad(World world, int x, int z) {
++        return instance.hasTask(new QueuedChunk(x, z, null, world, null));
++    }
++    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
+index 193c3621c..cf1258c55 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
+@@ -0,0 +0,0 @@ public final class AsynchronousExecutor<P, T, C, E extends Throwable> {
+     public void setActiveThreads(final int coreSize) {
+         pool.setCorePoolSize(coreSize);
+     }
++
++    // Paper start
++    public boolean hasTask(P parameter) throws IllegalStateException {
++        return tasks.get(parameter) != null;
++    }
++    // Paper end
+ }
+--