diff options
author | Shane Freeder <[email protected]> | 2024-07-08 22:30:01 +0100 |
---|---|---|
committer | Shane Freeder <[email protected]> | 2024-07-08 22:30:01 +0100 |
commit | a74d9bf629ab2d502831fb36a251cdac0ab30522 (patch) | |
tree | 44af854a258c4f9119f2caa6db257e4e3a1e6e52 /patches/server/0358-ExperienceOrb-merging-stacking-API-and-fixes.patch | |
parent | 6723f5498616da919762c68978e13c518943ef40 (diff) | |
parent | 70b0e844767131681400b3dbace06c2dea13f87c (diff) | |
download | Paper-a74d9bf629ab2d502831fb36a251cdac0ab30522.tar.gz Paper-a74d9bf629ab2d502831fb36a251cdac0ab30522.zip |
Merge remote-tracking branch 'origin/master' into chore/terminalchore/terminal
Diffstat (limited to 'patches/server/0358-ExperienceOrb-merging-stacking-API-and-fixes.patch')
-rw-r--r-- | patches/server/0358-ExperienceOrb-merging-stacking-API-and-fixes.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0358-ExperienceOrb-merging-stacking-API-and-fixes.patch b/patches/server/0358-ExperienceOrb-merging-stacking-API-and-fixes.patch index fb7613e2f0..4686e1475f 100644 --- a/patches/server/0358-ExperienceOrb-merging-stacking-API-and-fixes.patch +++ b/patches/server/0358-ExperienceOrb-merging-stacking-API-and-fixes.patch @@ -77,10 +77,10 @@ index 5a7d314ec0562e472f5dc45924a7b24841cff126..650e4a01cecc4cc08e7ff9ebcc4c3670 public java.util.UUID getTriggerEntityId() { return getHandle().triggerEntityId; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 720ea811407b4288b9923cf7db0ac44ad1a086e0..82f7a36e71ed17d44ad0e5be99f8f6fc450d0732 100644 +index 01c16286cf210a366decf7046a6a6b94284f9934..baf282b200a14733cf2148f237d972224d60a266 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -704,15 +704,29 @@ public class CraftEventFactory { +@@ -705,15 +705,29 @@ public class CraftEventFactory { if (entity instanceof net.minecraft.world.entity.ExperienceOrb xp) { double radius = world.spigotConfig.expMerge; if (radius > 0) { |