2021-06-11 14:02:28 +02:00
|
|
|
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
|
2021-06-14 07:37:57 +02:00
|
|
|
|
2021-06-12 17:06:20 +02:00
|
|
|
Has to be reimplemented at one point maybe
|
2021-06-11 14:02:28 +02:00
|
|
|
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
|
2024-01-16 19:27:39 +01:00
|
|
|
index 85cad0c7437642c72d806f59cb077db4056a4282..90b93b7139f9a11028b0d78b109b478b8052e982 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
Upstream has released updates that appear 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:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 03:09:28 +01:00
|
|
|
@@ -711,7 +711,7 @@ public class CraftEventFactory {
|
2023-12-05 23:55:31 +01:00
|
|
|
for (Entity e : entities) {
|
|
|
|
|
if (e instanceof net.minecraft.world.entity.ExperienceOrb loopItem) {
|
2021-06-11 14:02:28 +02:00
|
|
|
// Paper start
|
2021-06-14 07:37:57 +02:00
|
|
|
- if (!loopItem.isRemoved() && !(maxValue > 0 && loopItem.value >= maxValue)) {
|
|
|
|
|
+ if (!loopItem.isRemoved() && !(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 - ExperienceOrbMergeEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
long newTotal = (long)xp.value + (long)loopItem.value;
|
|
|
|
|
if ((int) newTotal < 0) continue; // Overflow
|
|
|
|
|
if (maxValue > 0 && newTotal > (long)maxValue) {
|
