Disable Spigot xp merging by defaultconfig-defaults

Players need to deal the final blow for mobs to drop xp orbs and will generally be picked up rather quickly. For larger masses, vanilla has its own merging

6 files changed, 7 insertions, 7 deletions

diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch
index dcc0eff8d2..184c721bf2 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/server/0005-Paper-config-files.patch
@@ -5091,7 +5091,7 @@ index 192b6fbd34b9b90112f869ae6e367ab9ba5a5906..08b0ca7b68bf238366f4d6904478852e
          for ( Method method : clazz.getDeclaredMethods() )
          {
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index a6d2ce801b236b046b94913bccf7eccfc561f35a..0149d9014d0c6eab772297e7caeb9e7272574306 100644
+index a6d2ce801b236b046b94913bccf7eccfc561f35a..8bc7a9da0eb345e65f42461e2fb22731eb80790a 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -58,8 +58,14 @@ public class SpigotWorldConfig
@@ -5124,7 +5124,7 @@ index a6d2ce801b236b046b94913bccf7eccfc561f35a..0149d9014d0c6eab772297e7caeb9e72
      private void expMerge()
      {
 -        this.expMerge = this.getDouble("merge-radius.exp", 3.0 );
-+        this.expMerge = this.getDouble("merge-radius.exp", 0.5 );
++        this.expMerge = this.getDouble("merge-radius.exp", -1 );
          this.log( "Experience Merge Radius: " + this.expMerge );
      }
  
diff --git a/patches/server/0233-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0233-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
index a9c8f250ce..0ed98b85c4 100644
--- a/patches/server/0233-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/server/0233-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Restore vanilla default mob-spawn-range and water animals
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 0149d9014d0c6eab772297e7caeb9e7272574306..631b9f02ae04acd1e21a5ee01ac53ecb81594990 100644
+index 8bc7a9da0eb345e65f42461e2fb22731eb80790a..c4acaec8d331b4600c7b8b28fa969de9645938da 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -190,7 +190,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0327-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0327-Set-spigots-verbose-world-setting-to-false-by-def.patch
index 284b48a9e4..d6e5084490 100644
--- a/patches/server/0327-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0327-Set-spigots-verbose-world-setting-to-false-by-def.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Set spigots verbose world setting to false by def
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 631b9f02ae04acd1e21a5ee01ac53ecb81594990..222312d176e0844419fe13b0da756a27a1b9c79c 100644
+index c4acaec8d331b4600c7b8b28fa969de9645938da..491dd55b2870093184a606efabd251c68cc24719 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -20,7 +20,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0634-Fix-Spigot-growth-modifiers.patch b/patches/server/0634-Fix-Spigot-growth-modifiers.patch
index 229616d8cb..35160b163d 100644
--- a/patches/server/0634-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0634-Fix-Spigot-growth-modifiers.patch
@@ -102,7 +102,7 @@ index c9ed129db2cadd0a33d69993961f43088725c3cb..d06e3892cf42723f8e3f621b5497c534
              this.grow(world, state, pos, 1);
          }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 222312d176e0844419fe13b0da756a27a1b9c79c..3d151140338df551768965b1673e8dd11fbc4116 100644
+index 491dd55b2870093184a606efabd251c68cc24719..e76f96a5c48d1eda2f9bbb3e11dd79f23f9ab75c 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -96,6 +96,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0664-Add-missing-structure-set-seed-configs.patch b/patches/server/0664-Add-missing-structure-set-seed-configs.patch
index a787c16a7e..12c137b53e 100644
--- a/patches/server/0664-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0664-Add-missing-structure-set-seed-configs.patch
@@ -277,7 +277,7 @@ index a4c34e9415632354d33668a38d06453ada4d3c77..cbf13e4f2da6a27619e9bc9a7cd73bb6
  
          @Override
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 3d151140338df551768965b1673e8dd11fbc4116..f19da33110d8690c3824d9cdcd9f1e6f98d051a4 100644
+index e76f96a5c48d1eda2f9bbb3e11dd79f23f9ab75c..2b263246135c85aa225120519e9702a628773935 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -322,6 +322,18 @@ public class SpigotWorldConfig
diff --git a/patches/server/1000-Entity-Activation-Range-2.0.patch b/patches/server/1000-Entity-Activation-Range-2.0.patch
index f423cc5ce7..19faab4d73 100644
--- a/patches/server/1000-Entity-Activation-Range-2.0.patch
+++ b/patches/server/1000-Entity-Activation-Range-2.0.patch
@@ -746,7 +746,7 @@ index 9fb9fa62c32445ac3c3883a6433759c86dcfc428..bf2d18f74b0f0da7c3c30310c74224a1
              isActive = false;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index f19da33110d8690c3824d9cdcd9f1e6f98d051a4..50569f24a678f993dc8feeb74585bca0c7cf544f 100644
+index 2b263246135c85aa225120519e9702a628773935..2c408fa4abcbe1171c58aee8799c8cf7867d0f0a 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -211,14 +211,60 @@ public class SpigotWorldConfig