Skip to content

Call PlayerShearEntityEvent for bogged #10913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Lulu13022002 wants to merge 1 commit into from
Closed

Call PlayerShearEntityEvent for bogged #10913

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions patches/server/1027-Call-PlayerShearEntityEvent-for-bogged.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Tue, 18 Jun 2024 22:30:12 +0200
Subject: [PATCH] Call PlayerShearEntityEvent for bogged


diff --git a/src/main/java/net/minecraft/world/entity/monster/Bogged.java b/src/main/java/net/minecraft/world/entity/monster/Bogged.java
index 6e290d67b00c88ecd2cf2ce5f612f52ebda9e280..1991f7c2c9b74ec16af3eed93b0bd5b6f9b8be91 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Bogged.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Bogged.java
@@ -75,7 +75,20 @@ public class Bogged extends AbstractSkeleton implements Shearable {
protected InteractionResult mobInteract(Player player, InteractionHand hand) {
ItemStack itemStack = player.getItemInHand(hand);
if (itemStack.is(Items.SHEARS) && this.readyForShearing()) {
- this.shear(SoundSource.PLAYERS);
+ // Paper start - call PlayerShearEntityEvent
+ java.util.List<ItemStack> drops = this.generateDefaultDrops();
+ org.bukkit.event.player.PlayerShearEntityEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.handlePlayerShearEntityEvent(player, this, itemStack, hand, drops);
+ if (event != null) {
+ if (event.isCancelled()) {
+ if (player instanceof net.minecraft.server.level.ServerPlayer serverPlayer) {
+ this.resendPossiblyDesyncedDataValues(java.util.Collections.singletonList(DATA_SHEARED), serverPlayer); // prevent visual desync
+ }
+ return InteractionResult.PASS;
+ }
+ drops = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getDrops());
+ }
+ this.shear(SoundSource.PLAYERS, drops);
+ // Paper end - call PlayerShearEntityEvent
this.gameEvent(GameEvent.SHEAR, player);
if (!this.level().isClientSide) {
itemStack.hurtAndBreak(1, player, getSlotForHand(hand));
@@ -129,14 +142,21 @@ public class Bogged extends AbstractSkeleton implements Shearable {

@Override
public void shear(SoundSource shearedSoundCategory) {
+ // Paper start - call PlayerShearEntityEvent
+ shear(shearedSoundCategory, this.generateDefaultDrops());
+ }
+
+ @Override
+ public void shear(SoundSource shearedSoundCategory, java.util.List<ItemStack> drops) {
+ // Paper end - call PlayerShearEntityEvent
this.level().playSound(null, this, SoundEvents.BOGGED_SHEAR, shearedSoundCategory, 1.0F, 1.0F);
- this.spawnShearedMushrooms();
+ this.spawnShearedMushrooms(drops); // Paper - call PlayerShearEntityEvent
this.setSheared(true);
}

- private void spawnShearedMushrooms() {
+ private void spawnShearedMushrooms(java.util.List<ItemStack> drops) { // Paper - call PlayerShearEntityEvent
// Paper start - shear drops API
- this.generateShearedMushrooms(stack -> {
+ drops.forEach(stack -> {
this.forceDrops = true;
this.spawnAtLocation(stack, this.getBbHeight());
this.forceDrops = false;