Updated Upstream (Paper & Tuinity)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
54890033 [Auto] Updated Upstream (CraftBukkit)
f96c6f5c [Auto] Updated Upstream (CraftBukkit)
4be8312f [CI-SKIP] [Auto] Rebuild Patches
43e5174a Fix Entity Teleportation and cancel velocity if teleported (#4210)
0fb3daf4 [Auto] Updated Upstream (CraftBukkit)
819ff324 Use wrapped StructureManager to prevent worldgen deadlock
507f302c Fix Zombie ShouldBurnInDay API (#4268)
ef5af6f6 [Auto] Updated Upstream (CraftBukkit)
101b0110 [Auto] Updated Upstream (Bukkit/CraftBukkit)
03689cf9 Fix javadoc (#4276)
c247857f Cache block data strings
ce2eae5c [Auto] Updated Upstream (Bukkit/CraftBukkit)
563f77ad install remapped server jar to paper package space
1ab021dd Updated Upstream (Bukkit/CraftBukkit)
c970f880 Properly pass the close reason for new inventory opens (#2658) (#4247)
07bca94f Create HoverEvent from ItemStack Entity
da33f8bb Add a way to get translation keys for blocks, entities and materials
5a20cbd7 Add more Evoker API
7a3e2520 [Auto] Updated Upstream (CraftBukkit)
b0cbebdc Fix build conflicts
dfc54a8b Add zombie targets turtle egg config (#4181)
0fe00f61 Add BellRingEvent for village bells (#2230)
414e5e1d fix #4144 (#4170)
5c7f3fc0 Fix PersistentDataContainer contract violation (_->!null returns null) (#3990)
65dbf5ff [CI-SKIP] [Auto] Rebuild Patches
7ed0f7f0 Fix NPE in getBedSpawnLocation (#4238)
9e0f1101 [CI-SKIP] Add issue template
6c138412 Fix CraftTeam null check (#4249)
32e45448 Update Paperclip
b84a37b7 Update Armor items in PlayerArmorChangeEvent (#4243)
a67abf5b Increase visibility of a few methods
7d69214b [Auto] Updated Upstream (CraftBukkit)
cbfc2362 PortalCreateEvent needs to know its entity
29032edb Fix PersistentDataContainer contract violation (_->!null returns null)
f42c53df [CI-SKIP] [Auto] Rebuild Patches
3efe45f5 Port Eigencraft to 1.16
0bad6958 Make engine-mode 2 truly random
cd06ca5e Updated Upstream (CraftBukkit)
ef36b4f8 Fix TNT not pushing creative players
915fe522 Fix hex colors not working in some kick messages
f5904171 [Auto] Updated Upstream (Bukkit/CraftBukkit)
757948dc [Auto] Updated Upstream (CraftBukkit)
0893de14 Fix reading the brand message from clients
243d2313 Updated Upstream (Bukkit/CraftBukkit)
4cc7de6c Add playPickupItemAnimation to LivingEntity
20fc1b5c [Auto] Updated Upstream (CraftBukkit/Spigot)
655258b3 [Auto] Updated Upstream (CraftBukkit)
167b1db6 Fix some modded clients getting kicked for invalid payload - Fixes #4201
7f0786cd Fix enderdragon tracking range to honor vanilla
586073c3 [CI-SKIP] Update README.md (for 1.16.2) (#4202)
853f4168 Remove debug
4d7ea429 fix config option in last commit
74d27463 Buffer joins to world
ac96307b [CI-SKIP] switch back to trusty now we figured out the issue
c97ce029 1.16.2 Release (#4123)
5486b3db Fix javadocs failing jenkins builds (#4189)
1330eb5f Brand support
b8372fc0 Improve handling of indestructable blocks
a2a06640 Add moon phase API
47f71aea Fix SpawnChangeEvent not firing for all use-cases
b6c860f2 Don't require FACING data
0c1716a1 Add #setMaxPlayers API
02aed275 [CI-SKIP] Require dependencies script (#4172)
1ccc1c67 Add smithing item helpers
627f4b85 Brand support
20d9ec6b Fix MC-197271
e9287056 [CI-SKIP] Update issue templates with notices
dccaf59a MC-197883: Bandaid decode issue
99a1e58f Merge branch 'master' into progress/1.16.2
ecbc5ca0 Updated Upstream (CraftBukkit)
99362d3c Decomp fix
5f9861a0 Fix MC-197883 by specifying the typeKey
1d8c9c23 [CI-SKIP] Make checkoutpr.sh use $SHELL (#4167)
2b1ca210 update checkout-pr to latest I use
95c9b45d Fix IDE Debug JVM Flag 2 (#4141)
9e6d742c Merge remote-tracking branch 'origin/master' into progress/1.16.2
c8542f23 Fix MC-99259 Wither Boss Bar doesn't update until invulnerability period is over (#4164)
862b8c18 Updated Upstream (Bukkit/CraftBukkit)
100d51eb Do not obfuscate air (#4149)
47740f67 Updated Upstream (CraftBukkit)
948c20e0 Merge remote-tracking branch 'origin/master' into progress/1.16.2
1daafe45 Updated Upstream (Bukkit/CraftBukkit)
98828b00 Merge pull request #4132 from Proximyst/progress/1.16.2
b23f27f8  Fix incorrect return for WorldServer#addAllEntitiesSafely (#3)
5085fa30 Fix MC-187716 Use configured height
c44add5a Initialise a new chunk section if none was found yet updated
74a4d5f8 Remove armour stand double add to world
6d25cc4e Don't mark null chunk sections for block updates
1ba2f214 Updated Upstream (Bukkit/CraftBukkit)
d29d5aaa Fix anti xray
ce6bbaa4 Import fastutil classes patch
9d4616a4 Updated Upstream (Bukkit/CraftBukkit)
109d072b Fix test, add strider mob goal and fix piglin goals
e6caaa20 Fix running; forgot to push this
ee7dce8b Add this to SHIT_TO_CHECK.md aswell
d378257c Fix IDE debug JVM flag for 1.16.2
0d8db446 Merge pull request #4112 from BillyGalbreath/progress/1.16.2
d319d8c4 It compiles!
8f8371c5 Add an OBFHELPER
9caa8e9f missed this
3ce5a5d7 volatile
159eb2e1 Oopsies
7eb08d2f Almost ready
7ca11e97 Current progress on 1.16.2

Tuinity Changes:
eaa6b50 Fix missing block property portal crash
fea5fbd Retain vanilla behavior for error correction rules in collisions
9eb1a3e Do not add a delayed unload ticket for some ticket types

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "Paper"]
         path = Paper
         url = https://github.com/PaperMC/Paper.git
-        branch = progress/1.16.2
+        branch = origin/master

current-paper

@@ -1 +1 @@
-1.16.2--2c8123d6b7738541aeb4c722d8b819c5e29fb76a
+1.16.2--20c1e6cad902fdd2b57434676b239614c0333c79

patches/api/0008-AFK-API.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] AFK API
 
 diff --git a/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
 new file mode 100644
-index 000000000..0c8b3e5e4
+index 00000000..0c8b3e5e
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
 @@ -0,0 +1,70 @@
@@ -81,7 +81,7 @@ index 000000000..0c8b3e5e4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 991f757a8..472194e7e 100644
+index 991f757a..472194e7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1887,4 +1887,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0008-Evoker-API.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 19 Oct 2019 00:28:53 -0500
-Subject: [PATCH] Evoker API
-
-
-diff --git a/src/main/java/org/bukkit/entity/Evoker.java b/src/main/java/org/bukkit/entity/Evoker.java
-index f8d173ad..f2a03f7f 100644
---- a/src/main/java/org/bukkit/entity/Evoker.java
-+++ b/src/main/java/org/bukkit/entity/Evoker.java
-@@ -64,4 +64,21 @@ public interface Evoker extends Spellcaster {
-      */
-     @Deprecated
-     void setCurrentSpell(@Nullable Spell spell);
-+
-+    // Purpur start
-+    /**
-+     * Get the sheep being targeted by the Wololo spell
-+     *
-+     * @return Targeted sheep
-+     */
-+    @Nullable
-+    Sheep getWololoTarget();
-+
-+    /**
-+     * Set the sheep targeted by the Wololo spell
-+     *
-+     * @param sheep Sheep to target
-+     */
-+    void setWololoTarget(@Nullable Sheep sheep);
-+    // Purpur end
- }

patches/api/0009-Bring-back-server-name.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bring back server name
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 7fd924621..f19d865dd 100644
+index bfe84236..ece4f3de 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1787,4 +1787,15 @@ public final class Bukkit {
@@ -25,7 +25,7 @@ index 7fd924621..f19d865dd 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index dacdcd1f2..ad45e2a4c 100644
+index fdceafc7..6b6f20a1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1576,4 +1576,13 @@ public interface Server extends PluginMessageRecipient {

patches/api/0011-LivingEntity-safeFallDistance.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] LivingEntity safeFallDistance
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index a60523cc..5b688cd0 100644
+index 5adf7501..c1eaaca2 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -753,4 +753,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -815,4 +815,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
-     void setJumping(boolean jumping);
+     void playPickupItemAnimation(@NotNull Item item, int quantity);
      // Paper end
 +
 +    // Purpur start

patches/api/0012-Lagging-threshold.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f19d865dd..36bb9d37e 100644
+index ece4f3de..b4e55c17 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1797,5 +1797,14 @@ public final class Bukkit {
@@ -24,7 +24,7 @@ index f19d865dd..36bb9d37e 100644
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ad45e2a4c..5b04a7699 100644
+index 6b6f20a1..70bcd6c3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1584,5 +1584,12 @@ public interface Server extends PluginMessageRecipient {

patches/api/0013-ItemFactory-getMonsterEgg.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] ItemFactory#getMonsterEgg
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 03ba22659..630c15d23 100644
+index 3f23927e..23d55f75 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
-@@ -166,4 +166,15 @@ public interface ItemFactory {
+@@ -215,4 +215,15 @@ public interface ItemFactory {
-     @Nullable
+     @NotNull
-     String getI18NDisplayName(@Nullable ItemStack item);
+     net.md_5.bungee.api.chat.hover.content.Content hoverContentOf(@NotNull org.bukkit.entity.Entity entity, @NotNull net.md_5.bungee.api.chat.BaseComponent[] customName);
      // Paper end
 +
 +    // Purpur start

patches/api/0014-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java
 new file mode 100644
-index 000000000..c050b75e9
+index 00000000..c050b75e
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java
 @@ -0,0 +1,85 @@

patches/api/0015-EMC-MonsterEggSpawnEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] EMC - MonsterEggSpawnEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java b/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java
 new file mode 100644
-index 000000000..983d67234
+index 00000000..983d6723
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java
 @@ -0,0 +1,67 @@

patches/api/0016-Villager-resetOffers.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Villager#resetOffers
 
 
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index c8777a476..ed703af45 100644
+index c8777a47..ed703af4 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
 @@ -113,6 +113,13 @@ public interface Villager extends AbstractVillager {

patches/api/0017-SkeletonHorseTrapEvent-getPlayer.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] SkeletonHorseTrapEvent#getPlayer
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
-index d79dbcd68..1ed3ea8fa 100644
+index d79dbcd6..1ed3ea8f 100644
 --- a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
 @@ -1,20 +1,30 @@

patches/api/0018-LivingEntity-playPickupItemAnimation.patch

@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 19 Oct 2019 02:25:05 -0500
-Subject: [PATCH] LivingEntity#playPickupItemAnimation
-
-
-diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 5b688cd04..a0db76946 100644
---- a/src/main/java/org/bukkit/entity/LivingEntity.java
-+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -768,5 +768,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
-      * @param safeFallDistance Safe fall distance
-      */
-     void setSafeFallDistance(float safeFallDistance);
-+
-+    /**
-+     * Plays pickup item animation
-+     *
-+     * @param item Item to pickup
-+     */
-+    default void playPickupItemAnimation(@NotNull Item item) {
-+        playPickupItemAnimation(item, item.getItemStack().getAmount());
-+    }
-+
-+    /**
-+     * Plays pickup item animation
-+     *
-+     * @param item Item to pickup
-+     * @param quantity Quantity of item
-+     */
-+    void playPickupItemAnimation(@NotNull Item item, int quantity);
-     // Purpur end
- }

patches/api/0018-PaperPR-PlayerItemCooldownEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] PaperPR - PlayerItemCooldownEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java
 new file mode 100644
-index 000000000..2002909f3
+index 00000000..2002909f
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java
 @@ -0,0 +1,77 @@

patches/api/0019-EntityMoveEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] EntityMoveEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java b/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java
 new file mode 100644
-index 000000000..c48c525b8
+index 00000000..c48c525b
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java
 @@ -0,0 +1,95 @@

patches/api/0020-Player-invulnerabilities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 472194e7e..ca98852f8 100644
+index 472194e7..ca98852f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1907,5 +1907,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0021-Anvil-API.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Anvil API
 
 diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
 new file mode 100644
-index 000000000..85663c0a4
+index 00000000..85663c0a
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
 @@ -0,0 +1,52 @@
@@ -64,7 +64,7 @@ index 000000000..85663c0a4
 +}
 diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
 new file mode 100644
-index 000000000..2717ad82c
+index 00000000..2717ad82
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
 @@ -0,0 +1,35 @@
@@ -104,7 +104,7 @@ index 000000000..2717ad82c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java
-index b95e563b5..435026e53 100644
+index b95e563b..435026e5 100644
 --- a/src/main/java/org/bukkit/inventory/AnvilInventory.java
 +++ b/src/main/java/org/bukkit/inventory/AnvilInventory.java
 @@ -109,4 +109,14 @@ public interface AnvilInventory extends Inventory {

patches/api/0022-ItemStack-convenience-methods.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack convenience methods
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index e203c5bfc..e6ba1b179 100644
+index 4ba991b7..a2e476f1 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -8635,4 +8635,36 @@ public enum Material implements Keyed {
+@@ -8645,4 +8645,36 @@ public enum Material implements Keyed {
              // </editor-fold>
          }
      }
@@ -46,7 +46,7 @@ index e203c5bfc..e6ba1b179 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index ccd81fca2..3fecde7a0 100644
+index ccd81fca..3fecde7a 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;

patches/api/0022-PaperPR-BellRingEvent.patch

@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Eearslya Sleiarion <eearslya@gmail.com>
-Date: Mon, 24 Jun 2019 21:27:39 -0700
-Subject: [PATCH] PaperPR - BellRingEvent
-
-Add a new event, BellRingEvent, to trigger whenever a player rings a
-village bell. Passes along the bell block and the player who rang it.
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java
-new file mode 100644
-index 000000000..82e0a747b
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java
-@@ -0,0 +1,53 @@
-+package com.destroystokyo.paper.event.block;
-+
-+import org.bukkit.block.Block;
-+import org.bukkit.entity.Entity;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.block.BlockEvent;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Called when a bell is rung by an entity.
-+ */
-+public class BellRingEvent extends BlockEvent implements Cancellable {
-+    private static final HandlerList handlers = new HandlerList();
-+    private boolean cancelled;
-+    private Entity entity;
-+
-+    public BellRingEvent(@NotNull Block block, @NotNull Entity entity) {
-+        super(block);
-+        this.entity = entity;
-+    }
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancelled) {
-+        this.cancelled = cancelled;
-+    }
-+
-+    /**
-+     * Gets the entity that rang the bell.
-+     *
-+     * @return Entity
-+     */
-+    @NotNull
-+    public Entity getEntity() {
-+        return entity;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}

patches/api/0023-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index b42091752..83c51bb5e 100644
+index b4209175..83c51bb5 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 @@ -206,4 +206,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {

patches/api/0024-ChatColor-conveniences.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] ChatColor conveniences
 
 
 diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
-index 4594701d7..499b222de 100644
+index 4594701d..499b222d 100644
 --- a/src/main/java/org/bukkit/ChatColor.java
 +++ b/src/main/java/org/bukkit/ChatColor.java
 @@ -413,4 +413,30 @@ public enum ChatColor {

patches/api/0025-DragonEggPlaceEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] DragonEggPlaceEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java b/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java
 new file mode 100644
-index 000000000..bdabfd2b5
+index 00000000..bdabfd2b
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java
 @@ -0,0 +1,47 @@

patches/api/0026-Ridables.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Ridables
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
 new file mode 100644
-index 000000000..c0ec5a130
+index 00000000..c0ec5a13
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
 @@ -0,0 +1,37 @@
@@ -48,10 +48,10 @@ index 000000000..c0ec5a130
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 7808ade92..5abf3eaf3 100644
+index cb9ef706..9c418528 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -695,4 +695,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -691,4 +691,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      public boolean isInLava();
      // Paper end

patches/api/0027-Configurable-permission-message-upgrades.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable permission message upgrades
 This allows the configurable permission message in paper.yml to be blank and also support newlines
 
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index c10fc8d23..882c565ac 100644
+index c10fc8d2..882c565a 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -184,9 +184,13 @@ public abstract class Command {

patches/api/0028-LivingEntity-broadcastItemBreak.patch

@@ -5,13 +5,13 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index a0db76946..7b1cb6623 100644
+index c1eaaca2..97a9ad63 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -785,5 +785,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -830,5 +830,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
-      * @param quantity Quantity of item
+      * @param safeFallDistance Safe fall distance
       */
-     void playPickupItemAnimation(@NotNull Item item, int quantity);
+     void setSafeFallDistance(float safeFallDistance);
 +
 +    /**
 +     * Play item break animation for the item in specified equipment slot

patches/api/0029-Item-entity-immunities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index acd80d812..810a1e55c 100644
+index acd80d81..810a1e55 100644
 --- a/src/main/java/org/bukkit/entity/Item.java
 +++ b/src/main/java/org/bukkit/entity/Item.java
 @@ -87,4 +87,34 @@ public interface Item extends Entity {

patches/server/0002-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/pom.xml b/pom.xml
-index ee19a2874..09119ce8e 100644
+index 4f45b8158..02ee19722 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,11 +1,11 @@
@@ -98,7 +98,7 @@ index 74ed02fa9..c1280478e 100644
                  .completer(new ConsoleCommandCompleter(this.server))
          );
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 615a71a78..ba731edd3 100644
+index 106661fae..045c21d00 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1510,7 +1510,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -232,7 +232,7 @@ index 000000000..d8b408f06
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 61e5a91a7..020bb17b6 100644
+index 2b0e1e698..0b789d179 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper
@@ -245,10 +245,10 @@ index 61e5a91a7..020bb17b6 100644
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index c1efe830d..2f319c6e2 100644
+index a9728c6c5..aef0a0eb1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -326,7 +326,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -327,7 +327,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

patches/server/0009-AFK-API.patch

@@ -25,10 +25,10 @@ index ce4ebc96c..eb62555cb 100644
          super(EntityTypes.PLAYER, world);
          this.bL = ItemStack.b;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a947aabfc..8638d4622 100644
+index 8b1e866b3..237b85135 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1718,8 +1718,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1719,8 +1719,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public void resetIdleTimer() {
          this.ca = SystemUtils.getMonotonicMillis();
@@ -129,7 +129,7 @@ index 882b82d89..90c37e4a8 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 06ce390b6..939535cb2 100644
+index a9b0c78d6..c8e384ab6 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -140,7 +140,12 @@ index 06ce390b6..939535cb2 100644
      public static final Predicate<EntityLiving> b = EntityLiving::isAlive;
      public static final Predicate<Entity> c = (entity) -> {
          return entity.isAlive() && !entity.isVehicle() && !entity.isPassenger();
-@@ -27,6 +28,7 @@ public final class IEntitySelector {
+@@ -22,10 +23,12 @@ public final class IEntitySelector {
+     public static final Predicate<Entity> f = (entity) -> {
+         return !(entity instanceof EntityHuman) || !entity.isSpectator() && !((EntityHuman) entity).isCreative() && entity.world.getDifficulty() != EnumDifficulty.PEACEFUL;
+     };
++    public static Predicate<Entity> notSpectator() { return g; } // Purpur - OBFHELPER
+     public static final Predicate<Entity> g = (entity) -> {
          return !entity.isSpectator();
      };
      public static Predicate<EntityHuman> isInsomniac = (player) -> MathHelper.clamp(((EntityPlayer) player).getStatisticManager().getStatisticValue(StatisticList.CUSTOM.get(StatisticList.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= 72000; // Paper
@@ -149,10 +154,10 @@ index 06ce390b6..939535cb2 100644
      // Paper start
      public static final Predicate<Entity> affectsSpawning = (entity) -> {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b44038534..1fa4f0c9d 100644
+index 602ed9aaa..43a88b728 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -235,6 +235,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -236,6 +236,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
          }
  
          if (this.player.F() > 0L && this.minecraftServer.getIdleTimeout() > 0 && SystemUtils.getMonotonicMillis() - this.player.F() > (long) (this.minecraftServer.getIdleTimeout() * 1000 * 60)) {
@@ -165,7 +170,7 @@ index b44038534..1fa4f0c9d 100644
              this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
              this.disconnect(new ChatMessage("multiplayer.disconnect.idling"));
          }
-@@ -458,6 +464,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -459,6 +465,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      this.lastYaw = to.getYaw();
                      this.lastPitch = to.getPitch();
  
@@ -174,7 +179,7 @@ index b44038534..1fa4f0c9d 100644
                      // Skip the first time we do this
                      if (true) { // Spigot - don't skip any move events
                          Location oldTo = to.clone();
-@@ -1126,7 +1134,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1127,7 +1135,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
                              if (!this.player.H() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative() && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR) { // Spigot
                                  flag1 = true;
@@ -183,7 +188,7 @@ index b44038534..1fa4f0c9d 100644
                              }
  
                              this.player.setLocation(d4, d5, d6, f, f1);
-@@ -1165,6 +1173,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1166,6 +1174,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
                                      this.lastYaw = to.getYaw();
                                      this.lastPitch = to.getPitch();
  
@@ -263,7 +268,7 @@ index 361f7857e..2578a4677 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 32856f744..de4d6fb56 100644
+index 715d2c5e8..4904cb2ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2155,4 +2155,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0009-Evoker-API.patch

@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 19 Oct 2019 00:29:02 -0500
-Subject: [PATCH] Evoker API
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index 307d723c9..4bea4ca7e 100644
---- a/src/main/java/net/minecraft/server/EntityEvoker.java
-+++ b/src/main/java/net/minecraft/server/EntityEvoker.java
-@@ -24,7 +24,7 @@ public class EntityEvoker extends EntityIllagerWizard {
-         this.goalSelector.a(8, new PathfinderGoalRandomStroll(this, 0.6D));
-         this.goalSelector.a(9, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 3.0F, 1.0F));
-         this.goalSelector.a(10, new PathfinderGoalLookAtPlayer(this, EntityInsentient.class, 8.0F));
--        this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[]{EntityRaider.class})).a());
-+        this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[]{EntityRaider.class})).a(new Class[0])); // Purpur - decompile error
-         this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300));
-         this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
-         this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, false));
-@@ -79,12 +79,13 @@ public class EntityEvoker extends EntityIllagerWizard {
-         return SoundEffects.ENTITY_EVOKER_HURT;
-     }
- 
-+    public void setWololoTarget(@Nullable EntitySheep sheep) { a(sheep); } // Purpur - OBFHELPER
-     private void a(@Nullable EntitySheep entitysheep) {
-         this.bo = entitysheep;
-     }
- 
-     @Nullable
--    private EntitySheep fg() {
-+    private EntitySheep fg() { return getWololoTarget(); } public EntitySheep getWololoTarget() { // Purpur - OBFHELPER
-         return this.bo;
-     }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
-index 0636d2647..a7a548421 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
-@@ -5,6 +5,10 @@ import net.minecraft.server.EntityIllagerWizard;
- import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.EntityType;
- import org.bukkit.entity.Evoker;
-+// Purpur start
-+import net.minecraft.server.EntitySheep;
-+import javax.annotation.Nullable;
-+// Purpur end
- 
- public class CraftEvoker extends CraftSpellcaster implements Evoker {
- 
-@@ -36,4 +40,17 @@ public class CraftEvoker extends CraftSpellcaster implements Evoker {
-     public void setCurrentSpell(Evoker.Spell spell) {
-         getHandle().setSpell(spell == null ? EntityIllagerWizard.Spell.NONE : EntityIllagerWizard.Spell.a(spell.ordinal()));
-     }
-+
-+    // Purpur start
-+    @Nullable
-+    public org.bukkit.entity.Sheep getWololoTarget() {
-+        EntitySheep target = getHandle().getWololoTarget();
-+        return target == null ? null : (org.bukkit.entity.Sheep) target.getBukkitEntity();
-+    }
-+
-+    @Override
-+    public void setWololoTarget(@Nullable org.bukkit.entity.Sheep sheep) {
-+        getHandle().setWololoTarget(sheep == null ? null : (EntitySheep) ((CraftEntity) sheep).getHandle());
-+    }
-+    // Purpur end
- }

patches/server/0011-Configurable-server-mod-name.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable server mod name
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ba731edd3..5b684affd 100644
+index 045c21d00..847c2d3d1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1510,7 +1510,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

patches/server/0012-LivingEntity-safeFallDistance.patch

@@ -30,10 +30,10 @@ index 8921c2333..da79c7e63 100644
  
      protected int getChestSlots() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index aba9f08db..130516ce6 100644
+index ec9174206..c9cff4c07 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -132,6 +132,7 @@ public abstract class EntityLiving extends Entity {
+@@ -133,6 +133,7 @@ public abstract class EntityLiving extends Entity {
      // CraftBukkit start
      public int expToDrop;
      public int maxAirTicks = 300;
@@ -41,7 +41,7 @@ index aba9f08db..130516ce6 100644
      boolean forceDrops;
      ArrayList<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>();
      public final org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
-@@ -226,8 +227,8 @@ public abstract class EntityLiving extends Entity {
+@@ -227,8 +228,8 @@ public abstract class EntityLiving extends Entity {
              this.cQ();
          }
  
@@ -52,7 +52,7 @@ index aba9f08db..130516ce6 100644
  
              if (!iblockdata.isAir()) {
                  double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
-@@ -1679,7 +1680,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1680,7 +1681,7 @@ public abstract class EntityLiving extends Entity {
          MobEffect mobeffect = this.getEffect(MobEffects.JUMP);
          float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
  
@@ -62,12 +62,12 @@ index aba9f08db..130516ce6 100644
  
      protected void playBlockStepSound() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 3777aba5f..2a82a2bb7 100644
+index 22705cda3..ec4b30b7f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -752,4 +752,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -798,4 +798,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+         getHandle().receive(((CraftItem) item).getHandle(), quantity);
      }
- 
      // Paper end
 +
 +    // Purpur start

patches/server/0013-Lagging-threshold.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5b684affd..eee7356d5 100644
+index 847c2d3d1..22dadf6d2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -166,6 +166,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

patches/server/0014-ItemFactory-getMonsterEgg.patch

@@ -18,11 +18,11 @@ index 76c585299..f543bd84f 100644
      private final int c;
      private final EntityTypes<?> d;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 1c3e6e0c9..c7067dd85 100644
+index af84813c7..2d38a4782 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -353,4 +353,18 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -388,4 +388,18 @@ public final class CraftItemFactory implements ItemFactory {
-         return nms != null ? net.minecraft.server.LocaleLanguage.getInstance().translateKey(nms.getItem().getName()) : null;
+             new net.md_5.bungee.api.chat.TextComponent(customName));
      }
      // Paper end
 +

patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 2767de830..dcb43775b 100644
+index e23247e0a..2faa83fad 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
-@@ -143,10 +143,21 @@ public class EntityTypes<T extends Entity> {
+@@ -143,6 +143,16 @@ public class EntityTypes<T extends Entity> {
          return (EntityTypes) IRegistry.a((IRegistry) IRegistry.ENTITY_TYPE, s, (Object) entitytypes_builder.a(s));
      }
  
@@ -25,12 +25,7 @@ index 2767de830..dcb43775b 100644
      public static MinecraftKey getName(EntityTypes<?> entitytypes) {
          return IRegistry.ENTITY_TYPE.getKey(entitytypes);
      }
- 
+@@ -276,6 +286,16 @@ public class EntityTypes<T extends Entity> {
-+    public static Optional<EntityTypes<?>> getType(String name) { return a(name); } // Purpur - OBFHELPER
-     public static Optional<EntityTypes<?>> a(String s) {
-         return IRegistry.ENTITY_TYPE.getOptional(MinecraftKey.a(s));
-     }
-@@ -275,6 +286,16 @@ public class EntityTypes<T extends Entity> {
          return this.bg;
      }
  
@@ -44,10 +39,10 @@ index 2767de830..dcb43775b 100644
 +    }
 +    // Purpur end
 +
+     public String getDescriptionId() { return f(); } // Paper - OBFHELPER
      public String f() {
          if (this.bo == null) {
-             this.bo = SystemUtils.a("entity", IRegistry.ENTITY_TYPE.getKey(this));
+@@ -285,6 +305,7 @@ public class EntityTypes<T extends Entity> {
-@@ -283,6 +304,7 @@ public class EntityTypes<T extends Entity> {
          return this.bo;
      }
  

patches/server/0016-EMC-MonsterEggSpawnEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] EMC - MonsterEggSpawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index dcb43775b..8300e7d1e 100644
+index 2faa83fad..c03b0b58b 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -177,19 +177,45 @@ public class EntityTypes<T extends Entity> {

patches/server/0019-LivingEntity-playPickupItemAnimation.patch

@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 19 Oct 2019 02:25:16 -0500
-Subject: [PATCH] LivingEntity#playPickupItemAnimation
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 2a82a2bb7..a415707e9 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -763,5 +763,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     public void setSafeFallDistance(float safeFallDistance) {
-         getHandle().safeFallDistance = safeFallDistance;
-     }
-+
-+    @Override
-+    public void playPickupItemAnimation(org.bukkit.entity.Item item, int quantity) {
-+        getHandle().receive(((CraftItem)item).getHandle(), quantity);
-+    }
-     // Purpur end
- }

patches/server/0020-EntityMoveEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 130516ce6..17128d5aa 100644
+index c9cff4c07..c7c452e7f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2790,6 +2790,20 @@ public abstract class EntityLiving extends Entity {
+@@ -2801,6 +2801,20 @@ public abstract class EntityLiving extends Entity {
  
          this.collideNearby();
          this.world.getMethodProfiler().exit();

patches/server/0021-Player-invulnerabilities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8638d4622..71d2a658d 100644
+index 237b85135..0ed9ab78c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -144,6 +144,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -39,7 +39,7 @@ index 8638d4622..71d2a658d 100644
                  return false;
              } else {
                  if (damagesource instanceof EntityDamageSource) {
-@@ -983,6 +991,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -984,6 +992,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                  // CraftBukkit end
              }
  
@@ -47,7 +47,7 @@ index 8638d4622..71d2a658d 100644
              return this;
          }
      }
-@@ -2121,9 +2130,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2122,9 +2131,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isFrozen() { // Paper - protected > public
@@ -67,10 +67,10 @@ index 8638d4622..71d2a658d 100644
      public Scoreboard getScoreboard() {
          return getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1fa4f0c9d..95534b0c3 100644
+index 43a88b728..8b2f7d1f8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1575,6 +1575,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1576,6 +1576,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
          // Paper start
          PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
@@ -79,10 +79,10 @@ index 1fa4f0c9d..95534b0c3 100644
          this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 33915eeb0..83219d657 100644
+index 787e80c50..b40431aa4 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -903,6 +903,8 @@ public abstract class PlayerList {
+@@ -902,6 +902,8 @@ public abstract class PlayerList {
          }
          // Paper end
  
@@ -108,7 +108,7 @@ index 2578a4677..c441fcea9 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index de4d6fb56..5013c9175 100644
+index 4904cb2ff..8cf61bf89 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2171,5 +2171,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0023-PaperPR-Add-BellRingEvent.patch

@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Eearslya Sleiarion <eearslya@gmail.com>
-Date: Mon, 24 Jun 2019 21:27:32 -0700
-Subject: [PATCH] PaperPR - Add BellRingEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/BlockBell.java b/src/main/java/net/minecraft/server/BlockBell.java
-index 2ef899c76..7db4e22c6 100644
---- a/src/main/java/net/minecraft/server/BlockBell.java
-+++ b/src/main/java/net/minecraft/server/BlockBell.java
-@@ -44,7 +44,7 @@ public class BlockBell extends BlockTileEntity {
-         Entity entity = iprojectile.getShooter();
-         EntityHuman entityhuman = entity instanceof EntityHuman ? (EntityHuman) entity : null;
- 
--        this.a(world, iblockdata, movingobjectpositionblock, entityhuman, true);
-+        this.handleBellRing(world, iblockdata, movingobjectpositionblock, entityhuman, true, entity); // Purpur
-     }
- 
-     @Override
-@@ -53,11 +53,23 @@ public class BlockBell extends BlockTileEntity {
-     }
- 
-     public boolean a(World world, IBlockData iblockdata, MovingObjectPositionBlock movingobjectpositionblock, @Nullable EntityHuman entityhuman, boolean flag) {
-+        // Purpur start - BellRingEvent
-+        return this.handleBellRing(world, iblockdata, movingobjectpositionblock, entityhuman, true, entityhuman);
-+    }
-+
-+    public boolean handleBellRing(World world, IBlockData iblockdata, MovingObjectPositionBlock movingobjectpositionblock, @Nullable EntityHuman entityhuman, boolean flag, @Nullable Entity entity) {
-+        // Purpur end
-         EnumDirection enumdirection = movingobjectpositionblock.getDirection();
-         BlockPosition blockposition = movingobjectpositionblock.getBlockPosition();
-         boolean flag1 = !flag || this.a(iblockdata, enumdirection, movingobjectpositionblock.getPos().y - (double) blockposition.getY());
- 
-         if (flag1) {
-+            // Purpur start - BellRingEvent
-+            org.bukkit.block.Block block = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
-+            if (!new com.destroystokyo.paper.event.block.BellRingEvent(block, entity.getBukkitEntity()).callEvent()) {
-+                return true;
-+            }
-+            // Purpur end
-             boolean flag2 = this.a(world, blockposition, enumdirection);
- 
-             if (flag2 && entityhuman != null) {

patches/server/0024-Alternative-Keepalive-Handling.patch

@@ -17,10 +17,10 @@ index 8e93f1540..470f92c4f 100644
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 95534b0c3..5ec3679cc 100644
+index 8b2f7d1f8..307ffb21d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -77,6 +77,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      private long lastKeepAlive = SystemUtils.getMonotonicMillis(); private void setLastPing(long lastPing) { this.lastKeepAlive = lastPing;}; private long getLastPing() { return this.lastKeepAlive;}; // Paper - OBFHELPER
      private boolean awaitingKeepAlive; private void setPendingPing(boolean isPending) { this.awaitingKeepAlive = isPending;}; private boolean isPendingPing() { return this.awaitingKeepAlive;}; // Paper - OBFHELPER
      private long h; private void setKeepAliveID(long keepAliveID) { this.h = keepAliveID;}; private long getKeepAliveID() {return this.h; };  // Paper - OBFHELPER
@@ -28,7 +28,7 @@ index 95534b0c3..5ec3679cc 100644
      // CraftBukkit start - multithreaded fields
      private volatile int chatThrottle;
      private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle");
-@@ -204,6 +205,21 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -205,6 +206,21 @@ public class PlayerConnection implements PacketListenerPlayIn {
          long currentTime = SystemUtils.getMonotonicMillis();
          long elapsedTime = currentTime - this.getLastPing();
  
@@ -50,7 +50,7 @@ index 95534b0c3..5ec3679cc 100644
          if (this.isPendingPing()) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info
-@@ -2717,6 +2733,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2723,6 +2739,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {

patches/server/0025-Silk-touch-spawners.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Silk touch spawners
 
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index a45ceff9f..d08b58473 100644
+index 4b4f14711..372ee6adc 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -223,6 +223,7 @@ public class Block extends BlockBase implements IMaterial {
@@ -105,7 +105,7 @@ index 81e145ff0..91b92d95a 100644
          return i;
 diff --git a/src/main/java/net/minecraft/server/ItemSpawner.java b/src/main/java/net/minecraft/server/ItemSpawner.java
 new file mode 100644
-index 000000000..babe8ad2c
+index 000000000..5c7f73918
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ItemSpawner.java
 @@ -0,0 +1,23 @@
@@ -124,7 +124,7 @@ index 000000000..babe8ad2c
 +            if (spawner instanceof TileEntityMobSpawner && itemstack.hasTag()) {
 +                NBTTagCompound tag = itemstack.getTag();
 +                if (tag.hasKey("Purpur.mob_type")) {
-+                    EntityTypes.getType(tag.getString("Purpur.mob_type")).ifPresent(type ->
++                    EntityTypes.getByName(tag.getString("Purpur.mob_type")).ifPresent(type ->
 +                            ((TileEntityMobSpawner) spawner).getSpawner().setMobName(type));
 +                }
 +            }

patches/server/0028-Fix-vanilla-command-permission-handler.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix vanilla command permission handler
 
 
 diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
-index ca0d66448..0fab36224 100644
+index d9c47f3fc..cf35c9d54 100644
 --- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
 +++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
 @@ -35,6 +35,7 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {

patches/server/0031-Giants-AI-settings.patch

@@ -17,7 +17,7 @@ index c57e23e16..92aa104dc 100644
      public AttributeModifiable a(AttributeBase attributebase) {
          return (AttributeModifiable) this.b.computeIfAbsent(attributebase, (attributebase1) -> {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 958f361a5..1b8d9f129 100644
+index 5dd2a52d3..6bf087bd2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -137,7 +137,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -112,10 +112,10 @@ index 9f4f56c47..8dce2aad7 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 36df27024..b7fcade36 100644
+index 9cf496b5e..be23120a2 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -939,6 +939,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -940,6 +940,7 @@ public abstract class EntityInsentient extends EntityLiving {
          return f;
      }
  
@@ -123,7 +123,7 @@ index 36df27024..b7fcade36 100644
      protected void a(DifficultyDamageScaler difficultydamagescaler) {
          if (this.random.nextFloat() < 0.15F * difficultydamagescaler.d()) {
              int i = this.random.nextInt(2);
-@@ -1046,6 +1047,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1047,6 +1048,7 @@ public abstract class EntityInsentient extends EntityLiving {
          }
      }
  
@@ -131,7 +131,7 @@ index 36df27024..b7fcade36 100644
      protected void b(DifficultyDamageScaler difficultydamagescaler) {
          float f = difficultydamagescaler.d();
  
-@@ -1087,10 +1089,12 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1088,10 +1090,12 @@ public abstract class EntityInsentient extends EntityLiving {
          } else {
              this.setLeftHanded(false);
          }
@@ -146,10 +146,10 @@ index 36df27024..b7fcade36 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 17128d5aa..82cf853ab 100644
+index c7c452e7f..cf56621ba 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2148,7 +2148,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2159,7 +2159,7 @@ public abstract class EntityLiving extends Entity {
          this.enderTeleportTo(vec3d.x, vec3d.y, vec3d.z);
      }
  

patches/server/0032-Illusioners-AI-settings.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Illusioners AI settings
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-index 1c8231620..7b2c459ad 100644
+index 73ac27913..66bfebe1c 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 @@ -19,6 +19,17 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan

patches/server/0042-Add-option-to-set-armorstand-step-height.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to set armorstand step height
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 70c2c2e3e..eb32abc5d 100644
+index 81df71b7e..afa23395c 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -617,6 +617,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -17,7 +17,7 @@ index 70c2c2e3e..eb32abc5d 100644
          if (!this.canTick) {
              if (this.noTickPoseDirty) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 06d9d9ed4..b41d4959c 100644
+index 95e801ce2..f01c74a2e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -63,6 +63,11 @@ public class PurpurWorldConfig {

patches/server/0045-Cows-eat-mushrooms.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Cows eat mushrooms
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1b8d9f129..449cf9d77 100644
+index 6bf087bd2..2be922a71 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2724,6 +2724,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2729,6 +2729,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.invulnerable = flag;
      }
  
@@ -110,10 +110,10 @@ index 42e6761c8..cfb009c81 100644
      public EntityCow createChild(WorldServer worldserver, EntityAgeable entityageable) {
          return (EntityCow) EntityTypes.COW.a((World) worldserver);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 82cf853ab..5e9849a46 100644
+index cf56621ba..76575ea5f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity {
+@@ -81,7 +81,7 @@ public abstract class EntityLiving extends Entity {
      public int maxNoDamageTicks;
      public final float ay;
      public final float az;

patches/server/0052-Signs-allow-color-codes.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 71d2a658d..7fad63234 100644
+index 0ed9ab78c..698a2623b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1243,6 +1243,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1244,6 +1244,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public void openSign(TileEntitySign tileentitysign) {
@@ -17,10 +17,10 @@ index 71d2a658d..7fad63234 100644
          this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5ec3679cc..8e6192fa6 100644
+index 307ffb21d..3a7014d30 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2714,6 +2714,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2720,6 +2720,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
                  }
                  // Paper end

patches/server/0054-Controllable-Minecarts.patch

@@ -22,10 +22,10 @@ index 2291135ea..bc61aaff6 100644
          super(i, j, k);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 5e9849a46..f7c969764 100644
+index 76575ea5f..c8b1fbcf1 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -98,9 +98,9 @@ public abstract class EntityLiving extends Entity {
+@@ -99,9 +99,9 @@ public abstract class EntityLiving extends Entity {
      protected int aO;protected int getKillCount() { return this.aO; } // Paper - OBFHELPER
      public float lastDamage;
      public boolean jumping; // Paper protected -> public
@@ -119,7 +119,7 @@ index ceef7aaf9..002651aaf 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 70e504ff3..276131adc 100644
+index 2763cc943..e54d071dd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1,5 +1,7 @@

patches/server/0055-Disable-loot-drops-on-death-by-cramming.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable loot drops on death by cramming
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f7c969764..618faae95 100644
+index c8b1fbcf1..d9c19f8f5 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1484,8 +1484,10 @@ public abstract class EntityLiving extends Entity {
+@@ -1485,8 +1485,10 @@ public abstract class EntityLiving extends Entity {
  
          this.dropInventory(); // CraftBukkit - from below
          if (this.cV() && this.world.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
@@ -20,7 +20,7 @@ index f7c969764..618faae95 100644
          // CraftBukkit start - Call death event
          org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 276131adc..143908b2d 100644
+index e54d071dd..a12a55dc9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -110,6 +110,11 @@ public class PurpurWorldConfig {

patches/server/0056-Players-should-not-cram-to-death.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Players should not cram to death
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 7fad63234..65c241d88 100644
+index 698a2623b..a99429080 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1219,7 +1219,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1220,7 +1220,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isInvulnerable(DamageSource damagesource) {

patches/server/0057-Option-to-toggle-milk-curing-bad-omen.patch

@@ -19,7 +19,7 @@ index fcf254bba..79554e18f 100644
  
          return itemstack.isEmpty() ? new ItemStack(Items.BUCKET) : itemstack;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 143908b2d..77e2dce3f 100644
+index a12a55dc9..883614746 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -111,8 +111,10 @@ public class PurpurWorldConfig {

patches/server/0059-Debug-stick-should-not-update-neighbors.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Debug stick should not update neighbors
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index ace50805b..76cc28517 100644
+index 3adb29f00..e7759f248 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -229,6 +229,11 @@ public final class ItemStack {

patches/server/0060-Fix-reloading-paper.yml.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix reloading paper.yml
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d5a1ade21..fedea8106 100644
+index fbfea9e98..b0fcf7604 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -20,7 +20,7 @@ public class PaperWorldConfig {

patches/server/0061-Fix-the-dead-lagging-the-server.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 449cf9d77..6d809cc78 100644
+index 2be922a71..5bb1d8e51 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1501,6 +1501,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,10 +17,10 @@ index 449cf9d77..6d809cc78 100644
  
      public void f(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 618faae95..51b2aa3e2 100644
+index d9c19f8f5..91fc7ba76 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2466,7 +2466,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2477,7 +2477,7 @@ public abstract class EntityLiving extends Entity {
              }
          }
  

patches/server/0063-Add-permission-for-F3-N-debug.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for F3+N debug
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 83219d657..8757711e9 100644
+index b40431aa4..daf5beb0b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1057,6 +1057,7 @@ public abstract class PlayerList {
+@@ -1056,6 +1056,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + i);
              }

patches/server/0065-Configurable-TPS-Catchup.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable TPS Catchup
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index eee7356d5..89f422524 100644
+index 22dadf6d2..70f497385 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1001,7 +1001,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

patches/server/0066-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch

@@ -18,7 +18,7 @@ index a3150bd1c..b24b8c39d 100644
  
              if (b0 > 0 && !this.z()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3e1e1d336..61094d4f7 100644
+index 355df16d2..ae7de565c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -112,9 +112,11 @@ public class PurpurWorldConfig {

patches/server/0068-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entities pick up loot bypass mob-griefing gamerule
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index b7fcade36..fc2ac5fb8 100644
+index be23120a2..57d8936a9 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -542,7 +542,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -18,7 +18,7 @@ index b7fcade36..fc2ac5fb8 100644
              Iterator iterator = list.iterator();
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e6a1d88a2..1a830b579 100644
+index c1e511bad..0008c4b12 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -111,10 +111,12 @@ public class PurpurWorldConfig {

patches/server/0071-Allow-leashing-villagers.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow leashing villagers
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index fc2ac5fb8..c87c95160 100644
+index 57d8936a9..3460b0f5a 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -1138,6 +1138,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1139,6 +1139,7 @@ public abstract class EntityInsentient extends EntityLiving {
          if (!this.isAlive()) {
              return EnumInteractionResult.PASS;
          } else if (this.getLeashHolder() == entityhuman) {
@@ -51,10 +51,10 @@ index 74c2d89af..96dda6a14 100644
      @Override
      public EntityAgeable createChild(WorldServer worldserver, EntityAgeable entityageable) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 26a760bc3..665eac22f 100644
+index 5826c2985..077860df8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -269,17 +269,21 @@ public class PurpurWorldConfig {
+@@ -276,17 +276,21 @@ public class PurpurWorldConfig {
  
      public int villagerBrainTicks = 1;
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;

patches/server/0075-Add-player-death-exp-control-options.patch

@@ -40,7 +40,7 @@ index eb62555cb..48f9feaea 100644
              return 0;
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 58b21bc81..2d2dfe572 100644
+index 7c27696eb..4c43444cb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -121,6 +121,13 @@ public class PurpurWorldConfig {