2023-07-22 22:19:50 +02:00
|
|
|
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
|
Rework async chunk api implementation
Firstly, the old methods all routed to the CompletableFuture method.
However, the CF method could not guarantee that if the caller
was off-main that the future would be "completed" on-main. Since
the callback methods used the CF one, this meant that the callback
methods did not guarantee that the callbacks were to be called on
the main thread.
Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb)
so that the methods with the callback are guaranteed to invoke
the callback on the main thread. The CF behavior remains unchanged;
it may still appear to complete on main if invoked off-main.
Secondly, remove the scheduleOnMain invocation in the async
chunk completion. This unnecessarily delays the callback
by 1 tick.
Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which
will load chunks within an area. This method is provided as a helper
as keeping all chunks loaded within an area can be complicated to
implement for plugins (due to the lacking ticket API), and is
already implemented internally anyways.
Fourthly, remove the ticket addition that occured with getChunkAt
and getChunkAtAsync. The ticket addition may delay the unloading
of the chunk unnecessarily. It also fixes a very rare timing bug
where the future/callback would be completed after the chunk
unloads.
2024-11-19 07:34:32 +01:00
|
|
|
index 28e56095ec4b6fb73df747ec796498f8692c2a24..b1ce440bc5c8b77654213a4630851daef3f15d60 100644
|
2023-07-22 22:19:50 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
2024-10-24 10:42:29 +02:00
|
|
|
@@ -744,7 +744,8 @@ public class CraftEventFactory {
|
2023-12-06 17:34:54 +01:00
|
|
|
// Spigot start - SPIGOT-7523: Merge after spawn event and only merge if the event was not cancelled (gets checked above)
|
|
|
|
|
if (entity instanceof net.minecraft.world.entity.ExperienceOrb xp) {
|
2023-07-22 22:19:50 +02:00
|
|
|
double radius = world.spigotConfig.expMerge;
|
|
|
|
|
- if (radius > 0) {
|
2024-01-21 12:11:43 +01:00
|
|
|
+ event = CraftEventFactory.callEntitySpawnEvent(entity); // Call spawn event for ExperienceOrb entities
|
2023-07-22 22:19:50 +02:00
|
|
|
+ if (radius > 0 && !event.isCancelled() && !entity.isRemoved()) {
|
2024-01-21 12:11:43 +01:00
|
|
|
// Paper start - Maximum exp value when merging; Whole section has been tweaked, see comments for specifics
|
2024-05-29 22:58:57 +02:00
|
|
|
final long maxValue = world.paperConfig().entities.behavior.experienceMergeMaxValue;
|
|
|
|
|
final boolean mergeUnconditionally = maxValue <= 0;
|
