23 Zeilen
1.5 KiB
Diff
23 Zeilen
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Golfing8 <atroo@me.com>
|
|
Date: Mon, 8 May 2023 09:18:17 -0400
|
|
Subject: [PATCH] ExperienceOrb should call EntitySpawnEvent
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
index c514795dee0c54ae4fc1592dab5b69c39631c9ad..26e1a9002d675245d4cf91e6682605314b078fb2 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -718,7 +718,10 @@ public class CraftEventFactory {
|
|
} else if (entity instanceof net.minecraft.world.entity.ExperienceOrb) {
|
|
net.minecraft.world.entity.ExperienceOrb xp = (net.minecraft.world.entity.ExperienceOrb) entity;
|
|
double radius = world.spigotConfig.expMerge;
|
|
- if (radius > 0) {
|
|
+ // Paper start - Call EntitySpawnEvent for ExperienceOrb entities.
|
|
+ event = CraftEventFactory.callEntitySpawnEvent(entity);
|
|
+ if (radius > 0 && !event.isCancelled() && !entity.isRemoved()) {
|
|
+ // Paper end
|
|
// Paper start - Maximum exp value when merging - Whole section has been tweaked, see comments for specifics
|
|
final int maxValue = world.paperConfig().entities.behavior.experienceMergeMaxValue;
|
|
final boolean mergeUnconditionally = world.paperConfig().entities.behavior.experienceMergeMaxValue <= 0;
|