From 7c55e62abc9dc1b6e2d0255b42bc03daa6c78909 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Thu, 9 Jun 2022 16:19:38 -0700
Subject: [PATCH] Fix tests

---
 ...ault-permission-message-configurable.patch | 19 ++++++++++++++++---
 ...184-Expose-the-internal-current-tick.patch |  4 ++--
 ...191-Expose-MinecraftServer-isRunning.patch |  4 ++--
 patches/api/0201-Add-Mob-Goal-API.patch       |  4 ++--
 patches/api/0296-Add-basic-Datapack-API.patch |  4 ++--
 patches/api/0371-Custom-Potion-Mixes.patch    |  4 ++--
 6 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/patches/api/0164-Make-the-default-permission-message-configurable.patch b/patches/api/0164-Make-the-default-permission-message-configurable.patch
index 451ee36b94..035e40e181 100644
--- a/patches/api/0164-Make-the-default-permission-message-configurable.patch
+++ b/patches/api/0164-Make-the-default-permission-message-configurable.patch
@@ -5,21 +5,34 @@ Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 653fe32bd134945e1cb1cf40f2623ffffdf5d762..9bd83fc81ae5a196a7254a4fd68f884805d5bddb 100644
+index 653fe32bd134945e1cb1cf40f2623ffffdf5d762..f4e1ea578bae0d1dc8badfcbf83ca4550a41867b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2132,6 +2132,15 @@ public final class Bukkit {
+@@ -2132,6 +2132,28 @@ public final class Bukkit {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
  
 +    /**
++     * Gets the default no permission message used on the server
 +     *
-+     * @return the default no permission message used on the server
++     * @return the default message
++     * @deprecated use {@link #permissionMessage()}
 +     */
 +    @NotNull
++    @Deprecated
 +    public static String getPermissionMessage() {
 +        return server.getPermissionMessage();
 +    }
++
++    /**
++     * Gets the default no permission message used on the server
++     *
++     * @return the default message
++     */
++    @NotNull
++    public static net.kyori.adventure.text.Component permissionMessage() {
++        return server.permissionMessage();
++    }
 +
      /**
       * Creates a PlayerProfile for the specified uuid, with name as null.
diff --git a/patches/api/0184-Expose-the-internal-current-tick.patch b/patches/api/0184-Expose-the-internal-current-tick.patch
index 420a314b5b..e66b41e6ec 100644
--- a/patches/api/0184-Expose-the-internal-current-tick.patch
+++ b/patches/api/0184-Expose-the-internal-current-tick.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3a011b6fe654da9710aa81c4e13e9b135fbecfc3..5880fe78b52cab2e9c2e4f2639570e0380dd9b73 100644
+index ba0c757346975af6fae9c0ebd72487395c74170d..346ed194262c045bb12034b1dc949cf9bbbcb4ee 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2215,6 +2215,10 @@ public final class Bukkit {
+@@ -2228,6 +2228,10 @@ public final class Bukkit {
      public static com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name) {
          return server.createProfileExact(uuid, name);
      }
diff --git a/patches/api/0191-Expose-MinecraftServer-isRunning.patch b/patches/api/0191-Expose-MinecraftServer-isRunning.patch
index 7ebb6da13b..23fbcd0b2d 100644
--- a/patches/api/0191-Expose-MinecraftServer-isRunning.patch
+++ b/patches/api/0191-Expose-MinecraftServer-isRunning.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3b60fa65686572fdd8fab22cd131ca5cfe5274c8..3455de478517a91285bb9d1b306ce1c4be619389 100644
+index 00dce49d4053ce0a10cc9d0a40f90e4ab615cdf1..2e57eaa8bf0b191f82d1ce805458cd2380c22aa9 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2238,6 +2238,15 @@ public final class Bukkit {
+@@ -2251,6 +2251,15 @@ public final class Bukkit {
      public static int getCurrentTick() {
          return server.getCurrentTick();
      }
diff --git a/patches/api/0201-Add-Mob-Goal-API.patch b/patches/api/0201-Add-Mob-Goal-API.patch
index 6a7d15f543..04cadf922c 100644
--- a/patches/api/0201-Add-Mob-Goal-API.patch
+++ b/patches/api/0201-Add-Mob-Goal-API.patch
@@ -523,10 +523,10 @@ index 0000000000000000000000000000000000000000..8fd399f791b45eb7fc62693ca954eea0
 +    @Deprecated GoalKey<Mob> UNIVERSAL_ANGER_RESET = GoalKey.of(Mob.class, NamespacedKey.minecraft("universal_anger_reset"));
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 706e42172b938840c6ec06f0f7b686eee17a4a93..3faefc48a2dca51f19d4289547f0ce875bb61e32 100644
+index 4fa0928f3baa2b69c48bea02fe5746dc58b201a8..9abab2de3ad2b7e6d53c9902df0e750af36e78fc 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2259,6 +2259,16 @@ public final class Bukkit {
+@@ -2272,6 +2272,16 @@ public final class Bukkit {
      public static boolean isStopping() {
          return server.isStopping();
      }
diff --git a/patches/api/0296-Add-basic-Datapack-API.patch b/patches/api/0296-Add-basic-Datapack-API.patch
index 4b85aa9dc4..ab74001ac9 100644
--- a/patches/api/0296-Add-basic-Datapack-API.patch
+++ b/patches/api/0296-Add-basic-Datapack-API.patch
@@ -70,10 +70,10 @@ index 0000000000000000000000000000000000000000..58f78d5e91beacaf710f62461cf869f7
 +
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4c6780dd1375f5d2c6e60229cc05c4af9d480b8a..3e3e48f467eef561eeada98c6b99388e23595d7f 100644
+index 78778751e225900d8ad12dab56f84c76123904a2..c8efb995bdff6e0888ef479aef4cca3e2d66e34c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2313,6 +2313,14 @@ public final class Bukkit {
+@@ -2326,6 +2326,14 @@ public final class Bukkit {
      public static com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
          return server.getMobGoals();
      }
diff --git a/patches/api/0371-Custom-Potion-Mixes.patch b/patches/api/0371-Custom-Potion-Mixes.patch
index b922434e3b..490069b835 100644
--- a/patches/api/0371-Custom-Potion-Mixes.patch
+++ b/patches/api/0371-Custom-Potion-Mixes.patch
@@ -102,10 +102,10 @@ index 0000000000000000000000000000000000000000..cb6d93526b637946aec311bef103ad30
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 7fcb2d84e707576531ddb9a7dd85cf0481ae58ce..a87399fa4838d4b2c1ff9cc35d433ae76cc149bf 100644
+index e5271098b97b330566df9a0e11e3b05d5c6b3c8a..fc16e897f4ebaf9d79e49774e15a1cded33ef725 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2353,6 +2353,15 @@ public final class Bukkit {
+@@ -2366,6 +2366,15 @@ public final class Bukkit {
      public static io.papermc.paper.datapack.DatapackManager getDatapackManager() {
          return server.getDatapackManager();
      }