Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-14 20:10:05 +01:00
52a05907c7
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: 97c59261 PR-1073: Make Biome an interface a38581aa Fix further javadoc errors 8271c490 Fix javadoc error 8a9ecf29 PR-1072: Fix bad naming for Vault State methods 6dd58108 PR-1071: Make Fluid an interface and add missing entry ed2cdfc3 PR-1070: Make Attribute an interface and align names with the new minecraft ones 63472efb PR-1069: Add missing winter drop experimental annotation to pale boats CraftBukkit Changes: 7235ad7b0 PR-1501: Make Biome an interface 602904003 PR-1500: Rename implementation for Vault State methods 75f26f79f PR-1499: Make Fluid an interface and add missing entry 4cfd87adc PR-1498: Make Attribute an interface and align names with the new minecraft ones 6bb0db5cb SPIGOT-7928: ExactChoice acts as MaterialChoice 3eaf3a13c SPIGOT-7929: Error when setting EquippableComponent abbf57bac SPIGOT-7930: Fix spawning entities with SummonEntityEffect 92d6ab6cf PR-1497: Move boat field rename entries to below key renaming, so that keys are also renamed abfe292aa PR-1496: Use correct Fluid class on Tags type check c7aab7fa7 SPIGOT-7923: Fix Dispenser logic to avoid firing empty projectiles
63 Zeilen
1.9 KiB
Diff
63 Zeilen
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 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.
|
|
*
|