From afb0748a2ca7ccfbfc20c8268519c3613447290a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 4 Jun 2021 18:22:15 -0400
Subject: [PATCH] [Auto] Updated Upstream (Bukkit)

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:
04df07fe #615: Calculate the reachable nodes only once per transitive dependency check.
---
 Spigot-API-Patches/0004-Timings-v2.patch                  | 6 +++---
 ...command-to-reload-permissions.yml-and-require-co.patch | 8 ++++----
 work/Bukkit                                               | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Spigot-API-Patches/0004-Timings-v2.patch b/Spigot-API-Patches/0004-Timings-v2.patch
index dbbbd2fc0c..9cfffce81e 100644
--- a/Spigot-API-Patches/0004-Timings-v2.patch
+++ b/Spigot-API-Patches/0004-Timings-v2.patch
@@ -3394,7 +3394,7 @@ index da1b5b5253c0ac0abe1019096166e6c76a50e699..586fd9ebd02039ebd2c071cbbbf60f24
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 62d0017362204070465c8ff72e5c2ca07501f558..745eaa8f2f2ff83536301db8ca47a8af30df7a73 100644
+index 77dcfe35e6a765c8ccb38bc5d900989dc0456b13..7548e40af8043c1b5716f2d7d0122833466854c4 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -358,7 +358,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -3436,7 +3436,7 @@ index 62d0017362204070465c8ff72e5c2ca07501f558..745eaa8f2f2ff83536301db8ca47a8af
              getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
          } else {
              getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
-@@ -860,7 +860,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -861,7 +861,7 @@ public final class SimplePluginManager implements PluginManager {
  
      @Override
      public boolean useTimings() {
@@ -3445,7 +3445,7 @@ index 62d0017362204070465c8ff72e5c2ca07501f558..745eaa8f2f2ff83536301db8ca47a8af
      }
  
      /**
-@@ -869,6 +869,6 @@ public final class SimplePluginManager implements PluginManager {
+@@ -870,6 +870,6 @@ public final class SimplePluginManager implements PluginManager {
       * @param use True if per event timing code should be used
       */
      public void useTimings(boolean use) {
diff --git a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
index b9e3a4cf8a..d7a1bb7514 100644
--- a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c546ab363d80a8263d140b2b4d81b840370d3436..1380a26f34a9d2b162e88fbea14b17118945643c 100644
+index 8646fc0987a8833996c5d977c36fe0d01bf72992..72375883b07ede041a7ea5f7b6785f71aef702c0 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1752,6 +1752,13 @@ public final class Bukkit {
@@ -24,7 +24,7 @@ index c546ab363d80a8263d140b2b4d81b840370d3436..1380a26f34a9d2b162e88fbea14b1711
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 22ad961b2d080f3160e37c521003143e76d144e9..4c201097ef98f545acb604fa72d56413553e4d4f 100644
+index 599347ef656acad9a40be15fc5030e5d0f1630df..a2940eafa61814aae7f766262309495e991533d6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1549,4 +1549,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -85,10 +85,10 @@ index 50cc311be7904cc8fc6070a21c8e4de3a489fd20..c62da4131b17e66892678e8b618fb9ba
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index d0fec44d2546290091649879450761ce08514fcb..8b33d914d29897c0276f9e2e7ce83bd2c316d5e2 100644
+index c2c49ee9b5531bc4761d2da54cd707c57fc647bf..2d27dfb859c312d46a14d0356c7c3f227e965a67 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -894,4 +894,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -895,4 +895,13 @@ public final class SimplePluginManager implements PluginManager {
      public void useTimings(boolean use) {
          co.aikar.timings.Timings.setTimingsEnabled(use); // Paper
      }
diff --git a/work/Bukkit b/work/Bukkit
index 0e11bc1faa..04df07fe9a 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 0e11bc1faa72b7e23b0ad1f5de847250e06b6118
+Subproject commit 04df07fe9a45f382bedd4ee83948382d3e7baae8