-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add configurable max exp value when merging orbs
- Loading branch information
1 parent
d703934
commit 072d6ec
Showing
1 changed file
with
59 additions
and
0 deletions.
There are no files selected for viewing
59 changes: 59 additions & 0 deletions
59
Spigot-Server-Patches/0249-Option-for-maximum-exp-value-when-merging-orbs.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
|