Rebase fixups

patches/server/Improve-and-expand-AsyncCatcher.patch

@@ -59,8 +59,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private boolean addEntity(T entity, boolean existing) {
 +        org.spigotmc.AsyncCatcher.catchOp("Entity add"); // Paper
          // Paper start - chunk system hooks
-         if (existing) {
-             // I don't want to know why this is a generic type.
+         // I don't want to know why this is a generic type.
+         Entity entityCasted = (Entity)entity;
 @@ -0,0 +0,0 @@ public class PersistentEntitySectionManager<T extends EntityAccess> implements A
      }