23 lines
1.6 KiB
Diff
23 lines
1.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Tue, 19 Dec 2017 22:57:26 -0500
|
||
|
|
Subject: [PATCH] ExperienceOrbMergeEvent
|
||
|
|
|
||
|
|
Fired when the server is about to merge 2 experience orbs
|
||
|
|
Plugins can cancel this if they want to ensure experience orbs do not lose important
|
||
|
|
metadata such as spawn reason, or conditionally move data from source to target.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||
|
|
index aa984540917e363438cc38cdb3004d3fc4987ab4..69b5c76b312d055603ce62ad7b0c88cd01272ba9 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||
|
|
@@ -609,7 +609,7 @@ public class CraftEventFactory {
|
||
|
|
if (e instanceof EntityExperienceOrb) {
|
||
|
|
EntityExperienceOrb loopItem = (EntityExperienceOrb) e;
|
||
|
|
// Paper start
|
||
|
|
- if (!loopItem.dead && !(maxValue > 0 && loopItem.value >= maxValue)) {
|
||
|
|
+ if (!loopItem.dead && !(maxValue > 0 && loopItem.value >= maxValue) && new com.destroystokyo.paper.event.entity.ExperienceOrbMergeEvent((org.bukkit.entity.ExperienceOrb) entity.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) loopItem.getBukkitEntity()).callEvent()) { // Paper
|
||
|
|
long newTotal = (long)xp.value + (long)loopItem.value;
|
||
|
|
if ((int) newTotal < 0) continue; // Overflow
|
||
|
|
if (maxValue > 0 && newTotal > (long)maxValue) {
|