SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add drops to shear events

Browse Source
This commit is contained in:
Jake Potrebic
2021-05-18 12:31:54 -07:00
parent a933298032
commit 27a62b6b53
2 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
paper-api/src/main/java/org/bukkit/event/block/BlockShearEntityEvent.java
View File

@ -17,11 +17,14 @@ public class BlockShearEntityEvent extends BlockEvent implements Cancellable {
private final Entity sheared; private final Entity sheared;
private final ItemStack tool; private final ItemStack tool;
private boolean cancelled; private boolean cancelled;
private java.util.List<ItemStack> drops; // Paper
public BlockShearEntityEvent(@NotNull Block dispenser, @NotNull Entity sheared, @NotNull ItemStack tool) { @org.jetbrains.annotations.ApiStatus.Internal // Paper
public BlockShearEntityEvent(@NotNull Block dispenser, @NotNull Entity sheared, @NotNull ItemStack tool, final @NotNull java.util.List<ItemStack> drops) { // Paper - custom shear drops
super(dispenser); super(dispenser);
this.sheared = sheared; this.sheared = sheared;
this.tool = tool; this.tool = tool;
this.drops = drops; // Paper
} }
/** /**
@ -64,4 +67,24 @@ public class BlockShearEntityEvent extends BlockEvent implements Cancellable {
public static HandlerList getHandlerList() { public static HandlerList getHandlerList() {
return handlers; return handlers;
} }
// Paper start - custom shear drops
/**
* Get an immutable list of drops for this shearing.
*
* @return the shearing drops
* @see #setDrops(java.util.List)
*/
public java.util.@NotNull @org.jetbrains.annotations.Unmodifiable List<ItemStack> getDrops() {
return java.util.Collections.unmodifiableList(this.drops);
}
/**
* Sets the drops for the shearing.
*
* @param drops the shear drops
*/
public void setDrops(final java.util.@NotNull List<org.bukkit.inventory.ItemStack> drops) {
this.drops = java.util.List.copyOf(drops);
}
// Paper end - custom shear drops
} }

27
paper-api/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java
View File

@ -18,17 +18,20 @@ public class PlayerShearEntityEvent extends PlayerEvent implements Cancellable {
private final Entity what; private final Entity what;
private final ItemStack item; private final ItemStack item;
private final EquipmentSlot hand; private final EquipmentSlot hand;
private java.util.List<ItemStack> drops; // Paper - custom shear drops
public PlayerShearEntityEvent(@NotNull Player who, @NotNull Entity what, @NotNull ItemStack item, @NotNull EquipmentSlot hand) { @org.jetbrains.annotations.ApiStatus.Internal // Paper
public PlayerShearEntityEvent(@NotNull Player who, @NotNull Entity what, @NotNull ItemStack item, @NotNull EquipmentSlot hand, final java.util.@NotNull List<ItemStack> drops) { // Paper - custom shear drops
super(who); super(who);
this.what = what; this.what = what;
this.item = item; this.item = item;
this.hand = hand; this.hand = hand;
this.drops = drops; // Paper - custom shear drops
} }
@Deprecated(since = "1.15.2") @Deprecated(since = "1.15.2")
public PlayerShearEntityEvent(@NotNull final Player who, @NotNull final Entity what) { public PlayerShearEntityEvent(@NotNull final Player who, @NotNull final Entity what) {
this(who, what, new ItemStack(Material.SHEARS), EquipmentSlot.HAND); this(who, what, new ItemStack(Material.SHEARS), EquipmentSlot.HAND, java.util.Collections.emptyList()); // Paper - custom shear drops
} }
@Override @Override
@ -82,4 +85,24 @@ public class PlayerShearEntityEvent extends PlayerEvent implements Cancellable {
return handlers; return handlers;
} }
// Paper start - custom shear drops
/**
* Get an immutable list of drops for this shearing.
*
* @return the shearing drops
* @see #setDrops(java.util.List)
*/
public java.util.@NotNull @org.jetbrains.annotations.Unmodifiable List<ItemStack> getDrops() {
return this.drops;
}
/**
* Sets the drops for the shearing.
*
* @param drops the shear drops
*/
public void setDrops(final java.util.@NotNull List<org.bukkit.inventory.ItemStack> drops) {
this.drops = java.util.List.copyOf(drops);
}
// Paper end - custom shear drops
} }