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
This commit is contained in:
Jake Potrebic 2020-11-17 19:45:18 -08:00 committed by GitHub
parent a162213b24
commit 899bc53b79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
254 changed files with 322 additions and 344 deletions

View file

@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
or DEFAULT since data was not stored.
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 06f41958b98d9f105a9735509b4eb50ebf0fbf60..df15c0f2e52abc51f35d6e00e17ffa0ea39d838b 100644
index 12729b6d9b3902c7c225655de273cb3c075fb695..0053b1d4f6ebf21d108dd40b9ce2a9e081ecea98 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -649,5 +649,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent