Remove some patches

patches/server/Handle-Item-Meta-Inconsistencies.patch

@@ -112,18 +112,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              return 0;
          }
 -        return EnchantmentHelper.getItemEnchantmentLevel(CraftEnchantment.bukkitToMinecraft(ench), this.handle);
-+        // Paper start - replace to allow custom enchantments
-+        final ListTag enchantments = this.handle.getEnchantmentTags();
-+        for (int i = 0; i < enchantments.size(); i++) {
-+            final CompoundTag tag = enchantments.getCompound(i);
-+            final String id = tag.getString(CraftMetaItem.ENCHANTMENTS_ID.NBT);
-+            final Enchantment enchant = Enchantment.getByKey(CraftNamespacedKey.fromStringOrNull(id));
-+            if (ench.equals(enchant)) {
-+                return EnchantmentHelper.getEnchantmentLevel(tag);
-+            }
-+        }
-+        return 0;
-+        // Paper end - replace to allow custom enchantments
++        return EnchantmentHelper.getItemEnchantmentLevel(CraftEnchantment.getRaw(ench), handle);
      }
  
      @Override

patches/server/MC-50319-Check-other-worlds-for-shooter-of-projectil.patch

@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 17 Oct 2018 19:17:27 -0400
-Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles
-
-Say a player shoots an arrow through a nether portal, the game
-would lose the shooter for determining things such as Player Kills,
-because the entity is in another world.
-
-If the projectile fails to find the shooter in the current world, check
-other worlds.
-
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -0,0 +0,0 @@ public abstract class Projectile extends Entity implements TraceableEntity {
-                     ServerLevel worldserver = (ServerLevel) world;
- 
-                     this.cachedOwner = worldserver.getEntity(this.ownerUUID);
-+                    // Paper start - check all worlds
-+                    if (this.cachedOwner == null) {
-+                        for (final ServerLevel level : this.level().getServer().getAllLevels()) {
-+                            if (level == this.level()) continue;
-+                            final Entity entity = level.getEntity(this.ownerUUID);
-+                            if (entity != null) {
-+                                this.cachedOwner = entity;
-+                                break;
-+                            }
-+                        }
-+                    }
-+                    // Paper end
-                     return this.cachedOwner;
-                 }
-             }

patches/server/Optimize-brigadier-child-sorting-performance.patch

@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: virustotalop <virustotalop@gmail.com>
-Date: Thu, 16 Apr 2020 20:51:32 -0700
-Subject: [PATCH] Optimize brigadier child sorting performance
-
-
-diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
-+++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
-@@ -0,0 +0,0 @@ import java.util.function.Predicate;
- import net.minecraft.commands.CommandSourceStack;
- 
- public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
--    private final Map<String, CommandNode<S>> children = new LinkedHashMap<>();
-+    private Map<String, CommandNode<S>> children = com.google.common.collect.Maps.newTreeMap(); // Paper - Switch to tree map for automatic sorting
-     private final Map<String, LiteralCommandNode<S>> literals = new LinkedHashMap<>();
-     private final Map<String, ArgumentCommandNode<S, ?>> arguments = new LinkedHashMap<>();
-     public Predicate<S> requirement;
-@@ -0,0 +0,0 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
-                 this.arguments.put(node.getName(), (ArgumentCommandNode<S, ?>) node);
-             }
-         }
-+
-+        // Paper - Remove manual sorting, it is no longer needed
-     }
- 
-     public void findAmbiguities(final AmbiguityConsumer<S> consumer) {

patches/server/Refresh-ProjectileSource-for-projectiles.patch

@@ -64,9 +64,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          } else {
              if (this.ownerUUID != null) {
 @@ -0,0 +0,0 @@ public abstract class Projectile extends Entity implements TraceableEntity {
-                         }
-                     }
-                     // Paper end
+                     ServerLevel worldserver = (ServerLevel) world;
+ 
+                     this.cachedOwner = worldserver.getEntity(this.ownerUUID);
 +                    this.refreshProjectileSource(false); // Paper
                      return this.cachedOwner;
                  }