mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 12:05:53 +01:00
e1c0033552
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 2b4b6d14 PR-1023: Convert InventoryView to interface CraftBukkit Changes: 68603b1c1 Use expanded interaction ranges for traced interact events eae9f760c PR-1414: Convert InventoryView to interface ee9eafe67 Fix Implementation for DamageSource#isIndirect for internal custom causing entity
63 lines
1.9 KiB
Diff
63 lines
1.9 KiB
Diff
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 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.
|
|
*
|