Updated Upstream (CraftBukkit/Spigot)

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:
4c8327f7 SPIGOT-4673: EntitySpawnEvent should not be called for players

Spigot Changes:
5629554b Rebuild patches

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

@@ -1,11 +1,11 @@
-From a57980e38a8b652248db915cd44fe7621b30899b Mon Sep 17 00:00:00 2001
+From 23f26bd993530d5476459997d337aafa494f5ac3 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 af31030dc..b6764c7ec 100644
+index af31030dc7..b6764c7ec1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -378,4 +378,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index af31030dc..b6764c7ec 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index fb0fe3500..228f4b28e 100644
+index 9cbbfed4fe..2985c76f37 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -394,16 +394,32 @@ public class CraftEventFactory {
@@ -58,7 +58,7 @@ index fb0fe3500..228f4b28e 100644
 +                } // Paper end - End iteration skip check - All tweaking ends here
              }
          // Spigot end
-         } else {
+         } else if (!(entity instanceof EntityPlayer)) {
 -- 
 2.21.0
 

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 51100db8215f28accb2eeb56f9ee3e661f362d1e
+Subproject commit 4c8327f72112dba222c982259480b1e70893e095

work/Spigot

@@ -1 +1 @@
-Subproject commit e6eb36f2a1b5f11534f3e3c8277da14728fb027d
+Subproject commit 5629554b031cb43df270e834939ef13cf5e75a4d