Updated Upstream (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

CraftBukkit Changes:
17ff1e04 SPIGOT-4483: Missing EntityInteractEvent call for zombies on eggs

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

@@ -5,7 +5,7 @@ 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 19ac21e385..8bbea96240 100644
+index 19ac21e38..8bbea9624 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/Prevent-Mob-AI-Rules-from-Loading-Chunks.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 4e8eb137a..479a84a25 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 {
@@ -17,7 +17,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          return this.b(blockposition.getX(), blockposition.getY(), blockposition.getZ());
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 9c72848f1..d007d0387 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 @@ -0,0 +0,0 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
@@ -44,9 +44,11 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
 +        if (block == this.f) { // Paper
              return blockposition;
          } else {
-             BlockPosition[] ablockposition = new BlockPosition[]{blockposition.down(), blockposition.west(), blockposition.east(), blockposition.north(), blockposition.south(), blockposition.down().down()};
+             BlockPosition[] ablockposition = new BlockPosition[] { blockposition.down(), blockposition.west(), blockposition.east(), blockposition.north(), blockposition.south(), blockposition.down().down()};
+@@ -0,0 +0,0 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
+             for (int j = 0; j < i; ++j) {
+                 BlockPosition blockposition1 = ablockposition1[j];
  
-             for(BlockPosition blockposition1 : ablockposition) {
 -                if (iblockaccess.getType(blockposition1).getBlock() == this.f) {
 +                if (world.getBlockIfLoaded(blockposition1) == this.f) { // Paper
                      return blockposition1;
@@ -59,11 +61,11 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
 -        Block block = iworldreader.getType(blockposition).getBlock();
 +        Block block = world.getBlockIfLoaded(blockposition); // Paper
 +        if (block == null) return false; // Paper
+ 
          return block == this.f && iworldreader.getType(blockposition.up()).isAir() && iworldreader.getType(blockposition.up(2)).isAir();
      }
- }
 diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 800e0046a..bfa6c2eef 100644
 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 @@ -0,0 +0,0 @@ public class RandomPositionGenerator {
@@ -84,7 +86,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index a5c655155..016d50d3c 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 IEntityAccess, GeneratorAccess, IIBlockAc

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

@@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
 profiles that had to be looked up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
-index 3bcdb8f93f..bb9894318e 100644
+index 3bcdb8f93..bb9894318 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -0,0 +0,0 @@

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 3a9118280cba89f5bf5b14f1709993f6df609f5d
+Subproject commit 17ff1e04679d5826f7d574fecc1a97820d5579d1