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:
d4e8c8b3 SPIGOT-4570: Add FluidLevelChangeEvent

CraftBukkit Changes:
9dc56581 SPIGOT-4570: Add FluidLevelChangeEvent
b15abb12 SPIGOT-4566: Don't special case NETHER_PORTAL teleport reason from plugins

Spigot-Server-Patches/0141-Add-EntityZapEvent.patch

@@ -1,4 +1,4 @@
-From 247e29a86fe7e1a5bdf52570faf8097bc030ca1b Mon Sep 17 00:00:00 2001
+From 432999c0958b9942cde0ae4b0c5c89a2b7e0640a Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
@@ -39,10 +39,10 @@ index f8e05b75d..213d0b18c 100644
              entitywitch.prepare(this.world.getDamageScaler(new BlockPosition(entitywitch)), (GroupDataEntity) null, (NBTTagCompound) null);
              entitywitch.setNoAI(this.isNoAI());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4d3bfd69e..b8bf1fbef 100644
+index 7fe10fbe7..4097168a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -864,6 +864,14 @@ public class CraftEventFactory {
+@@ -870,6 +870,14 @@ public class CraftEventFactory {
          return event;
      }
  

Spigot-Server-Patches/0152-Add-ProjectileCollideEvent.patch

@@ -1,4 +1,4 @@
-From 1163ba163cf37284af41818773ed7945347fcb87 Mon Sep 17 00:00:00 2001
+From d992aa01580dba844d13df4bfbda539e8591d7f9 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
@@ -87,10 +87,10 @@ index 751ea456b..bab5b89fe 100644
              if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.getBlockPosition()).getBlock() == Blocks.NETHER_PORTAL) {
                  this.e(movingobjectposition.getBlockPosition());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 717cd0f42..943963047 100644
+index b38639556..866dee45b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -968,6 +968,16 @@ public class CraftEventFactory {
+@@ -974,6 +974,16 @@ public class CraftEventFactory {
          return CraftItemStack.asNMSCopy(bitem);
      }
  

Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch

@@ -1,4 +1,4 @@
-From 59103d640f5ab2db103c203180429a3c45417476 Mon Sep 17 00:00:00 2001
+From 77bddbc8c3fd8255c9169ec077bd7be3a1005d66 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -168,10 +168,10 @@ index 0753a0f26..ce58cfc11 100644
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6c105ef74..83f7116f4 100644
+index edafaf0de..d8f2e0c1b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1099,8 +1099,19 @@ public class CraftEventFactory {
+@@ -1105,8 +1105,19 @@ public class CraftEventFactory {
          return event;
      }
  

Spigot-Server-Patches/0300-Vanished-players-don-t-have-rights.patch

@@ -1,11 +1,11 @@
-From a37e87b1a301c08889b8477557a30a4757c8d905 Mon Sep 17 00:00:00 2001
+From 7873505a5f5f1bc68192662b9fda9c559e5e6ac0 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 14:22:26 +0200
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3e6a36af6..12ab5def2 100644
+index 1b5663e52..682ab80d9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -74,10 +74,10 @@ index 074d14b19..93b0544e0 100644
          if (voxelshape.isEmpty()) {
              return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 83f7116f4..fa3bb1047 100644
+index d8f2e0c1b..fa11f966b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -989,6 +989,14 @@ public class CraftEventFactory {
+@@ -995,6 +995,14 @@ public class CraftEventFactory {
          Projectile projectile = (Projectile) entity.getBukkitEntity();
          org.bukkit.entity.Entity collided = position.entity.getBukkitEntity();
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);

Spigot-Server-Patches/0354-Prevent-chunk-loading-from-Fluid-Flowing.patch

@@ -1,14 +1,14 @@
-From 76acd0f0536e158c02bccacd1c1223034bfc6056 Mon Sep 17 00:00:00 2001
+From 00da8bde7bf84be611564fc3a4fc92b580fb2778 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:36:16 -0400
 Subject: [PATCH] Prevent chunk loading from Fluid Flowing
 
 
 diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
-index 074cc366e..0014f7870 100644
+index 28edf37d0..bbffeae3d 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
-@@ -182,7 +182,8 @@ public abstract class FluidTypeFlowing extends FluidType {
+@@ -185,7 +185,8 @@ public abstract class FluidTypeFlowing extends FluidType {
                  EnumDirection enumdirection = (EnumDirection) entry.getKey();
                  Fluid fluid1 = (Fluid) entry.getValue();
                  BlockPosition blockposition1 = blockposition.shift(enumdirection);
@@ -18,7 +18,7 @@ index 074cc366e..0014f7870 100644
  
                  if (this.a(generatoraccess, blockposition, iblockdata, enumdirection, blockposition1, iblockdata1, generatoraccess.getFluid(blockposition1), fluid1.c())) {
                      // CraftBukkit start
-@@ -209,7 +210,8 @@ public abstract class FluidTypeFlowing extends FluidType {
+@@ -212,7 +213,8 @@ public abstract class FluidTypeFlowing extends FluidType {
          while (iterator.hasNext()) {
              EnumDirection enumdirection = (EnumDirection) iterator.next();
              BlockPosition blockposition1 = blockposition.shift(enumdirection);
@@ -28,7 +28,7 @@ index 074cc366e..0014f7870 100644
              Fluid fluid = iblockdata1.s();
  
              if (fluid.c().a((FluidType) this) && this.a(enumdirection, (IBlockAccess) iworldreader, blockposition, iblockdata, blockposition1, iblockdata1)) {
-@@ -326,11 +328,20 @@ public abstract class FluidTypeFlowing extends FluidType {
+@@ -329,11 +331,20 @@ public abstract class FluidTypeFlowing extends FluidType {
              if (enumdirection1 != enumdirection) {
                  BlockPosition blockposition2 = blockposition.shift(enumdirection1);
                  short short0 = a(blockposition1, blockposition2);
@@ -53,7 +53,7 @@ index 074cc366e..0014f7870 100644
                  IBlockData iblockdata1 = (IBlockData) pair.getFirst();
                  Fluid fluid = (Fluid) pair.getSecond();
  
-@@ -402,11 +413,16 @@ public abstract class FluidTypeFlowing extends FluidType {
+@@ -405,11 +416,16 @@ public abstract class FluidTypeFlowing extends FluidType {
              EnumDirection enumdirection = (EnumDirection) iterator.next();
              BlockPosition blockposition1 = blockposition.shift(enumdirection);
              short short0 = a(blockposition, blockposition1);

Spigot-Server-Patches/0367-Async-Chunk-Loading-and-Generation.patch

@@ -1,4 +1,4 @@
-From 75a29b394a7a772620d850fa0422a2627afb5209 Mon Sep 17 00:00:00 2001
+From 72819ee8a242b895f5f56c7c737445c450c14aa1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 16:55:04 -0400
 Subject: [PATCH] Async Chunk Loading and Generation
@@ -2381,7 +2381,7 @@ index 95fe3a91b..b5a87cfaf 100644
                      if (isChunkLoaded(chunkCoordX + x, chunkCoordZ + z)) {
                          unloadChunk(chunkCoordX + x, chunkCoordZ + z);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index fdab6734f..140415687 100644
+index 58ebecefe..282b4e6c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -81,6 +81,7 @@ public class CraftEventFactory {
@@ -2400,7 +2400,7 @@ index fdab6734f..140415687 100644
          craftServer.getPluginManager().callEvent(event);
          return event;
      }
-@@ -1117,6 +1119,7 @@ public class CraftEventFactory {
+@@ -1123,6 +1125,7 @@ public class CraftEventFactory {
          }
  
          BlockIgniteEvent event = new BlockIgniteEvent(bukkitWorld.getBlockAt(block.getX(), block.getY(), block.getZ()), cause, igniter);
@@ -2408,7 +2408,7 @@ index fdab6734f..140415687 100644
          world.getServer().getPluginManager().callEvent(event);
          return event;
      }
-@@ -1141,6 +1144,7 @@ public class CraftEventFactory {
+@@ -1147,6 +1150,7 @@ public class CraftEventFactory {
          }
  
          BlockIgniteEvent event = new BlockIgniteEvent(bukkitWorld.getBlockAt(pos.getX(), pos.getY(), pos.getZ()), cause, bukkitIgniter);
@@ -2416,7 +2416,7 @@ index fdab6734f..140415687 100644
          world.getServer().getPluginManager().callEvent(event);
          return event;
      }
-@@ -1348,7 +1352,8 @@ public class CraftEventFactory {
+@@ -1354,7 +1358,8 @@ public class CraftEventFactory {
      public static BlockPhysicsEvent callBlockPhysicsEvent(GeneratorAccess world, BlockPosition blockposition) {
          org.bukkit.block.Block block = CraftBlock.at(world, blockposition);
          BlockPhysicsEvent event = new BlockPhysicsEvent(block, block.getBlockData());
@@ -2426,7 +2426,7 @@ index fdab6734f..140415687 100644
          return event;
      }
  
-@@ -1384,6 +1389,7 @@ public class CraftEventFactory {
+@@ -1390,6 +1395,7 @@ public class CraftEventFactory {
          }
  
          EntityPotionEffectEvent event = new EntityPotionEffectEvent((LivingEntity) entity.getBukkitEntity(), bukkitOldEffect, bukkitNewEffect, cause, action, willOverride);
@@ -2434,7 +2434,7 @@ index fdab6734f..140415687 100644
          Bukkit.getPluginManager().callEvent(event);
  
          return event;
-@@ -1402,6 +1408,7 @@ public class CraftEventFactory {
+@@ -1408,6 +1414,7 @@ public class CraftEventFactory {
          blockState.setData(block);
  
          BlockFormEvent event = (entity == null) ? new BlockFormEvent(blockState.getBlock(), blockState) : new EntityBlockFormEvent(entity.getBukkitEntity(), blockState.getBlock(), blockState);

work/Bukkit

@@ -1 +1 @@
-Subproject commit 6de6ac4a8b5e3015be6105e96ff579508b9a6fc0
+Subproject commit d4e8c8b3b3e87accede8a4d1765d601313ad3d9b

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit f17d591cc9a57323b254d3981c8944e1c05bf37f
+Subproject commit 9dc56581e66ae04eb2acedc8fddc243223bc73bc