geforkt von Mirrors/Paper
Allow adding items to BlockDropItemEvent (#5093)
Dieser Commit ist enthalten in:
Ursprung
2f5eaee571
Commit
cf323f5eaa
19
Spigot-API-Patches/Allow-adding-items-to-BlockDropItemEvent.patch
Normale Datei
19
Spigot-API-Patches/Allow-adding-items-to-BlockDropItemEvent.patch
Normale Datei
@ -0,0 +1,19 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: BillyGalbreath <blake.galbreath@gmail.com>
|
||||||
|
Date: Wed, 20 Jan 2021 14:25:26 -0600
|
||||||
|
Subject: [PATCH] Allow adding items to BlockDropItemEvent
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/event/block/BlockDropItemEvent.java b/src/main/java/org/bukkit/event/block/BlockDropItemEvent.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/org/bukkit/event/block/BlockDropItemEvent.java
|
||||||
|
+++ b/src/main/java/org/bukkit/event/block/BlockDropItemEvent.java
|
||||||
|
@@ -0,0 +0,0 @@ public class BlockDropItemEvent extends BlockEvent implements Cancellable {
|
||||||
|
* Gets list of the Item drops caused by the block break.
|
||||||
|
*
|
||||||
|
* This list is mutable - removing an item from it will cause it to not
|
||||||
|
- * drop. It is not legal however to add new items to the list.
|
||||||
|
+ * drop. Adding to the list is allowed.
|
||||||
|
*
|
||||||
|
* @return The Item the block caused to drop
|
||||||
|
*/
|
44
Spigot-Server-Patches/Allow-adding-items-to-BlockDropItemEvent.patch
Normale Datei
44
Spigot-Server-Patches/Allow-adding-items-to-BlockDropItemEvent.patch
Normale Datei
@ -0,0 +1,44 @@
|
|||||||
|
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
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||||
|
@@ -0,0 +0,0 @@ public class CraftEventFactory {
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void handleBlockDropItemEvent(Block block, BlockState state, EntityPlayer player, List<EntityItem> items) {
|
||||||
|
- BlockDropItemEvent event = new BlockDropItemEvent(block, state, player.getBukkitEntity(), Lists.transform(items, (item) -> (org.bukkit.entity.Item) item.getBukkitEntity()));
|
||||||
|
+ // Paper start
|
||||||
|
+ List<Item> list = new ArrayList<>();
|
||||||
|
+ for (EntityItem item : items) {
|
||||||
|
+ list.add((Item) item.getBukkitEntity());
|
||||||
|
+ }
|
||||||
|
+ BlockDropItemEvent event = new BlockDropItemEvent(block, state, player.getBukkitEntity(), list);
|
||||||
|
+ // Paper end
|
||||||
|
Bukkit.getPluginManager().callEvent(event);
|
||||||
|
|
||||||
|
if (!event.isCancelled()) {
|
||||||
|
- for (EntityItem item : items) {
|
||||||
|
- item.world.addEntity(item);
|
||||||
|
+ // Paper start
|
||||||
|
+ for (Item bukkit : list) {
|
||||||
|
+ if (!bukkit.isValid()) {
|
||||||
|
+ Entity item = ((org.bukkit.craftbukkit.entity.CraftItem) bukkit).getHandle();
|
||||||
|
+ item.world.addEntity(item);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ } else {
|
||||||
|
+ for (Item bukkit : list) {
|
||||||
|
+ if (bukkit.isValid()) {
|
||||||
|
+ bukkit.remove();
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
+ // Paper end
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren