diff options
| author | Jake Potrebic <[email protected]> | 2024-04-20 12:57:51 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-04-20 15:57:51 -0400 |
| commit | a6b6ecdd221b6ae7687561c84c1850aaa62473b4 (patch) | |
| tree | 042dadd9b3a325657343d012d273c5420b68bc7a /patches/api | |
| parent | fc53ff5a71d4b8475bc239ef36e091725f67d5b6 (diff) | |
| download | Paper-a6b6ecdd221b6ae7687561c84c1850aaa62473b4.tar.gz Paper-a6b6ecdd221b6ae7687561c84c1850aaa62473b4.zip | |
More Raid API (#7537)
Diffstat (limited to 'patches/api')
| -rw-r--r-- | patches/api/0473-More-Raid-API.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/patches/api/0473-More-Raid-API.patch b/patches/api/0473-More-Raid-API.patch new file mode 100644 index 0000000000..6c0e5da000 --- /dev/null +++ b/patches/api/0473-More-Raid-API.patch @@ -0,0 +1,62 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic <[email protected]> +Date: Fri, 4 Mar 2022 09:46:40 -0800 +Subject: [PATCH] More Raid API + + +diff --git a/src/main/java/org/bukkit/Raid.java b/src/main/java/org/bukkit/Raid.java +index 983a8c20a06d2b509602b27f49c090598b8ecc42..fa98599e3eee37bf68f0e9813497c718f457485c 100644 +--- a/src/main/java/org/bukkit/Raid.java ++++ b/src/main/java/org/bukkit/Raid.java +@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull; + /** + * Represents a raid event. + */ +-public interface Raid { ++public interface Raid extends org.bukkit.persistence.PersistentDataHolder { // Paper + + /** + * Get whether this raid started. +@@ -131,4 +131,20 @@ public interface Raid { + */ + STOPPED; + } ++ ++ // Paper start ++ /** ++ * Gets the id of this raid. ++ * ++ * @return the raid id ++ */ ++ int getId(); ++ ++ /** ++ * Get the boss bar to be displayed for this raid. ++ * ++ * @return the boss bar ++ */ ++ org.bukkit.boss.@NotNull BossBar getBossBar(); ++ // Paper end + } +diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java +index 35fb5047dd8a8521586a9ca9f8d70881355fb7f5..e6f66d70d024cf4f0536a5bf8e51bf7b306335df 100644 +--- a/src/main/java/org/bukkit/World.java ++++ b/src/main/java/org/bukkit/World.java +@@ -4199,6 +4199,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient + @Nullable + public Raid locateNearestRaid(@NotNull Location location, int radius); + ++ // Paper start - more Raid API ++ /** ++ * Get a raid with the specific id from {@link Raid#getId} ++ * from this world. ++ * ++ * @param id the id of the raid ++ * @return the raid or null if none with that id ++ */ ++ @Nullable Raid getRaid(int id); ++ // Paper end - more Raid API ++ + /** + * Gets all raids that are going on over this world. + * |