Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: fd28180e #479: Add LivingEntity#attack, LivingEntity#swingMainHand, LivingEntity#swingOffHand ae72ba3a SPIGOT-5591: Allow concurrent potion effects CraftBukkit Changes: 3d61a853 Fix formatting in CraftLivingEntity f7ab3055 #633: Add LivingEntity#attack, LivingEntity#swingMainHand, LivingEntity#swingOffHand d5ef2eab SPIGOT-5591: Allow concurrent potion effects 25a9a9ff SPIGOT-5592: Custom ChunkGenerator can cause bugged dirt 3f6d0de9 Make it clear in error messages that api-version above 1.13 is also supported
2020-02-25 18:57:15 +00:00 · 2020-02-25 18:57:15 +00:00 · b077005910
commit b077005910
parent 0809d6be3e
16 changed files with 77 additions and 77 deletions
--- a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@ -1,14 +1,14 @@
-From fce1924845cf533a2868e51bbd31ad9481d28349 Mon Sep 17 00:00:00 2001
+From ee3d57933edf4cda5071671e3780ad40d12e9157 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:47:27 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities


 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 88a93627..7d8f2447 100644
+index 203d135f1..52541e496 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -504,4 +504,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -531,4 +531,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
      * @param <T> the type of the passed value
      */
     <T> void setMemory(@NotNull MemoryKey<T> memoryKey, @Nullable T memoryValue);
--- a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch
+++ b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch
@ -1,11 +1,11 @@
-From 4b1878762d153ef4b7560fa69cc81fca1af5f7ff Mon Sep 17 00:00:00 2001
+From c7c6e0f77754ecb3b0a30e5f64b9003bfb66a76c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:43 -0500
 Subject: [PATCH] LivingEntity#setKiller


 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index f5969cad..7e8fc5b3 100644
+index 52541e496..ae712e76d 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -250,6 +250,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@ -23,7 +23,7 @@ index f5969cad..7e8fc5b3 100644
 +
     /**
      * Adds the given {@link PotionEffect} to the living entity.
-      * <p>
+      *
 -- 
-2.25.0.windows.1
+2.25.0

--- a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch
@ -1,14 +1,14 @@
-From 4f025823575c29539c54a5d3717c8fef62505445 Mon Sep 17 00:00:00 2001
+From 071b34424f1f8e21825f757bfe107f01e49cfb31 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:17:39 -0500
 Subject: [PATCH] Make shield blocking delay configurable


 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 371d342a..7f1f3dc6 100644
+index ae712e76d..896b1971c 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -527,5 +527,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -554,5 +554,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
      * @param arrows Number of arrows to stick in this entity
      */
     void setArrowsStuck(int arrows);
--- a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch
@ -1,4 +1,4 @@
-From fe8992128dc14ba54cd5cbdb4f5fc8ce0ed8cb6d Mon Sep 17 00:00:00 2001
+From 9758dc63e1ec45e75eae717081271ae78b16376c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:19:19 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item

 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 7f1f3dc6..6df0c2cc 100644
+index 896b1971c..4af8e680d 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -11,6 +11,7 @@ import org.bukkit.attribute.Attributable;
@ -17,7 +17,7 @@ index 7f1f3dc6..6df0c2cc 100644
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.projectiles.ProjectileSource;
-@@ -541,5 +542,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -568,5 +569,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
      * @param delay Delay in ticks
      */
     void setShieldBlockingDelay(int delay);
--- a/Spigot-API-Patches/0191-Entity-Jump-API.patch
+++ b/Spigot-API-Patches/0191-Entity-Jump-API.patch
@ -1,4 +1,4 @@
-From c3a9c52e09a66c5d9afc3f9a48959a7aad908d40 Mon Sep 17 00:00:00 2001
+From 2fc6fd345f199b0d123147ca13d441b86156c121 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Feb 2020 23:26:18 -0600
 Subject: [PATCH] Entity Jump API
@ -6,7 +6,7 @@ Subject: [PATCH] Entity Jump API

 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityJumpEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityJumpEvent.java
 new file mode 100644
-index 00000000..f0067c2e
+index 000000000..f0067c2e9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityJumpEvent.java
@@ -0,0 +1,46 @@
@ -57,10 +57,10 @@ index 00000000..f0067c2e
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 9bc026ab..e69702e6 100644
+index deab50525..7f73e4b92 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -684,5 +684,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -711,5 +711,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
      * @return Whether or not this entity is using or charging an attack (Bow pulled back, drinking potion, eating food)
      */
     boolean isHandRaised();
--- a/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch
@ -1,14 +1,14 @@
-From 9868dee937b6010be09250aef0f9c5f54adc6c29 Mon Sep 17 00:00:00 2001
+From 52d08106aaf038ff55713546beaec0f2a249710a Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 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 9c1d4e758..029c2d475 100644
+index 4f20003193..54c0dae5d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -105,7 +105,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -106,7 +106,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
     public void setHealth(double health) {
         health = (float) health;
         if ((health < 0) || (health > getMaxHealth())) {
@ -21,5 +21,5 @@ index 9c1d4e758..029c2d475 100644
 
         getHandle().setHealth((float) health);
 -- 
-2.25.0.windows.1
+2.25.0

--- a/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@ -1,14 +1,14 @@
-From fbd11428d86a6c70add046583c3aca83473053c6 Mon Sep 17 00:00:00 2001
+From f218eddcc79740ff53c5845807eb0119052129e6 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 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 029c2d475..7e9aff668 100644
+index 54c0dae5d1..e38f4f6910 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -611,4 +611,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -623,4 +623,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
     public <T> void setMemory(MemoryKey<T> memoryKey, T t) {
         getHandle().getBehaviorController().setMemory(CraftMemoryKey.fromMemoryKey(memoryKey), CraftMemoryMapper.toNms(t));
     }
@ -26,5 +26,5 @@ index 029c2d475..7e9aff668 100644
 +    // Paper end
 }
 -- 
-2.25.0.windows.1
+2.25.0

--- a/Spigot-Server-Patches/0170-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0170-LivingEntity-setKiller.patch
@ -1,11 +1,11 @@
-From 69f7c5a7365a083a5e7b5c7e445c6d5664c89e3e Mon Sep 17 00:00:00 2001
+From fb53514d89db2dc79214dc552cbe3ca476449886 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:48 -0500
 Subject: [PATCH] LivingEntity#setKiller


 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b31355f2b..c7b62872c 100644
+index b31355f2be..c7b62872c4 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity {
@ -18,10 +18,10 @@ index b31355f2b..c7b62872c 100644
     protected int ticksFarFromPlayer;
     protected float aR;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 7e9aff668..b8482c632 100644
+index e38f4f6910..23a4819992 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -317,6 +317,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -318,6 +318,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
         return getHandle().killer == null ? null : (Player) getHandle().killer.getBukkitEntity();
     }
 
@ -39,5 +39,5 @@ index 7e9aff668..b8482c632 100644
     public boolean addPotionEffect(PotionEffect effect) {
         return addPotionEffect(effect, false);
 -- 
-2.25.0.windows.1
+2.25.0

--- a/Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch
@ -1,11 +1,11 @@
-From b927a1aee8f1ba2e8209b7f737a9be471a002e11 Mon Sep 17 00:00:00 2001
+From 3109d7b6ee99e8e3db3f72dabf6a27de3261f18a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:18:16 -0500
 Subject: [PATCH] Make shield blocking delay configurable


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9c52e31f4..33ce9a500 100644
+index 9c52e31f4c..33ce9a5004 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -367,4 +367,9 @@ public class PaperWorldConfig {
@ -19,7 +19,7 @@ index 9c52e31f4..33ce9a500 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index fe0b08220..a738848ec 100644
+index fe0b082206..a738848ecd 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2998,7 +2998,7 @@ public abstract class EntityLiving extends Entity {
@ -48,10 +48,10 @@ index fe0b08220..a738848ec 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index b8482c632..67f275321 100644
+index 23a4819992..7d89c0e8e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -632,5 +632,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -644,5 +644,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
     public void setArrowsStuck(int arrows) {
         getHandle().setArrowCount(arrows);
     }
@ -68,5 +68,5 @@ index b8482c632..67f275321 100644
     // Paper end
 }
 -- 
-2.25.0.windows.1
+2.25.0

--- a/Spigot-Server-Patches/0238-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0238-LivingEntity-Hand-Raised-Item-Use-API.patch
@ -1,4 +1,4 @@
-From 6f38b65376127fff7e2c97dcbc7571677ac50af6 Mon Sep 17 00:00:00 2001
+From 62d366be402dc4ebd7d813e5e383d400202cfe46 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:21:28 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item

 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2196dbfce..fea821be1 100644
+index 2196dbfce9..fea821be1c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -112,7 +112,7 @@ public abstract class EntityLiving extends Entity {
@ -32,10 +32,10 @@ index 2196dbfce..fea821be1 100644
         return this.isHandRaised() ? this.activeItem.k() - this.dE() : 0;
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 67f275321..379239567 100644
+index 7d89c0e8e5..02346f1c50 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -642,5 +642,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -654,5 +654,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
     public void setShieldBlockingDelay(int delay) {
         getHandle().setShieldBlockingDelay(delay);
     }
@ -62,5 +62,5 @@ index 67f275321..379239567 100644
     // Paper end
 }
 -- 
-2.25.0.windows.1
+2.25.0

--- a/Spigot-Server-Patches/0291-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0291-Add-ray-tracing-methods-to-LivingEntity.patch
@ -1,11 +1,11 @@
-From 04f9f57fd8dc331a56ff4cb4095a9c1bbf657b98 Mon Sep 17 00:00:00 2001
+From cd7e912885165be1e5db3cc50802f5a8301a18be Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:20:03 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity


 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0b84ead5f..fa097e055 100644
+index 0b84ead5f2..fa097e0551 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3254,6 +3254,23 @@ public abstract class EntityLiving extends Entity {
@ -33,10 +33,10 @@ index 0b84ead5f..fa097e055 100644
 
     public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 379239567..6f4c6c589 100644
+index 02346f1c50..d197094f54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -195,6 +195,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -196,6 +196,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
         return blocks.get(0);
     }
 
@ -66,5 +66,5 @@ index 379239567..6f4c6c589 100644
     public List<Block> getLastTwoTargetBlocks(Set<Material> transparent, int maxDistance) {
         return getLineOfSight(transparent, maxDistance, 2);
 -- 
-2.25.0.windows.1
+2.25.0

--- a/Spigot-Server-Patches/0355-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0355-Add-LivingEntity-getTargetEntity.patch
@ -1,4 +1,4 @@
-From 70650bfa857e2488f4ac5c4aa24de157585a87ba Mon Sep 17 00:00:00 2001
+From a68a45cae725380fd68ee8a33e06f5abf22b249a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:33:08 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
@ -120,10 +120,10 @@ index c1f462d9d3..498f381099 100644
         return !entity.isSpectator();
     };
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 6f4c6c5891..b27fd44dcd 100644
+index d197094f54..6de01e4f0e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -215,6 +215,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -216,6 +216,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
             new com.destroystokyo.paper.block.TargetBlockInfo(org.bukkit.craftbukkit.block.CraftBlock.at(getHandle().world, ((net.minecraft.server.MovingObjectPositionBlock)rayTrace).getBlockPosition()),
                 net.minecraft.server.MCUtil.toBukkitBlockFace(((net.minecraft.server.MovingObjectPositionBlock)rayTrace).getDirection()));
     }
--- a/Spigot-Server-Patches/0387-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0387-Anti-Xray.patch
@ -1,11 +1,11 @@
-From 3be0f944a032e3df23b4fa0a960d3f8a8059ae27 Mon Sep 17 00:00:00 2001
+From 8bed72b22b6e498f8d8209d2a1700efcf92e8d94 Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Mon, 20 Aug 2018 03:03:58 +0200
 Subject: [PATCH] Anti-Xray


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 486761521..df24e3297 100644
+index 4867615215..df24e3297b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -1,7 +1,11 @@
@ -66,7 +66,7 @@ index 486761521..df24e3297 100644
 }
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java
 new file mode 100644
-index 000000000..f7e376ce6
+index 0000000000..f7e376ce6a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java
@@ -0,0 +1,46 @@
@ -118,7 +118,7 @@ index 000000000..f7e376ce6
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 new file mode 100644
-index 000000000..23626bef3
+index 0000000000..23626bef3a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
@@ -0,0 +1,782 @@
@ -906,7 +906,7 @@ index 000000000..23626bef3
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java
 new file mode 100644
-index 000000000..a68bace35
+index 0000000000..a68bace353
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java
@@ -0,0 +1,81 @@
@ -993,7 +993,7 @@ index 000000000..a68bace35
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java
 new file mode 100644
-index 000000000..067dfb2f1
+index 0000000000..067dfb2f14
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java
@@ -0,0 +1,31 @@
@ -1030,7 +1030,7 @@ index 000000000..067dfb2f1
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
 new file mode 100644
-index 000000000..cc586827a
+index 0000000000..cc586827aa
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
@@ -0,0 +1,56 @@
@ -1092,7 +1092,7 @@ index 000000000..cc586827a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
 new file mode 100644
-index 000000000..37093419c
+index 0000000000..37093419cf
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
@@ -0,0 +1,84 @@
@ -1181,7 +1181,7 @@ index 000000000..37093419c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 4d300699f..06b4dc628 100644
+index 4d300699f1..06b4dc6284 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -320,7 +320,7 @@ public class Chunk implements IChunkAccess {
@ -1194,7 +1194,7 @@ index 4d300699f..06b4dc628 100644
         }
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 961228e9d..a950ad801 100644
+index 961228e9df..a950ad801d 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -57,7 +57,7 @@ public class ChunkRegionLoader {
@ -1216,7 +1216,7 @@ index 961228e9d..a950ad801 100644
             protochunk.a(biomestorage);
             object = protochunk;
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 0d5deee36..4526527ac 100644
+index 0d5deee365..4526527aca 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
@@ -6,21 +6,31 @@ public class ChunkSection {
@ -1255,7 +1255,7 @@ index 0d5deee36..4526527ac 100644
 
     public IBlockData getType(int i, int j, int k) {
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 2c1d1b1a5..44aed6727 100644
+index 2c1d1b1a55..44aed67274 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
@@ -3,6 +3,7 @@ package net.minecraft.server;
@ -1377,7 +1377,7 @@ index 2c1d1b1a5..44aed6727 100644
 
         if (this.h == this.b) {
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index e156804f7..96a785af2 100644
+index e156804f7a..96a785af27 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -42,7 +42,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@ -1440,7 +1440,7 @@ index e156804f7..96a785af2 100644
     public void a() {
         this.o();
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 47710067a..ef7ade797 100644
+index 47710067a6..ef7ade797b 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
@@ -1,5 +1,6 @@
@ -1533,7 +1533,7 @@ index 47710067a..ef7ade797 100644
         }
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 5108d3ee9..b556a8fef 100644
+index 5108d3ee98..b556a8fefa 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -220,6 +220,11 @@ public class PlayerChunk {
@ -1558,7 +1558,7 @@ index 5108d3ee9..b556a8fef 100644
                 this.a(new PacketPlayOutMultiBlockChange(this.dirtyCount, this.dirtyBlocks, chunk), false);
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 41a7b160c..8525c3ab9 100644
+index 41a7b160c5..8525c3ab9f 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -603,7 +603,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@ -1580,7 +1580,7 @@ index 41a7b160c..8525c3ab9 100644
         }
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index e2e5c17c2..ce4340a47 100644
+index e2e5c17c24..ce4340a476 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -264,6 +264,8 @@ public class PlayerInteractManager {
@ -1593,7 +1593,7 @@ index e2e5c17c2..ce4340a47 100644
 
     public void a(BlockPosition blockposition, PacketPlayInBlockDig.EnumPlayerDigType packetplayinblockdig_enumplayerdigtype, String s) {
 diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java
-index 39339fa27..f376e2106 100644
+index 39339fa275..f376e21068 100644
 --- a/src/main/java/net/minecraft/server/ProtoChunk.java
 +++ b/src/main/java/net/minecraft/server/ProtoChunk.java
@@ -45,16 +45,28 @@ public class ProtoChunk implements IChunkAccess {
@ -1636,7 +1636,7 @@ index 39339fa27..f376e2106 100644
 
         return this.j[i];
 diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java
-index f82db93f8..1d1b267f3 100644
+index f82db93f88..1d1b267f32 100644
 --- a/src/main/java/net/minecraft/server/TicketType.java
 +++ b/src/main/java/net/minecraft/server/TicketType.java
@@ -21,6 +21,7 @@ public class TicketType<T> {
@ -1648,7 +1648,7 @@ index f82db93f8..1d1b267f3 100644
     public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
         return new TicketType<>(s, comparator, 0L);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e2cac4a92..9d604a758 100644
+index e2cac4a926..9d604a758e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -2,6 +2,8 @@ package net.minecraft.server;
@ -1685,7 +1685,7 @@ index e2cac4a92..9d604a758 100644
             if (iblockdata1 == null) {
                 // CraftBukkit start - remove blockstate if failed
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
-index 7772d5900..4570ed999 100644
+index 8191e7c348..969d548de2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
@@ -21,9 +21,11 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData {
@ -1704,8 +1704,8 @@ index 7772d5900..4570ed999 100644
     private ChunkSection getChunkSection(int y, boolean create) {
         ChunkSection section = sections[y >> 4];
         if (create && section == null) {
-            sections[y >> 4] = section = new ChunkSection(y);
-+            sections[y >> 4] = section = new ChunkSection(y, null, world instanceof org.bukkit.craftbukkit.CraftWorld ? ((org.bukkit.craftbukkit.CraftWorld) world).getHandle() : null, true); // Paper - Anti-Xray
+-            sections[y >> 4] = section = new ChunkSection(y >> 4 << 4);
+            sections[y >> 4] = section = new ChunkSection(y >> 4 << 4, null, world instanceof org.bukkit.craftbukkit.CraftWorld ? ((org.bukkit.craftbukkit.CraftWorld) world).getHandle() : null, true); // Paper - Anti-Xray
         }
         return section;
     }
--- a/Spigot-Server-Patches/0439-Entity-Jump-API.patch
+++ b/Spigot-Server-Patches/0439-Entity-Jump-API.patch
@ -1,4 +1,4 @@
-From 7986630d78fb8cd77b5e305bd727d537e8fdc10e Mon Sep 17 00:00:00 2001
+From db100098e2af3e75dc11a4202f7f1c6d1313d780 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Feb 2020 23:26:11 -0600
 Subject: [PATCH] Entity Jump API
@ -43,10 +43,10 @@ index cd41c80f19..f50ed19080 100644
         }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index b27fd44dcd..277eb54e79 100644
+index 6de01e4f0e..8ffa3cb059 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -711,5 +711,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -723,5 +723,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
     public boolean isHandRaised() {
         return getHandle().isHandRaised();
     }
--- a/work/Bukkit
+++ b/work/Bukkit
@ -1 +1 @@
-Subproject commit f52c70ab17a6da19b235abf1c7a360b02c248021
+Subproject commit fd28180e18c7d15a5169943c341765e98fe4c336
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit fba9f4876b0fb4e86d169f144276866668f58aca
+Subproject commit 3d61a853e35fd3607a6b1ed45ca007e513835d72