diff options
author | Malfrador <[email protected]> | 2024-07-15 12:31:41 +0200 |
---|---|---|
committer | GitHub <[email protected]> | 2024-07-15 12:31:41 +0200 |
commit | 9fd5b3cfbd40b2847dec14f53c1b3b68aed46f12 (patch) | |
tree | 96914d111f50e21fa04bde89a96d9237e581675b /patches/api/0458-More-Raid-API.patch | |
parent | 99ae7bbc9760e02fbd5388ad3890258203ee6d5a (diff) | |
download | Paper-9fd5b3cfbd40b2847dec14f53c1b3b68aed46f12.tar.gz Paper-9fd5b3cfbd40b2847dec14f53c1b3b68aed46f12.zip |
Add AttributeModifier constructor without EquipmentSlotGroup (#11079)
Diffstat (limited to 'patches/api/0458-More-Raid-API.patch')
-rw-r--r-- | patches/api/0458-More-Raid-API.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/patches/api/0458-More-Raid-API.patch b/patches/api/0458-More-Raid-API.patch new file mode 100644 index 0000000000..b365913e82 --- /dev/null +++ b/patches/api/0458-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 ecc2d486cfec79cce27a947dfeed4853575a594d..d8a23aa0d898ca3360757721e38ddb97387f7d21 100644 +--- a/src/main/java/org/bukkit/World.java ++++ b/src/main/java/org/bukkit/World.java +@@ -4111,6 +4111,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. + * |