twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-04 06:02:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Readd dropped hunk

Browse Source
This commit is contained in:
Bjarne Koll
2025-06-02 15:20:57 +02:00
parent 20e9fe8e2f
commit 1366eaa540
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
paper-server/patches/sources/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java.patch
View File

@@ -32,7 +32,7 @@
if (this.isSuccess()) { if (this.isSuccess()) {
item.hurtAndBreak(1, serverLevel, null, item1 -> {}); item.hurtAndBreak(1, serverLevel, null, item1 -> {});
} }
@@ -50,13 +_,21 @@ @@ -50,14 +_,22 @@
return false; return false;
} }
@@ -44,6 +44,7 @@
} }
if (entity instanceof Shearable shearable && shearable.readyForShearing()) { if (entity instanceof Shearable shearable && shearable.readyForShearing()) {
- shearable.shear(level, SoundSource.BLOCKS, stack);
+ // CraftBukkit start + // CraftBukkit start
+ // Paper start - Add drops to shear events + // Paper start - Add drops to shear events
+ org.bukkit.event.block.BlockShearEntityEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockShearEntityEvent(entity, bukkitBlock, craftItem, shearable.generateDefaultDrops(level, stack)); + org.bukkit.event.block.BlockShearEntityEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockShearEntityEvent(entity, bukkitBlock, craftItem, shearable.generateDefaultDrops(level, stack));
@@ -52,6 +53,7 @@
+ continue; + continue;
+ } + }
+ // CraftBukkit end + // CraftBukkit end
shearable.shear(level, SoundSource.BLOCKS, stack); + shearable.shear(level, SoundSource.BLOCKS, stack, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getDrops())); // Paper - Add drops to shear events
level.gameEvent(null, GameEvent.SHEAR, pos); level.gameEvent(null, GameEvent.SHEAR, pos);
return true; return true;
}