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:
3aa8286b SPIGOT-794: Add boats to EntityPlaceEvent
c36d90a6 SPIGOT-5464: Add BEEHIVE SpawnReason for when a bee leaves a beehive

CraftBukkit Changes:
90ef74ef SPIGOT-794: Add boats to EntityPlaceEvent
fb7abcb3 SPIGOT-5466: Bees still get angry even if damage event cancelled
4499fec5 SPIGOT-5464: Add BEEHIVE SpawnReason for when a bee leaves a beehive

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

@@ -1,4 +1,4 @@
-From 0a6ac5cc3a320acdc364fea28615f8565825bb37 Mon Sep 17 00:00:00 2001
+From 66d9b63f082a2229e6c51cc21cf50059758a0f7f 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 1eca7f354..8b85956e5 100644
          entitywitch.prepare(this.world, this.world.getDamageScaler(new BlockPosition(entitywitch)), EnumMobSpawn.CONVERSION, (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 de26145ee..ba14f66f7 100644
+index e192f5f93..4b5d5e518 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1040,6 +1040,14 @@ public class CraftEventFactory {
+@@ -1044,6 +1044,14 @@ public class CraftEventFactory {
          return event;
      }
  

Spigot-Server-Patches/0125-Add-source-to-PlayerExpChangeEvent.patch

@@ -1,4 +1,4 @@
-From 777724ba4ea181c7f4d8297a1ce33d17a59c6d36 Mon Sep 17 00:00:00 2001
+From bd2d233c65f8d35946b2d592087eb0aaf0fc202b Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
@@ -18,7 +18,7 @@ index f72bb0c13..0447800d9 100644
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ba14f66f7..3c52b40a3 100644
+index 4b5d5e518..e69d73c45 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -111,6 +111,7 @@ import org.bukkit.entity.ThrownPotion;
@@ -29,7 +29,7 @@ index ba14f66f7..3c52b40a3 100644
  import org.bukkit.event.Cancellable;
  import org.bukkit.event.Event;
  import org.bukkit.event.Event.Result;
-@@ -999,6 +1000,17 @@ public class CraftEventFactory {
+@@ -1003,6 +1004,17 @@ public class CraftEventFactory {
          return event;
      }
  
@@ -48,5 +48,5 @@ index ba14f66f7..3c52b40a3 100644
          return handleBlockGrowEvent(world, pos, block, 3);
      }
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,11 +1,11 @@
-From ca1e8bd890fa9400cfd8e757611b8ae929ee7c4e Mon Sep 17 00:00:00 2001
+From 46b6f35ed25811c9b22312baad531d4df5ec30b6 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index fc70d50ac..0c3664758 100644
+index 2b14b2c3f..634e2bd30 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -187,6 +187,17 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -93,10 +93,10 @@ index 2e4c9d426..724b78b5d 100644
                  this.c(((MovingObjectPositionBlock) movingobjectposition).getBlockPosition());
              } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 3c52b40a3..2bf53db88 100644
+index e69d73c45..c1eb5a05c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1144,6 +1144,16 @@ public class CraftEventFactory {
+@@ -1148,6 +1148,16 @@ public class CraftEventFactory {
          return CraftItemStack.asNMSCopy(bitem);
      }
  
@@ -114,5 +114,5 @@ index 3c52b40a3..2bf53db88 100644
          Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
          ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch

@@ -1,11 +1,11 @@
-From efa15ce75601ea4142787336aa79021d9a66e302 Mon Sep 17 00:00:00 2001
+From 4c8d1dea432f2871c2337c2277c58b32437ece12 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c145e27ccb..671587631e 100644
+index c145e27cc..671587631 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -338,4 +338,10 @@ public class PaperWorldConfig {
@@ -20,10 +20,10 @@ index c145e27ccb..671587631e 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2bf53db885..e310f2afe1 100644
+index c1eb5a05c..b8e5c6322 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -537,16 +537,32 @@ public class CraftEventFactory {
+@@ -541,16 +541,32 @@ public class CraftEventFactory {
              EntityExperienceOrb xp = (EntityExperienceOrb) entity;
              double radius = world.spigotConfig.expMerge;
              if (radius > 0) {

Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch

@@ -1,4 +1,4 @@
-From 7a7a77f3a1ff391f37d670a7846a038d6fbf86a5 Mon Sep 17 00:00:00 2001
+From 0412767f0f442fe73bdd4047587935287d7e4775 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@@ -8,10 +8,10 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e310f2afe1..9b314eacc3 100644
+index b8e5c6322..060671a58 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -547,7 +547,7 @@ public class CraftEventFactory {
+@@ -551,7 +551,7 @@ public class CraftEventFactory {
                      if (e instanceof EntityExperienceOrb) {
                          EntityExperienceOrb loopItem = (EntityExperienceOrb) e;
                          // Paper start

Spigot-Server-Patches/0233-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch

@@ -1,4 +1,4 @@
-From ea676427ba9119a25f3d0cb7f5b20438058be63c Mon Sep 17 00:00:00 2001
+From 409cd7991a57a60511223af2b56ed401d82ecb61 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 15 Jun 2013 19:51:17 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
 Adds ability to get what arrow was shot, and control if it should be consumed.
 
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
-index d97558da3e..fdeb8980d9 100644
+index d97558da3..fdeb8980d 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 @@ -157,7 +157,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -19,7 +19,7 @@ index d97558da3e..fdeb8980d9 100644
              event.getProjectile().remove();
              return;
 diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java
-index 4b07e18c7e..71800b34b4 100644
+index 4b07e18c7..71800b34b 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
 @@ -36,6 +36,7 @@ public class ItemBow extends ItemProjectileWeapon {
@@ -59,7 +59,7 @@ index 4b07e18c7e..71800b34b4 100644
                          if (itemstack1.isEmpty()) {
                              entityhuman.inventory.f(itemstack1);
 diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java
-index 608be9e70a..011efc6f5b 100644
+index 608be9e70..011efc6f5 100644
 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java
 +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java
 @@ -221,7 +221,7 @@ public class ItemCrossbow extends ItemProjectileWeapon {
@@ -72,7 +72,7 @@ index 608be9e70a..011efc6f5b 100644
                  event.getProjectile().remove();
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 9b314eacc3..94fbac5e40 100644
+index 060671a58..13598e3bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -51,6 +51,7 @@ import net.minecraft.server.GeneratorAccess;
@@ -83,7 +83,7 @@ index 9b314eacc3..94fbac5e40 100644
  import net.minecraft.server.ItemActionContext;
  import net.minecraft.server.ItemStack;
  import net.minecraft.server.Items;
-@@ -465,16 +466,16 @@ public class CraftEventFactory {
+@@ -469,16 +470,16 @@ public class CraftEventFactory {
      /**
       * EntityShootBowEvent
       */

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

@@ -1,4 +1,4 @@
-From 02746ee6554ae0bcbe0ac213ae6f23ee77bffa2a Mon Sep 17 00:00:00 2001
+From 7a96a2dfaadbf787727303f0241178e4d150bf75 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
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 3917980b76..007934d8c5 100644
+index 676349ca8..9cce323da 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -164,7 +164,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -34,7 +34,7 @@ index 3917980b76..007934d8c5 100644
          this.activeContainer = this.defaultContainer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 774289a0f0..1e552b1a10 100644
+index 774289a0f..1e552b1a1 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -362,7 +362,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -88,7 +88,7 @@ index 774289a0f0..1e552b1a10 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8757b6751e..4f04410f9b 100644
+index 8757b6751..4f04410f9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2039,7 +2039,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -101,7 +101,7 @@ index 8757b6751e..4f04410f9b 100644
          this.player.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 002f7e844a..fd0f5c6f29 100644
+index 002f7e844..fd0f5c6f2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -403,7 +403,7 @@ public abstract class PlayerList {
@@ -114,7 +114,7 @@ index 002f7e844a..fd0f5c6f29 100644
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 8a8c2eaf58..eb311a731f 100644
+index 8a8c2eaf5..eb311a731 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1027,7 +1027,7 @@ public class WorldServer extends World {
@@ -136,7 +136,7 @@ index 8a8c2eaf58..eb311a731f 100644
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index cd8ad27047..e169679c88 100644
+index cd8ad2704..e169679c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -619,8 +619,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -155,7 +155,7 @@ index cd8ad27047..e169679c88 100644
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ebf025c8aa..ba4eb3726a 100644
+index ebf025c8a..ba4eb3726 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -780,7 +780,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,10 +168,10 @@ index ebf025c8aa..ba4eb3726a 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 94fbac5e40..7967222d99 100644
+index 13598e3bb..bb48d44ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1288,8 +1288,19 @@ public class CraftEventFactory {
+@@ -1292,8 +1292,19 @@ public class CraftEventFactory {
          return event;
      }
  

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

@@ -1,11 +1,11 @@
-From 2a309ccd0cc41e615ba2c7455161ac1e4fc39449 Mon Sep 17 00:00:00 2001
+From afb3cf702e2707f26623277f245055f5a74269d0 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 3458333c9b..6ef5d2ebd7 100644
+index 3458333c9..6ef5d2ebd 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -98,7 +98,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 3458333c9b..6ef5d2ebd7 100644
      protected int j;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index 3a1ad2346b..9ab57be850 100644
+index 3a1ad2346..9ab57be85 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -146,6 +146,7 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
@@ -30,7 +30,7 @@ index 3a1ad2346b..9ab57be850 100644
          return this.getBlock().b(this, iblockaccess, blockposition, voxelshapecollision);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index ab875a7365..aed353365b 100644
+index ab875a736..aed353365 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -136,7 +136,8 @@ public class ItemBlock extends Item {
@@ -44,7 +44,7 @@ index ab875a7365..aed353365b 100644
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
 diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java
-index 0f64a3c056..0f95bcbccb 100644
+index 0f64a3c05..0f95bcbcc 100644
 --- a/src/main/java/net/minecraft/server/VoxelShape.java
 +++ b/src/main/java/net/minecraft/server/VoxelShape.java
 @@ -46,6 +46,7 @@ public abstract class VoxelShape {
@@ -56,7 +56,7 @@ index 0f64a3c056..0f95bcbccb 100644
          return (VoxelShape) (this.isEmpty() ? VoxelShapes.a() : new VoxelShapeArray(this.a, new DoubleListOffset(this.a(EnumDirection.EnumAxis.X), d0), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Y), d1), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Z), d2)));
      }
 diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java
-index 143be566c6..08c83c62df 100644
+index 143be566c..08c83c62d 100644
 --- a/src/main/java/net/minecraft/server/VoxelShapes.java
 +++ b/src/main/java/net/minecraft/server/VoxelShapes.java
 @@ -33,6 +33,7 @@ public final class VoxelShapes {
@@ -76,7 +76,7 @@ index 143be566c6..08c83c62df 100644
          if (operatorboolean.apply(false, false)) {
              throw (IllegalArgumentException) SystemUtils.c(new IllegalArgumentException());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 307a2d060f..39e85f80ca 100644
+index c6f41d8a6..1fbecceb9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -164,6 +164,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -127,10 +127,10 @@ index 307a2d060f..39e85f80ca 100644
      public boolean p_() {
          return this.isClientSide;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7967222d99..e954c59d54 100644
+index bb48d44ff..d74c9d811 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1166,6 +1166,14 @@ public class CraftEventFactory {
+@@ -1170,6 +1170,14 @@ public class CraftEventFactory {
          Projectile projectile = (Projectile) entity.getBukkitEntity();
          org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity();
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);

Spigot-Server-Patches/0270-Add-hand-to-bucket-events.patch

@@ -1,11 +1,11 @@
-From a2d951ee03d90c39b2ec6ce11ef0539757d88bda Mon Sep 17 00:00:00 2001
+From 8e6f723a6e95616af03b47a3f07b03c53bec7a98 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:35 -0500
 Subject: [PATCH] Add hand to bucket events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 6e385b5304..2c8bbf20ae 100644
+index 6e385b530..2c8bbf20a 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -61,7 +61,7 @@ public class EntityCow extends EntityAnimal {
@@ -18,7 +18,7 @@ index 6e385b5304..2c8bbf20ae 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index aaed8c0ae2..0ff92aea54 100644
+index aaed8c0ae..0ff92aea5 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
 @@ -41,7 +41,7 @@ public class ItemBucket extends Item {
@@ -69,10 +69,10 @@ index aaed8c0ae2..0ff92aea54 100644
                          ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
                          ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e954c59d54..844781f4ec 100644
+index d74c9d811..d329a0c1b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -368,6 +368,20 @@ public class CraftEventFactory {
+@@ -372,6 +372,20 @@ public class CraftEventFactory {
      }
  
      private static PlayerEvent getPlayerBucketEvent(boolean isFilling, World world, EntityHuman who, BlockPosition changed, BlockPosition clicked, EnumDirection clickedFace, ItemStack itemstack, net.minecraft.server.Item item) {
@@ -93,7 +93,7 @@ index e954c59d54..844781f4ec 100644
          Player player = (Player) who.getBukkitEntity();
          CraftItemStack itemInHand = CraftItemStack.asNewCraftStack(item);
          Material bucket = CraftMagicNumbers.getMaterial(itemstack.getItem());
-@@ -380,10 +394,10 @@ public class CraftEventFactory {
+@@ -384,10 +398,10 @@ public class CraftEventFactory {
  
          PlayerEvent event;
          if (isFilling) {

Spigot-Server-Patches/0293-Improve-death-events.patch

@@ -1,4 +1,4 @@
-From 42d59f9bb438f96c8d004b2b58de53bc0609efee Mon Sep 17 00:00:00 2001
+From 761cae72d07c79acbedd36b65ae253d6fc965e54 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
-index 6daa400d27..38fe29f8a2 100644
+index 6daa400d2..38fe29f8a 100644
 --- a/src/main/java/net/minecraft/server/CombatTracker.java
 +++ b/src/main/java/net/minecraft/server/CombatTracker.java
 @@ -175,6 +175,7 @@ public class CombatTracker {
@@ -27,7 +27,7 @@ index 6daa400d27..38fe29f8a2 100644
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 75343a4386..b03316bc8c 100644
+index 75343a438..b03316bc8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1503,6 +1503,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -47,7 +47,7 @@ index 75343a4386..b03316bc8c 100644
  
      protected void k(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index b51662ee99..e6032e3edc 100644
+index b51662ee9..e6032e3ed 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -706,7 +706,8 @@ public class EntityArmorStand extends EntityLiving {
@@ -61,7 +61,7 @@ index b51662ee99..e6032e3edc 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index ac8eaffb93..7495af8e3a 100644
+index ac9a5e113..45b4db990 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -571,15 +571,25 @@ public class EntityFox extends EntityAnimal {
@@ -94,7 +94,7 @@ index ac8eaffb93..7495af8e3a 100644
  
      public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
 diff --git a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
-index 80717ad9ac..53aac5bccd 100644
+index 80717ad9a..53aac5bcc 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
 @@ -55,11 +55,19 @@ public abstract class EntityHorseChestedAbstract extends EntityHorseAbstract {
@@ -119,7 +119,7 @@ index 80717ad9ac..53aac5bccd 100644
      public void b(NBTTagCompound nbttagcompound) {
          super.b(nbttagcompound);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1592a705f6..b59b39d418 100644
+index 1592a705f..b59b39d41 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -89,7 +89,7 @@ public abstract class EntityLiving extends Entity {
@@ -279,7 +279,7 @@ index 1592a705f6..b59b39d418 100644
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1e552b1a10..4c76927217 100644
+index 1e552b1a1..4c7692721 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -330,7 +330,7 @@ index 1e552b1a10..4c76927217 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 90fdf89c81..b761a41dcd 100644
+index 90fdf89c8..b761a41dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 @@ -821,6 +821,22 @@ public enum CraftSound {
@@ -357,7 +357,7 @@ index 90fdf89c81..b761a41dcd 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 609e274a31..73a7cc7fd3 100644
+index 609e274a3..73a7cc7fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1704,7 +1704,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -378,10 +378,10 @@ index 609e274a31..73a7cc7fd3 100644
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 844781f4ec..4fb1092ce6 100644
+index d329a0c1b..c0fd2948e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -744,9 +744,16 @@ public class CraftEventFactory {
+@@ -748,9 +748,16 @@ public class CraftEventFactory {
      public static EntityDeathEvent callEntityDeathEvent(EntityLiving victim, List<org.bukkit.inventory.ItemStack> drops) {
          CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
          EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward());
@@ -398,7 +398,7 @@ index 844781f4ec..4fb1092ce6 100644
          victim.expToDrop = event.getDroppedExp();
  
          for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {
-@@ -762,8 +769,15 @@ public class CraftEventFactory {
+@@ -766,8 +773,15 @@ public class CraftEventFactory {
          CraftPlayer entity = victim.getBukkitEntity();
          PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage);
          event.setKeepInventory(keepInventory);
@@ -414,7 +414,7 @@ index 844781f4ec..4fb1092ce6 100644
  
          victim.keepLevel = event.getKeepLevel();
          victim.newLevel = event.getNewLevel();
-@@ -780,6 +794,31 @@ public class CraftEventFactory {
+@@ -784,6 +798,31 @@ public class CraftEventFactory {
          return event;
      }
  

work/Bukkit

@@ -1 +1 @@
-Subproject commit bf1fa3e3e2524c08cdc8a35410a878bea3515cd6
+Subproject commit 3aa8286b3254c1938a834d734e923fbca97c7f35

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit d31f05fbc65e99ac93407f1ac8706803121d1d25
+Subproject commit 90ef74efbe388b68d4e2296bb99988296d8200af