From e18cad9a03d639da08f90609680470fd5074e33c Mon Sep 17 00:00:00 2001
From: Lexi <noellekiq@gmail.com>
Date: Sun, 12 Dec 2021 23:26:19 -0500
Subject: [PATCH] Make org.bukkit.Keyed extend Adventure's Keyed (#7090)

---
 patches/api/Adventure.patch | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch
index 7e3b1b5819..7dd27453bd 100644
--- a/patches/api/Adventure.patch
+++ b/patches/api/Adventure.patch
@@ -682,6 +682,36 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public static String getShutdownMessage() {
          return server.getShutdownMessage();
      }
+diff --git a/src/main/java/org/bukkit/Keyed.java b/src/main/java/org/bukkit/Keyed.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/Keyed.java
++++ b/src/main/java/org/bukkit/Keyed.java
+@@ -0,0 +0,0 @@ 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.
+@@ -0,0 +0,0 @@ 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
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/Nameable.java