blob: 947b51c6454aa191873ced3031d186a9b2fa5718 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
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
index 16570c3c7ed5e7ad25f20c1034f7b966d6e694da..adcd8161846b06fd1a7895750f98b629204a8406 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -4127,6 +4127,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.
*
|
