mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-24 19:56:25 +00:00
52a05907c7
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 97c59261 PR-1073: Make Biome an interface a38581aa Fix further javadoc errors 8271c490 Fix javadoc error 8a9ecf29 PR-1072: Fix bad naming for Vault State methods 6dd58108 PR-1071: Make Fluid an interface and add missing entry ed2cdfc3 PR-1070: Make Attribute an interface and align names with the new minecraft ones 63472efb PR-1069: Add missing winter drop experimental annotation to pale boats CraftBukkit Changes: 7235ad7b0 PR-1501: Make Biome an interface 602904003 PR-1500: Rename implementation for Vault State methods 75f26f79f PR-1499: Make Fluid an interface and add missing entry 4cfd87adc PR-1498: Make Attribute an interface and align names with the new minecraft ones 6bb0db5cb SPIGOT-7928: ExactChoice acts as MaterialChoice 3eaf3a13c SPIGOT-7929: Error when setting EquippableComponent abbf57bac SPIGOT-7930: Fix spawning entities with SummonEntityEffect 92d6ab6cf PR-1497: Move boat field rename entries to below key renaming, so that keys are also renamed abfe292aa PR-1496: Use correct Fluid class on Tags type check c7aab7fa7 SPIGOT-7923: Fix Dispenser logic to avoid firing empty projectiles
104 lines
4.5 KiB
Diff
104 lines
4.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Tue, 18 May 2021 12:31:54 -0700
|
|
Subject: [PATCH] Add drops to shear events
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/block/BlockShearEntityEvent.java b/src/main/java/org/bukkit/event/block/BlockShearEntityEvent.java
|
|
index 71c0af9373069cfaa074e1fbad592eab81025b1c..610768bd329b8612627d361fd9a773a7b91ff108 100644
|
|
--- a/src/main/java/org/bukkit/event/block/BlockShearEntityEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/block/BlockShearEntityEvent.java
|
|
@@ -17,11 +17,14 @@ public class BlockShearEntityEvent extends BlockEvent implements Cancellable {
|
|
private final Entity sheared;
|
|
private final ItemStack tool;
|
|
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);
|
|
this.sheared = sheared;
|
|
this.tool = tool;
|
|
+ this.drops = drops; // Paper
|
|
}
|
|
|
|
/**
|
|
@@ -64,4 +67,24 @@ public class BlockShearEntityEvent extends BlockEvent implements Cancellable {
|
|
public static HandlerList getHandlerList() {
|
|
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
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java
|
|
index 04b3dce008edefb045162d0f69f87462ea1f3534..63f6799c2543ba67ce9fe6484002062d7a754fd0 100644
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java
|
|
@@ -18,17 +18,20 @@ public class PlayerShearEntityEvent extends PlayerEvent implements Cancellable {
|
|
private final Entity what;
|
|
private final ItemStack item;
|
|
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);
|
|
this.what = what;
|
|
this.item = item;
|
|
this.hand = hand;
|
|
+ this.drops = drops; // Paper - custom shear drops
|
|
}
|
|
|
|
@Deprecated
|
|
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
|
|
@@ -82,4 +85,24 @@ public class PlayerShearEntityEvent extends PlayerEvent implements Cancellable {
|
|
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
|
|
}
|