mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update to Minecraft 1.20.3

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2023-12-06 03:40:00 +11:00
commit 8398e12b34
256 changed files with 2745 additions and 1911 deletions
Download patch file Download diff file Expand all files Collapse all files

8
paper-server/nms-patches/net/minecraft/server/level/PlayerInteractManager.patch
View file

@ -226,7 +226,7 @@
+ org.bukkit.block.BlockState state = bblock.getState();
+ level.captureDrops = new ArrayList<>();
+ // CraftBukkit end
block.playerWillDestroy(this.level, blockposition, iblockdata, this.player);
IBlockData iblockdata1 = block.playerWillDestroy(this.level, blockposition, iblockdata, this.player);
boolean flag = this.level.removeBlock(blockposition, false);
@@ -256,19 +399,32 @@
@ -238,12 +238,12 @@
} else {
ItemStack itemstack = this.player.getMainHandItem();
ItemStack itemstack1 = itemstack.copy();
boolean flag1 = this.player.hasCorrectToolForDrops(iblockdata);
boolean flag1 = this.player.hasCorrectToolForDrops(iblockdata1);
itemstack.mineBlock(this.level, iblockdata, blockposition, this.player);
itemstack.mineBlock(this.level, iblockdata1, blockposition, this.player);
- if (flag && flag1) {
+ if (flag && flag1 && event.isDropItems()) { // CraftBukkit - Check if block should drop items
block.playerDestroy(this.level, this.player, blockposition, iblockdata, tileentity, itemstack1);
block.playerDestroy(this.level, this.player, blockposition, iblockdata1, tileentity, itemstack1);
}
- return true;