Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9825)

Upstream has released updates that appear 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:
897a0a23 SPIGOT-5753: Back PotionType by a minecraft registry
255b2aa1 SPIGOT-7080: Add World#locateNearestBiome
ff984826 Remove javadoc.io doc links

CraftBukkit Changes:
71b0135cc SPIGOT-5753: Back PotionType by a minecraft registry
a6bcb8489 SPIGOT-7080: Add World#locateNearestBiome
ad0e57434 SPIGOT-7502: CraftMetaItem - cannot deserialize BlockStateTag
b3efca57a SPIGOT-6400: Use Mockito instead of InvocationHandler
38c599f9d PR-1272: Only allow one entity in CraftItem instead of two
f065271ac SPIGOT-7498: ChunkSnapshot.getBlockEmittedLight() gets 64 blocks upper in Overworld

Spigot Changes:
e0e223fe Remove javadoc.io doc links

1 files changed, 0 insertions, 57 deletions

diff --git a/patches/server/0620-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0620-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
deleted file mode 100644
index ef457d74af..0000000000
--- a/patches/server/0620-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Wed, 12 Sep 2018 21:47:01 -0400
-Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
-
-Uses an EnumMap as well as a Set paired List for O(1) contains calls.
-
-diff --git a/src/main/java/net/minecraft/world/level/biome/MobSpawnSettings.java b/src/main/java/net/minecraft/world/level/biome/MobSpawnSettings.java
-index 4f4ef3349f512cc6e1588eb58de5b2558c0bd8b9..9e2f7fc64b284efd6388be35f250642c47e7603b 100644
---- a/src/main/java/net/minecraft/world/level/biome/MobSpawnSettings.java
-+++ b/src/main/java/net/minecraft/world/level/biome/MobSpawnSettings.java
-@@ -61,11 +61,43 @@ public class MobSpawnSettings {
-     }
- 
-     public static class Builder {
--        private final Map<MobCategory, List<MobSpawnSettings.SpawnerData>> spawners = Stream.of(MobCategory.values()).collect(ImmutableMap.toImmutableMap((mobCategory) -> {
-+        // Paper start - keep track of data in a pair set to give O(1) contains calls - we have to hook removals incase plugins mess with it
-+        public static class MobList extends java.util.ArrayList<MobSpawnSettings.SpawnerData> {
-+            java.util.Set<MobSpawnSettings.SpawnerData> biomes = new java.util.HashSet<>();
-+
-+            @Override
-+            public boolean contains(Object o) {
-+                return biomes.contains(o);
-+            }
-+
-+            @Override
-+            public boolean add(MobSpawnSettings.SpawnerData BiomeSettingsMobs) {
-+                biomes.add(BiomeSettingsMobs);
-+                return super.add(BiomeSettingsMobs);
-+            }
-+
-+            @Override
-+            public MobSpawnSettings.SpawnerData remove(int index) {
-+                MobSpawnSettings.SpawnerData removed = super.remove(index);
-+                if (removed != null) {
-+                    biomes.remove(removed);
-+                }
-+                return removed;
-+            }
-+
-+            @Override
-+            public void clear() {
-+                biomes.clear();
-+                super.clear();
-+            }
-+        }
-+        // use toImmutableEnumMap collector
-+        private final Map<MobCategory, List<MobSpawnSettings.SpawnerData>> spawners = (Map) Stream.of(MobCategory.values()).collect(Maps.toImmutableEnumMap((mobCategory) -> {
-             return mobCategory;
-         }, (mobCategory) -> {
--            return Lists.newArrayList();
-+            return new MobList(); // Use MobList instead of ArrayList
-         }));
-+        // Paper end
-         private final Map<EntityType<?>, MobSpawnSettings.MobSpawnCost> mobSpawnCosts = Maps.newLinkedHashMap();
-         private float creatureGenerationProbability = 0.1F;
-