From 072d6ec8cbd6bf49cf2d109bcca584fc129ab66c Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 10 Nov 2017 23:04:06 -0500
Subject: [PATCH] Add configurable max exp value when merging orbs

---
 ...-maximum-exp-value-when-merging-orbs.patch | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 Spigot-Server-Patches/0249-Option-for-maximum-exp-value-when-merging-orbs.patch

diff --git a/Spigot-Server-Patches/0249-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0249-Option-for-maximum-exp-value-when-merging-orbs.patch
new file mode 100644
index 0000000000..5e7a9f8616
--- /dev/null
+++ b/Spigot-Server-Patches/0249-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -0,0 +1,59 @@
+From 087039842d17fe274692739ca184f79170dc56e8 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Fri, 10 Nov 2017 23:03:12 -0500
+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 14f652d4..47d35228 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+@@ -452,4 +452,10 @@ public class PaperWorldConfig {
+         replacementBlocks = getList("anti-xray.replacement-blocks", Arrays.asList((Object) "stone", "planks"));
+         log("Anti-Xray: " + (antiXray ? "enabled" : "disabled") + " / Engine Mode: " + engineMode.getDescription() + " / Chunk Edge Mode: " + chunkEdgeMode.getDescription() + " / Up to " + ((maxChunkSectionIndex + 1) * 16) + " blocks");
+     }
++
++    public int expMergeMaxValue;
++    private void expMergeMaxValue() {
++        expMergeMaxValue = getInt("experience-merge-max-value", -1);
++        log("Experience Merge Max Value: " + expMergeMaxValue);
++    }
+ }
+diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+index 9aec59d3..26d63369 100644
+--- a/src/main/java/net/minecraft/server/World.java
++++ b/src/main/java/net/minecraft/server/World.java
+@@ -1158,16 +1158,29 @@ public abstract class World implements IBlockAccess {
+             EntityExperienceOrb xp = (EntityExperienceOrb) entity;
+             double radius = spigotConfig.expMerge;
+             if (radius > 0) {
++                // Paper start - Maximum exp value when merging - Whole section has been tweaked, see comments for specifics
++                final int maxValue = paperConfig.expMergeMaxValue;
++                if (maxValue <= 0 || xp.value < maxValue) { // Paper - Skip iteration if unnecessary
++
+                 List<Entity> entities = this.getEntities(entity, entity.getBoundingBox().grow(radius, radius, radius));
+                 for (Entity e : entities) {
+                     if (e instanceof EntityExperienceOrb) {
+                         EntityExperienceOrb loopItem = (EntityExperienceOrb) e;
+-                        if (!loopItem.dead) {
++                        if (!loopItem.dead && !(maxValue > 0 && loopItem.value >= maxValue)) { // Paper
+                             xp.value += loopItem.value;
++                            // Paper start
++                            if (xp.value > maxValue) {
++                                loopItem.value = xp.value - maxValue;
++                                xp.value = maxValue;
++                                break;
++                            }
++                            // Paper end
+                             loopItem.die();
+                         }
+                     }
+                 }
++
++                } // Paper end - End iteration skip check - All tweaking ends here
+             }
+         } // Spigot end
+ 
+-- 
+2.14.2
+