diff --git a/patches/removed/1.17/0176-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0426-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 76%
rename from patches/removed/1.17/0176-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0426-Option-for-maximum-exp-value-when-merging-orbs.patch
index c2626fdee4..329975a609 100644
--- a/patches/removed/1.17/0176-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0426-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -5,25 +5,27 @@ Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 90ca51dfdbb3045dd528450225cba96f5834166e..6c692e58cde22003ecbf6dc5695799147c39905a 100644
+index 16cf7d116e3ffd44ffc4f060b4014b52389cff77..3bc6329d3ea48966cb99e792f9b35e2d2d71a34b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -342,4 +342,10 @@ public class PaperWorldConfig {
-         disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
+@@ -359,6 +359,12 @@ public class PaperWorldConfig {
          log("Creeper lingering effect: " + disableCreeperLingeringEffect);
      }
-+
+ 
 +    public int expMergeMaxValue;
 +    private void expMergeMaxValue() {
 +        expMergeMaxValue = getInt("experience-merge-max-value", -1);
 +        log("Experience Merge Max Value: " + expMergeMaxValue);
 +    }
- }
++
+     public double squidMaxSpawnHeight;
+     private void squidMaxSpawnHeight() {
+         squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 3f082b7fd50752728917a7da28cba4cb396a9fdf..7d6834796259e364196280ffa468b5bf999ec7b9 100644
+index 7d43439a13bd109399691ddec60ee99c818db198..36b2faebca20ef152e4fc88ecfa660ecbbb11384 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -587,16 +587,32 @@ public class CraftEventFactory {
+@@ -610,16 +610,30 @@ public class CraftEventFactory {
              net.minecraft.world.entity.ExperienceOrb xp = (net.minecraft.world.entity.ExperienceOrb) entity;
              double radius = world.spigotConfig.expMerge;
              if (radius > 0) {
@@ -36,25 +38,21 @@ index 3f082b7fd50752728917a7da28cba4cb396a9fdf..7d6834796259e364196280ffa468b5bf
                  for (Entity e : entities) {
                      if (e instanceof net.minecraft.world.entity.ExperienceOrb) {
                          net.minecraft.world.entity.ExperienceOrb loopItem = (net.minecraft.world.entity.ExperienceOrb) e;
--                        if (!loopItem.removed) {
--                            xp.value += loopItem.value;
--                            loopItem.remove();
+-                        if (!loopItem.isRemoved()) {
 +                        // Paper start
-+                        if (!loopItem.removed && !(maxValue > 0 && loopItem.value >= maxValue)) {
++                        if (!loopItem.isRemoved() && !(maxValue > 0 && loopItem.value >= maxValue)) {
 +                            long newTotal = (long)xp.value + (long)loopItem.value;
 +                            if ((int) newTotal < 0) continue; // Overflow
 +                            if (maxValue > 0 && newTotal > (long)maxValue) {
 +                                loopItem.value = (int) (newTotal - maxValue);
 +                                xp.value = maxValue;
 +                            } else {
-+                                xp.value += loopItem.value;
-+                                loopItem.remove();
-+                            }
-+                            // Paper end
+                             xp.value += loopItem.value;
+                             loopItem.discard();
++                            } // Paper end
                          }
                      }
                  }
-+
 +                } // Paper end - End iteration skip check - All tweaking ends here
              }
          // Spigot end
diff --git a/patches/removed/1.17/0184-ExperienceOrbMergeEvent.patch b/patches/server/0427-ExperienceOrbMergeEvent.patch
similarity index 67%
rename from patches/removed/1.17/0184-ExperienceOrbMergeEvent.patch
rename to patches/server/0427-ExperienceOrbMergeEvent.patch
index aef031bd77..5a91c0f475 100644
--- a/patches/removed/1.17/0184-ExperienceOrbMergeEvent.patch
+++ b/patches/server/0427-ExperienceOrbMergeEvent.patch
@@ -2,21 +2,22 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
+
 Has to be reimplemented at one point maybe
 Fired when the server is about to merge 2 experience orbs
 Plugins can cancel this if they want to ensure experience orbs do not lose important
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7d6834796259e364196280ffa468b5bf999ec7b9..5e8ff18f98b03741ccbb927f87499ae36d775a86 100644
+index 36b2faebca20ef152e4fc88ecfa660ecbbb11384..d4b8035160332d98c37918f62ee9e0d630e23ee8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -597,7 +597,7 @@ public class CraftEventFactory {
+@@ -620,7 +620,7 @@ public class CraftEventFactory {
                      if (e instanceof net.minecraft.world.entity.ExperienceOrb) {
                          net.minecraft.world.entity.ExperienceOrb loopItem = (net.minecraft.world.entity.ExperienceOrb) e;
                          // Paper start
--                        if (!loopItem.removed && !(maxValue > 0 && loopItem.value >= maxValue)) {
-+                        if (!loopItem.removed && !(maxValue > 0 && loopItem.value >= maxValue)  && new com.destroystokyo.paper.event.entity.ExperienceOrbMergeEvent((org.bukkit.entity.ExperienceOrb) entity.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) loopItem.getBukkitEntity()).callEvent()) { // Paper
+-                        if (!loopItem.isRemoved() && !(maxValue > 0 && loopItem.value >= maxValue)) {
++                        if (!loopItem.isRemoved() && !(maxValue > 0 && loopItem.value >= maxValue) && new com.destroystokyo.paper.event.entity.ExperienceOrbMergeEvent((org.bukkit.entity.ExperienceOrb) entity.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) loopItem.getBukkitEntity()).callEvent()) { // Paper - ExperienceOrbMergeEvent
                              long newTotal = (long)xp.value + (long)loopItem.value;
                              if ((int) newTotal < 0) continue; // Overflow
                              if (maxValue > 0 && newTotal > (long)maxValue) {