Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@128691a Deprecate log4j logger method in `Plugin` PaperMC/Paper@2a306f5 Add Multi Block Change API (#7333) PaperMC/Paper@feb72b8 Update ASM EventExecutor generator patch to respect event handler return types. Fixes #7311 (#7317) PaperMC/Paper@dcca6cb Make tag presets unmodifiable (#7378) PaperMC/Paper@60e46ab Fix NotePlayEvent (#5180) PaperMC/Paper@512995c Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359) PaperMC/Paper@0a9602c [ci skip] Fix multiple ItemStack array nullability mistakes (#7055) PaperMC/Paper@9a19308 Lock Frozen Ticks API (#7207) PaperMC/Paper@a058ac0 Dolphin API (#7102) PaperMC/Paper@f6c7d53 Add configurable stronghold seed (#7334) PaperMC/Paper@7978121 More PotionEffectType API (#5737) PaperMC/Paper@9490475 Add STRUCTURE_TYPE registry entry (#6400) PaperMC/Paper@b164899 Update tiny-remapper PaperMC/Paper@f7dbd06 [ci skip] Update parameter mappings PaperMC/Paper@ca523ab [ci skip] Fix param mismatch from last commit PaperMC/Paper@2e99e5e Updated Upstream (Bukkit/CraftBukkit) (#7411) PaperMC/Paper@41263d9 [ci skip] Update paperweight to 1.3.4 PaperMC/Paper@3109dd8 Updated Upstream (Bukkit/CraftBukkit) (#7428) PaperMC/Paper@17eb884 Use a CHM for StructureTemplate.Pallete cache PaperMC/Paper@f79c0da Updated Upstream (Bukkit/CraftBukkit) PaperMC/Paper@2121aed Rebuild patches PaperMC/Paper@2ec04e0 Use correct headerLocation for regionfile initialisation PaperMC/Paper@f23c039 Fix infinite recursion in spawnCategoryForChunk/Position PaperMC/Paper@9940bca API for creating command sender which forwards feedback (#7432) PaperMC/Paper@46ed080 fix portal linking in upgraded chunks (fixes #7419) (#7438) PaperMC/Paper@6df4641 Use destination world when preloading spawn chunk (#7441) PaperMC/Paper@0cc2503 Implement World#regenerateChunk (#7425) PaperMC/Paper@00da098 Log exceptions thrown during chat processing (#7467) PaperMC/Paper@26734e8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7454) PaperMC/Paper@4a745f9 Optimize Util#sequence (#7115) PaperMC/Paper@2c8d48c Make Panda implement Sittable (#7414) PaperMC/Paper@2c4a589 Fix issues with LimitedRegion (#7343) PaperMC/Paper@3d91eca Fix cancelled snow bucket placement (#6751) PaperMC/Paper@9567753 Don't load plugins prefixed with a dot (#7392) PaperMC/Paper@92c777d Fix PlayerProfile BukkitObject serialization, deprecate setName and setId for removal (#7471) PaperMC/Paper@e6898ff Fix IllegalArgumentException for /paper mobcaps command (#7472) PaperMC/Paper@a8f2d67 - properly fix IllegalArgumentException in `/paper mobcaps` command
74 lines
4.8 KiB
Diff
74 lines
4.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: lexikiq <noellekiq@gmail.com>
|
|
Date: Thu, 1 Jul 2021 21:36:03 -0400
|
|
Subject: [PATCH] Add BlockDropResourcesEvent
|
|
|
|
Adds an event which allows plugin developers
|
|
to easily get the items being dropped by any
|
|
block instead of only blocks broken by players.
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
|
|
index ab5b9f00123e2ede2931ffc520684e482aac49b4..51e69414e37d824d1d8b1e1b82bcf700d4afe0f0 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/Block.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/Block.java
|
|
@@ -304,7 +304,7 @@ public class Block extends BlockBehaviour implements ItemLike {
|
|
ServerLevel worldserver = lootContext.getLevel();
|
|
BlockPos blockposition = new BlockPos((Vec3) lootContext.getParameter(LootContextParams.ORIGIN));
|
|
|
|
- state.getDrops(lootContext).forEach((itemstack) -> {
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callBlockDropResourcesEvent(worldserver, blockposition, state.getDrops(lootContext)).forEach((itemstack) -> { // Parchment
|
|
Block.popResource(worldserver, blockposition, itemstack);
|
|
});
|
|
state.spawnAfterBreak(worldserver, blockposition, ItemStack.EMPTY);
|
|
@@ -312,7 +312,7 @@ public class Block extends BlockBehaviour implements ItemLike {
|
|
|
|
public static void dropResources(BlockState state, Level world, BlockPos pos) {
|
|
if (world instanceof ServerLevel) {
|
|
- Block.getDrops(state, (ServerLevel) world, pos, (BlockEntity) null).forEach((itemstack) -> {
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callBlockDropResourcesEvent(world, pos, Block.getDrops(state, (ServerLevel) world, pos, (BlockEntity) null)).forEach((itemstack) -> { // Parchment
|
|
Block.popResource(world, pos, itemstack);
|
|
});
|
|
state.spawnAfterBreak((ServerLevel) world, pos, ItemStack.EMPTY);
|
|
@@ -322,7 +322,7 @@ public class Block extends BlockBehaviour implements ItemLike {
|
|
|
|
public static void dropResources(BlockState state, LevelAccessor world, BlockPos pos, @Nullable BlockEntity blockEntity) {
|
|
if (world instanceof ServerLevel) {
|
|
- Block.getDrops(state, (ServerLevel) world, pos, blockEntity).forEach((itemstack) -> {
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callBlockDropResourcesEvent(world, pos, Block.getDrops(state, (ServerLevel) world, pos, blockEntity)).forEach((itemstack) -> { // Parchment
|
|
Block.popResource((ServerLevel) world, pos, itemstack);
|
|
});
|
|
state.spawnAfterBreak((ServerLevel) world, pos, ItemStack.EMPTY);
|
|
@@ -349,7 +349,7 @@ public class Block extends BlockBehaviour implements ItemLike {
|
|
|
|
public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, Entity entity, ItemStack stack) {
|
|
if (world instanceof ServerLevel) {
|
|
- Block.getDrops(state, (ServerLevel) world, pos, blockEntity, entity, stack).forEach((itemstack1) -> {
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callBlockDropResourcesEvent(world, pos, Block.getDrops(state, (ServerLevel) world, pos, blockEntity, entity, stack)).forEach((itemstack1) -> { // Parchment
|
|
Block.popResource(world, pos, itemstack1);
|
|
});
|
|
state.spawnAfterBreak((ServerLevel) world, pos, stack);
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
index 11ed21fb283a3ce80efd1d8a0ad027c47242ebc8..38f24ecd7783d2133819af53211f464559959908 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -1991,5 +1991,19 @@ public class CraftEventFactory {
|
|
final double posZ = pos.getZ();
|
|
playSoundEvent(event, packet -> playerList.broadcast(player, posX, posY, posZ, radius, world, packet));
|
|
}
|
|
+
|
|
+ public static List<ItemStack> callBlockDropResourcesEvent(LevelAccessor world, BlockPos pos, List<ItemStack> items) {
|
|
+ List<org.bukkit.inventory.ItemStack> bukkitItems = new ArrayList<>(items.size());
|
|
+ for (ItemStack item : items) {
|
|
+ bukkitItems.add(CraftItemStack.asBukkitCopy(item));
|
|
+ }
|
|
+ gg.projecteden.parchment.event.block.BlockDropResourcesEvent event = new gg.projecteden.parchment.event.block.BlockDropResourcesEvent(CraftBlock.at(world, pos), bukkitItems);
|
|
+ event.callEvent();
|
|
+ items = new ArrayList<>(bukkitItems.size());
|
|
+ for (org.bukkit.inventory.ItemStack item : bukkitItems) {
|
|
+ items.add(CraftItemStack.asNMSCopy(item));
|
|
+ }
|
|
+ return items;
|
|
+ }
|
|
// Parchment end
|
|
}
|