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/0212-Add-entity-liquid-API.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/0212-Add-entity-liquid-API.patch')
-rw-r--r-- | patches/api/0212-Add-entity-liquid-API.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/api/0212-Add-entity-liquid-API.patch b/patches/api/0212-Add-entity-liquid-API.patch index 6c8a843dee..19f023a488 100644 --- a/patches/api/0212-Add-entity-liquid-API.patch +++ b/patches/api/0212-Add-entity-liquid-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add entity liquid API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 634f3b5dd22bf439aaec7c3ecfb3477b66e994e8..1c9d0e6541d41972f9966b83cbba02f6b230a72c 100644 +index f17f30a9969e52313387c0d92edd980f72687a11..587bf31ed2b2edc7d467d226c91c2bccdd1e4044 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -733,5 +733,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -760,5 +760,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason(); |