2024-04-20 21:57:51 +02:00
|
|
|
From 0000000000000000000000000000000000000000 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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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
|
2024-04-23 19:02:08 +02:00
|
|
|
index 0e3c7de14be8dc01199fd68b6bf41783c5c43ec3..97f97ea5c6aa513c439f86a9c82821e0f7d9cd1e 100644
|
2024-04-20 21:57:51 +02:00
|
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
|
|
|
+++ b/src/main/java/org/bukkit/World.java
|
2024-04-23 19:02:08 +02:00
|
|
|
@@ -4215,6 +4215,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
2024-04-20 21:57:51 +02:00
|
|
|
@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.
|
|
|
|
|
*
|
