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

Updated Upstream (Bukkit/CraftBukkit) (#8430)

Browse Source 
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
This commit is contained in:
Nassim Jahnke
2022-10-02 09:56:36 +02:00
parent 1fc4118bd8
commit 0254c46a8b
14 changed files with 32 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/api/Add-dropLeash-variable-to-EntityUnleashEvent.patch
View File

@@ -61,18 +61,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+++ b/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java
@@ -0,0 +0,0 @@ public class PlayerUnleashEntityEvent extends EntityUnleashEvent implements Canc
private final Player player;
private boolean cancelled = false;
private final EquipmentSlot hand;
+ // Paper start - drop leash variable
+ @Deprecated
public PlayerUnleashEntityEvent(@NotNull Entity entity, @NotNull Player player) {
public PlayerUnleashEntityEvent(@NotNull Entity entity, @NotNull Player player, @NotNull EquipmentSlot hand) {
- super(entity, UnleashReason.PLAYER_UNLEASH);
+ this(entity, player, false);
+ this(entity, player, hand, false);
+ }
+
+ public PlayerUnleashEntityEvent(@NotNull Entity entity, @NotNull Player player, boolean dropLeash) {
+ 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;
}