diff options
| author | Prof-Bloodstone <[email protected]> | 2020-07-23 01:35:44 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-22 19:35:44 -0400 |
| commit | 42433c2626c21a6bf22b958341e2f076dfb20dd0 (patch) | |
| tree | 900745248d46e71ca8a3704fa4fd519e4a893de8 /Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch | |
| parent | e5ede546a2153d2d022f6374673ab6e8d359c7e4 (diff) | |
| download | Paper-42433c2626c21a6bf22b958341e2f076dfb20dd0.tar.gz Paper-42433c2626c21a6bf22b958341e2f076dfb20dd0.zip | |
Updated Upstream (Bukkit/CraftBukkit) (#3980)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
09f10fd9 SPIGOT-5950: Add PrepareSmithingEvent event
CraftBukkit Changes:
7c03d257 SPIGOT-6011: End Gateways do not work on Non-Main End Worlds
d492e363 SPIGOT-6015: Small Armor Stand doesn't drop items
5db13eea SPIGOT-5950: Add PrepareSmithingEvent event
Diffstat (limited to 'Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch')
| -rw-r--r-- | Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch index dc2b8d99a5..b7d3679ebe 100644 --- a/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -20,10 +20,10 @@ index e30f48caf2ce4f48f371b2594b765c27bc9e9778..2d8b354d707e8b5b0e7cd644fb93bc8f + } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index ac5f492fd0d837da150e415bc007c10fe7ee3714..3e0b51db3d90b0039eee3375ac0fa4f96712b922 100644 +index ad3467b32a58c9268f7667c1beea7e919e63212c..3b0402c1160f66b745be3d1fc47ec5bd8969a793 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -577,16 +577,32 @@ public class CraftEventFactory { +@@ -578,16 +578,32 @@ public class CraftEventFactory { EntityExperienceOrb xp = (EntityExperienceOrb) entity; double radius = world.spigotConfig.expMerge; if (radius > 0) { |