Updated Upstream (Bukkit/CraftBukkit) (#4779)

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:
f47abd88 SPIGOT-6242: Fix some file line endings
de96535b SPIGOT-6234: enum classes don't serialize properly when implementing ConfigurationSerializable

CraftBukkit Changes:
4475707d SPIGOT-6244: /spawnpoint ignores angle
8b3b096d SPIGOT-6242: Fix some file line endings
4b33c749 SPIGOT-6186: Canceling a CreatureSpawnEvent​ results in a "Unable to summon entity due to duplicate UUIDs" error
2b3ca726 SPIGOT-6236: Vehicle passenger portal cooldown does not change

Spigot-Server-Patches/Entity-Activation-Range-2.0.patch

@@ -421,6 +421,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                    // Paper start - EAR 2
 +                    if (isActive) {
                      entity1.passengerTick();
+                     entity1.postTick(); // CraftBukkit
 +                    } else {
 +                        entity1.setMot(Vec3D.ORIGIN);
 +                        entity1.inactiveTick();

Spigot-Server-Patches/Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch

@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 15 Aug 2020 09:32:00 -0500
-Subject: [PATCH] Fix incorrect return for WorldServer#addAllEntitiesSafely
-
-
-diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/WorldServer.java
-+++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -0,0 +0,0 @@ public class WorldServer extends World implements GeneratorAccessSeed {
-         if (entity.cp().anyMatch(this::isUUIDTaken)) {
-             return false;
-         } else {
--            return this.addAllEntities(entity, reason); // CraftBukkit
-+            // Paper start - this method is _only_ designed to return false on duplicate uuids
-+            // fixes issues with things such as a plugin cancelling spawn of a /summon
-+            this.addAllEntities(entity, reason); // CraftBukkit
-+            return true;
-+            // Paper end
-         }
-     }
- 

Spigot-Server-Patches/implement-optional-per-player-mob-spawns.patch

@@ -775,9 +775,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
                                          entityinsentient.setPositionRotation(d0, (double) i, d1, worldserver.random.nextFloat() * 360.0F, 0.0F);
 @@ -0,0 +0,0 @@ public final class SpawnerCreature {
-                                             groupdataentity = entityinsentient.prepare(worldserver, worldserver.getDamageScaler(entityinsentient.getChunkCoordinates()), EnumMobSpawn.NATURAL, groupdataentity, (NBTTagCompound) null);
                                              // CraftBukkit start
-                                             if (worldserver.addAllEntities(entityinsentient, SpawnReason.NATURAL)) {
+                                             worldserver.addAllEntities(entityinsentient, SpawnReason.NATURAL);
+                                             if (!entityinsentient.dead) {
 -                                                ++j;
 +                                                ++j; // Paper - force diff on name change - we expect this to be the total amount spawned
                                                  ++k1;