core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0226-ExperienceOrbMergeEven...

26 lines
1.5 KiB
Diff
Raw Normal View History

update upstream
2018-07-29 16:42:07 +00:00
From c9bc942cb9de94f6ac94ffe2736290433283f15a Mon Sep 17 00:00:00 2001
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.
2017-12-20 03:57:46 +00:00
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/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
update upstream
2018-07-29 16:42:07 +00:00
index d3b64b741..a961705fb 100644
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.
2017-12-20 03:57:46 +00:00
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
update upstream
2018-07-29 16:42:07 +00:00
@@ -1014,7 +1014,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
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.
2017-12-20 03:57:46 +00:00
for (Entity e : entities) {
if (e instanceof EntityExperienceOrb) {
EntityExperienceOrb loopItem = (EntityExperienceOrb) e;
- if (!loopItem.dead && !(maxValue > 0 && loopItem.value >= maxValue)) { // Paper
+ 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
xp.value += loopItem.value;
// Paper start
if (!mergeUnconditionally && xp.value > maxValue) {
--
Fix issues with getBlockState(false) not loading Tile Entity data This only impacted people who used our useSnapshots new API in a plugin, which obviously was no one as the data result was completely broken. Merged the NPE check patch into mine since it has to handle it too.
2018-06-30 05:40:52 +00:00
2.18.0
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.
2017-12-20 03:57:46 +00:00