2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: BillyGalbreath <blake.galbreath@gmail.com>
|
|
|
|
Date: Wed, 20 Jan 2021 14:23:37 -0600
|
|
|
|
Subject: [PATCH] Allow adding items to BlockDropItemEvent
|
|
|
|
|
|
|
|
|
|
|
|
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 697c69b60aa45b6a229f3bec77dc728e50a895ce..49efae40345fcfca8f80fcc541dcfde1b8a8b07b 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
|
2024-10-23 19:46:06 +02:00
|
|
|
@@ -461,13 +461,30 @@ public class CraftEventFactory {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public static void handleBlockDropItemEvent(Block block, BlockState state, ServerPlayer player, List<ItemEntity> items) {
|
|
|
|
- BlockDropItemEvent event = new BlockDropItemEvent(block, state, player.getBukkitEntity(), Lists.transform(items, (item) -> (org.bukkit.entity.Item) item.getBukkitEntity()));
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper start - Allow adding items to BlockDropItemEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
+ List<Item> list = new ArrayList<>();
|
|
|
|
+ for (ItemEntity item : items) {
|
|
|
|
+ list.add((Item) item.getBukkitEntity());
|
|
|
|
+ }
|
|
|
|
+ BlockDropItemEvent event = new BlockDropItemEvent(block, state, player.getBukkitEntity(), list);
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper end - Allow adding items to BlockDropItemEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
Bukkit.getPluginManager().callEvent(event);
|
|
|
|
|
|
|
|
if (!event.isCancelled()) {
|
|
|
|
- for (ItemEntity item : items) {
|
2023-06-08 02:54:54 +02:00
|
|
|
- item.level().addFreshEntity(item);
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper start - Allow adding items to BlockDropItemEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
+ for (Item bukkit : list) {
|
|
|
|
+ if (!bukkit.isValid()) {
|
|
|
|
+ Entity item = ((org.bukkit.craftbukkit.entity.CraftItem) bukkit).getHandle();
|
2023-06-08 02:54:54 +02:00
|
|
|
+ item.level().addFreshEntity(item);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
2023-03-23 22:57:03 +01:00
|
|
|
+ }
|
2021-06-11 14:02:28 +02:00
|
|
|
+ } else {
|
|
|
|
+ for (Item bukkit : list) {
|
|
|
|
+ if (bukkit.isValid()) {
|
|
|
|
+ bukkit.remove();
|
|
|
|
+ }
|
2023-03-23 22:57:03 +01:00
|
|
|
}
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper end - Allow adding items to BlockDropItemEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|