From 6f0bb7dc5fb2812e8836677e4b431ca097cae82a Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Fri, 4 Mar 2022 09:46:40 -0800
Subject: [PATCH] More Raid API

---
 paper-api/src/main/java/org/bukkit/Raid.java  | 18 +++++++++++++++++-
 paper-api/src/main/java/org/bukkit/World.java | 11 +++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/paper-api/src/main/java/org/bukkit/Raid.java b/paper-api/src/main/java/org/bukkit/Raid.java
index 983a8c20a0..fa98599e3e 100644
--- a/paper-api/src/main/java/org/bukkit/Raid.java
+++ b/paper-api/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/paper-api/src/main/java/org/bukkit/World.java b/paper-api/src/main/java/org/bukkit/World.java
index 1796615065..e2573ede85 100644
--- a/paper-api/src/main/java/org/bukkit/World.java
+++ b/paper-api/src/main/java/org/bukkit/World.java
@@ -4164,6 +4164,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.
      *