mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 18:45:54 +01:00
Make org.bukkit.Keyed extend Adventure's Keyed (#7090)
This commit is contained in:
parent
c1bd3cc8fd
commit
df1301b53a
@ -682,6 +682,36 @@ index cc42bfa74b41ef6d6374efa7b882f71677fb0824..ef06bd2972e0a4e7ffa0e91d2b0de5d7
|
|||||||
public static String getShutdownMessage() {
|
public static String getShutdownMessage() {
|
||||||
return server.getShutdownMessage();
|
return server.getShutdownMessage();
|
||||||
}
|
}
|
||||||
|
diff --git a/src/main/java/org/bukkit/Keyed.java b/src/main/java/org/bukkit/Keyed.java
|
||||||
|
index 32c92621c2c15eec14c50965f5ecda00c46e6c80..e076d447da62445764a9776ee2554c077637d270 100644
|
||||||
|
--- a/src/main/java/org/bukkit/Keyed.java
|
||||||
|
+++ b/src/main/java/org/bukkit/Keyed.java
|
||||||
|
@@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull;
|
||||||
|
/**
|
||||||
|
* Represents an object which has a {@link NamespacedKey} attached to it.
|
||||||
|
*/
|
||||||
|
-public interface Keyed {
|
||||||
|
+public interface Keyed extends net.kyori.adventure.key.Keyed { // Paper -- extend Adventure Keyed
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the namespaced identifier for this object.
|
||||||
|
@@ -14,4 +14,16 @@ public interface Keyed {
|
||||||
|
*/
|
||||||
|
@NotNull
|
||||||
|
NamespacedKey getKey();
|
||||||
|
+
|
||||||
|
+ // Paper start
|
||||||
|
+ /**
|
||||||
|
+ * Returns the unique identifier for this object.
|
||||||
|
+ *
|
||||||
|
+ * @return this object's key
|
||||||
|
+ */
|
||||||
|
+ @Override
|
||||||
|
+ default net.kyori.adventure.key.@NotNull Key key() {
|
||||||
|
+ return this.getKey();
|
||||||
|
+ }
|
||||||
|
+ // Paper end
|
||||||
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/Nameable.java b/src/main/java/org/bukkit/Nameable.java
|
diff --git a/src/main/java/org/bukkit/Nameable.java b/src/main/java/org/bukkit/Nameable.java
|
||||||
index fee814e01a653d2b53c56e8b566383ca44aa5346..2acdf2a6d3955923c721222b9da784f3278f6418 100644
|
index fee814e01a653d2b53c56e8b566383ca44aa5346..2acdf2a6d3955923c721222b9da784f3278f6418 100644
|
||||||
--- a/src/main/java/org/bukkit/Nameable.java
|
--- a/src/main/java/org/bukkit/Nameable.java
|
||||||
|
Loading…
Reference in New Issue
Block a user