Fix a borked update of 'Properly handle BlockBreakEvent#isDropItems' (#…

…10134)
PaperMC · Jan 5, 2024 · a58e29d · a58e29d
1 parent 25a99b1
commit a58e29d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/patches/server/0980-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0980-Properly-handle-BlockBreakEvent-isDropItems.patch
@@ -9,7 +9,7 @@ food consumption, turtle egg count decreases, ice to water
 conversions and beehive releases
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 82f26186156a487f29ad3abff3f68852e5b8a1f9..e2764751aaa862e3e0c21cf9a8ab66ed921c65e5 100644
+index 82f26186156a487f29ad3abff3f68852e5b8a1f9..3088cf508427ca03804bfa4c081bb6dfcce07d45 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -433,8 +433,8 @@ public class ServerPlayerGameMode {
@@ -18,7 +18,7 @@ index 82f26186156a487f29ad3abff3f68852e5b8a1f9..e2764751aaa862e3e0c21cf9a8ab66ed
                      itemstack.mineBlock(this.level, iblockdata1, pos, this.player);
 -                    if (flag && flag1 && event.isDropItems()) { // CraftBukkit - Check if block should drop items
 -                        block.playerDestroy(this.level, this.player, pos, iblockdata1, tileentity, itemstack1);
-+                    if (flag && flag1 && event.isDropItems()/* && event.isDropItems() */) { // CraftBukkit - Check if block should drop items // Paper - fix drops not preventing stats/food exhaustion
++                    if (flag && flag1/* && event.isDropItems() */) { // CraftBukkit - Check if block should drop items // Paper - fix drops not preventing stats/food exhaustion
 +                        block.playerDestroy(this.level, this.player, pos, iblockdata1, tileentity, itemstack1, event.isDropItems(), false); // Paper
                      }
 
@@ -39,7 +39,7 @@ index 6e7a9f68aa3a5084c8eea9fd8721272260734289..2594c8e233114b21e5b00acb5ad7012b
              BeehiveBlockEntity tileentitybeehive = (BeehiveBlockEntity) blockEntity;
 
 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 5343a0c20cf87067ba307f001a28b0b18fae2c34..0011bbb22fcfba267818c55b03042db5e67be562 100644
+index 38d587c93a9ae5706633608f681f18684b7a631d..c450caed1a8d14f3bd56d0336a9bf72a5adca14f 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -423,10 +423,18 @@ public class Block extends BlockBehaviour implements ItemLike {