mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-29 08:14:53 +02:00
ef0e5a642d
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
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 28 Dec 2016 01:18:55 -0500
|
|
Subject: [PATCH] Fireworks API's
|
|
|
|
Get the Entity being boosted
|
|
Get the firework launcher
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java
|
|
index e750b34d7d067a5f2f5587853274b6f479cc4fd6..0d31aa0b22cf1e849572294e2cfe38b48c9210af 100644
|
|
--- a/src/main/java/org/bukkit/entity/Firework.java
|
|
+++ b/src/main/java/org/bukkit/entity/Firework.java
|
|
@@ -111,4 +111,20 @@ public interface Firework extends Projectile {
|
|
* @param shotAtAngle the new shotAtAngle
|
|
*/
|
|
void setShotAtAngle(boolean shotAtAngle);
|
|
+
|
|
+ // Paper start
|
|
+ @org.jetbrains.annotations.Nullable
|
|
+ public java.util.UUID getSpawningEntity();
|
|
+ /**
|
|
+ * If this firework is boosting an entity, return it
|
|
+ * @deprecated use {@link #getAttachedTo()}
|
|
+ * @see #setAttachedTo(LivingEntity)
|
|
+ * @return The entity being boosted
|
|
+ */
|
|
+ @org.jetbrains.annotations.Nullable
|
|
+ @Deprecated
|
|
+ default LivingEntity getBoostedEntity() {
|
|
+ return getAttachedTo();
|
|
+ }
|
|
+ // Paper end
|
|
}
|