craftbukkit/nms-patches/net/minecraft/world/level/block/Block.patch

54 lines
2.1 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/level/block/Block.java
+++ b/net/minecraft/world/level/block/Block.java
2023-06-08 01:30:00 +10:00
@@ -342,7 +342,13 @@
2021-06-11 15:00:00 +10:00
EntityItem entityitem = (EntityItem) supplier.get();
2021-11-22 09:00:00 +11:00
entityitem.setDefaultPickUpDelay();
- world.addFreshEntity(entityitem);
+ // CraftBukkit start
+ if (world.captureDrops != null) {
+ world.captureDrops.add(entityitem);
+ } else {
2021-11-22 09:00:00 +11:00
+ world.addFreshEntity(entityitem);
+ }
+ // CraftBukkit end
}
}
2023-06-08 01:30:00 +10:00
@@ -368,7 +374,7 @@
2021-03-04 08:28:05 +11:00
2021-11-22 09:00:00 +11:00
public void playerDestroy(World world, EntityHuman entityhuman, BlockPosition blockposition, IBlockData iblockdata, @Nullable TileEntity tileentity, ItemStack itemstack) {
entityhuman.awardStat(StatisticList.BLOCK_MINED.get(this));
- entityhuman.causeFoodExhaustion(0.005F);
+ entityhuman.causeFoodExhaustion(0.005F, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.BLOCK_MINED); // CraftBukkit - EntityExhaustionEvent
dropResources(iblockdata, world, blockposition, tileentity, entityhuman, itemstack);
2021-03-04 08:28:05 +11:00
}
2023-06-08 01:30:00 +10:00
@@ -504,16 +510,24 @@
2022-03-01 02:00:00 +11:00
return this.builtInRegistryHolder;
}
2016-03-01 08:32:46 +11:00
2022-06-08 02:00:00 +10:00
- protected void tryDropExperience(WorldServer worldserver, BlockPosition blockposition, ItemStack itemstack, IntProvider intprovider) {
+ // CraftBukkit start
2022-06-08 02:00:00 +10:00
+ protected int tryDropExperience(WorldServer worldserver, BlockPosition blockposition, ItemStack itemstack, IntProvider intprovider) {
if (EnchantmentManager.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, itemstack) == 0) {
int i = intprovider.sample(worldserver.random);
if (i > 0) {
- this.popExperience(worldserver, blockposition, i);
+ // this.popExperience(worldserver, blockposition, i);
+ return i;
}
}
+ return 0;
+ }
2016-03-01 08:32:46 +11:00
+
2022-06-08 02:00:00 +10:00
+ public int getExpDrop(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, ItemStack itemstack, boolean flag) {
+ return 0;
}
+ // CraftBukkit end
2020-06-25 10:00:00 +10:00
public static final class a {
2018-08-26 12:00:00 +10:00