mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-28 23:49:41 +02:00
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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
79 lines
3.0 KiB
Diff
79 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Nassim Jahnke <nassim@njahnke.dev>
|
|
Date: Fri, 29 Jan 2021 15:13:04 +0100
|
|
Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/entity/EntityUnleashEvent.java b/src/main/java/org/bukkit/event/entity/EntityUnleashEvent.java
|
|
index a33986a0c437a673435206fc337031a7eebdab3b..e0e068799a1868c8e561869015f41f553ef4fbdb 100644
|
|
--- a/src/main/java/org/bukkit/event/entity/EntityUnleashEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/entity/EntityUnleashEvent.java
|
|
@@ -10,10 +10,19 @@ import org.jetbrains.annotations.NotNull;
|
|
public class EntityUnleashEvent extends EntityEvent {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
private final UnleashReason reason;
|
|
+ private boolean dropLeash; // Paper
|
|
|
|
+ // Paper start - drop leash variable
|
|
+ @Deprecated
|
|
public EntityUnleashEvent(@NotNull Entity entity, @NotNull UnleashReason reason) {
|
|
+ this(entity, reason, false);
|
|
+ }
|
|
+
|
|
+ public EntityUnleashEvent(@NotNull Entity entity, @NotNull UnleashReason reason, boolean dropLeash) {
|
|
super(entity);
|
|
+ // Paper end
|
|
this.reason = reason;
|
|
+ this.dropLeash = dropLeash; // Paper
|
|
}
|
|
|
|
/**
|
|
@@ -26,6 +35,26 @@ public class EntityUnleashEvent extends EntityEvent {
|
|
return reason;
|
|
}
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Returns whether a leash item will be dropped.
|
|
+ *
|
|
+ * @return Whether the leash item will be dropped
|
|
+ */
|
|
+ public boolean isDropLeash() {
|
|
+ return dropLeash;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets whether a leash item should be dropped.
|
|
+ *
|
|
+ * @param dropLeash Whether the leash item should be dropped
|
|
+ */
|
|
+ public void setDropLeash(boolean dropLeash) {
|
|
+ this.dropLeash = dropLeash;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@NotNull
|
|
@Override
|
|
public HandlerList getHandlers() {
|
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java
|
|
index 075af9c1c179bcc2f0e7cb4db4e0d54d6d58ce5c..d63bd62606763d0902ea800f0c35a1cfd07fc8ec 100644
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java
|
|
@@ -17,8 +17,15 @@ public class PlayerUnleashEntityEvent extends EntityUnleashEvent implements Canc
|
|
private final Player player;
|
|
private final EquipmentSlot hand;
|
|
|
|
+ // Paper start - drop leash variable
|
|
+ @Deprecated
|
|
public PlayerUnleashEntityEvent(@NotNull Entity entity, @NotNull Player player, @NotNull EquipmentSlot hand) {
|
|
- super(entity, UnleashReason.PLAYER_UNLEASH);
|
|
+ this(entity, player, hand, false);
|
|
+ }
|
|
+
|
|
+ public PlayerUnleashEntityEvent(@NotNull Entity entity, @NotNull Player player, @NotNull EquipmentSlot hand, boolean dropLeash) {
|
|
+ super(entity, UnleashReason.PLAYER_UNLEASH, dropLeash);
|
|
+ // Paper end
|
|
this.player = player;
|
|
this.hand = hand;
|
|
}
|