mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-15 07:01:36 +08:00
0976d52bbd
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes:8d8475fcSPIGOT-4666: Force parameter in HumanEntity#sleep8b1588e2Fix ExplosionPrimeEvent#setFire not working with EnderCrystals39a287b7Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
From 598ca05d30454f06b4b08c9080ad038b0ffcb8d5 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 1c55f0338..7df26cf7f 100644
|
|
--- a/src/main/java/org/bukkit/entity/Firework.java
|
|
+++ b/src/main/java/org/bukkit/entity/Firework.java
|
|
@@ -3,6 +3,9 @@ package org.bukkit.entity;
|
|
import org.bukkit.inventory.meta.FireworkMeta;
|
|
import org.jetbrains.annotations.NotNull;
|
|
|
|
+import java.util.UUID;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
public interface Firework extends Entity {
|
|
|
|
/**
|
|
@@ -25,4 +28,15 @@ public interface Firework extends Entity {
|
|
* remaining fuse.
|
|
*/
|
|
void detonate();
|
|
+
|
|
+ // Paper start
|
|
+ @Nullable
|
|
+ public UUID getSpawningEntity();
|
|
+ /**
|
|
+ * If this firework is boosting an entity, return it
|
|
+ * @return The entity being boosted
|
|
+ */
|
|
+ @Nullable
|
|
+ public LivingEntity getBoostedEntity();
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.21.0
|
|
|