diff options
| author | Nassim Jahnke <[email protected]> | 2022-09-12 13:31:45 +0200 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2022-09-12 13:31:45 +0200 |
| commit | ef0e5a642d33ac62f070c45a61cb42647b2744cd (patch) | |
| tree | 70dff1b36e6d4306f059b3c8e335527af00adf73 /patches/api/0385-Add-Player-getFishHook.patch | |
| parent | 51183af967aafb3d57dc19421da1bcb0aea9d3d2 (diff) | |
| download | Paper-ef0e5a642d33ac62f070c45a61cb42647b2744cd.tar.gz Paper-ef0e5a642d33ac62f070c45a61cb42647b2744cd.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot)
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:
9ae3f10f SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API
48c0c547 PR-786: Add methods to get sounds from entities
CraftBukkit Changes:
5cc9c022a SPIGOT-7152: Handle hand item changing during air interact event
4ffa1acf6 SPIGOT-7154: Players get kicked when interacting with a conversation
4daa21123 SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API
e5d6a9bbf PR-1100: Add methods to get sounds from entities
b7e9f1c8b SPIGOT-7146: Reduce use of Material switch in ItemMeta
Spigot Changes:
4c157bb4 Rebuild patches
Diffstat (limited to 'patches/api/0385-Add-Player-getFishHook.patch')
| -rw-r--r-- | patches/api/0385-Add-Player-getFishHook.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/api/0385-Add-Player-getFishHook.patch b/patches/api/0385-Add-Player-getFishHook.patch index c58145c58b..9c96c813ae 100644 --- a/patches/api/0385-Add-Player-getFishHook.patch +++ b/patches/api/0385-Add-Player-getFishHook.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#getFishHook diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index f9531c0f909c7caeddfb8f06ef9a11469ba7d434..f854c1252f42ac02ad4eb84f7b5734b4cec88e53 100644 +index 29885c7184dbec82a6de69c39878276392779d71..3b204144e2d245098b3dc23b8779f9ed817bb6d1 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java -@@ -355,6 +355,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder +@@ -356,6 +356,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder @Nullable public Location getPotentialBedLocation(); // Paper end |