Updated Upstream and Sidestream(s) (Paper/Empirecraft)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
e04368045 Updated Upstream (Bukkit/CraftBukkit) (#5794)

Empirecraft Changes:
e187791e Updated Paper

Paper

@@ -1 +1 @@
-Subproject commit c6495850826bcd797b9d0e21d1a4349117fa6868
+Subproject commit e04368045e2fe8e53a7b686e9bfb7c41766267be

patches/Airplane/patches/api/0001-Expose-findClass-for-profiler.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose findClass for profiler
 
 
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 81da90531cc3a7ab13d455860f89411081825949..6ced06643cd9740e2c62bc8f10d150a2f9a92e31 100644
+index d2fa792e182736070a119e96b4ae79337de53d2a..4b484d5c2a605188f55ea8cdc0c2839ee6d850ff 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -114,6 +114,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot

patches/Origami/patches/server/0001-Origami-Server-Config.patch

@@ -170,7 +170,7 @@ index 13b1eb353c22f2935cff7adbb4df725438a46d8f..ca2c46bb22d4aca818f2aad107da42eb
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 57180e164ac51b1aac070c00d820792d13d67258..5d98678c0d1eedef3cba4b962eef1270a27436db 100644
+index fbeca329f62325aa479f968e7f0f04cde341a009..1345ee267a61caf97e5b4f6ee641cadb10698fb6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -154,6 +154,14 @@ public class Main {

patches/Tuinity/patches/server/0002-Brand-changes.patch

@@ -66,7 +66,7 @@ index cebecee640ed5a7fc2b978e00ff7eb012228267d..5ab23a2266f81a3dea6c5ab0c5b8a979
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 409fbeeb66fb8f58a72d94686bc9515299927b75..c4dfcb2d9fd13c2426adb98b92310e3066bab2b9 100644
+index ecd1f0784493dfc758483b7912ce086c3b0d7aa0..7fb5f7e5efedac7c93f02d6e77b8fbe86a1784b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -265,7 +265,7 @@ public class Main {

patches/Tuinity/patches/server/0005-Tuinity-Server-Config.patch

@@ -398,7 +398,7 @@ index 5ab23a2266f81a3dea6c5ab0c5b8a97917d2b418..f48988db2f396b5e74f04d7224a76cde
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index c4dfcb2d9fd13c2426adb98b92310e3066bab2b9..57180e164ac51b1aac070c00d820792d13d67258 100644
+index 7fb5f7e5efedac7c93f02d6e77b8fbe86a1784b7..fbeca329f62325aa479f968e7f0f04cde341a009 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -146,6 +146,13 @@ public class Main {

patches/api/0008-Suspected-plugins-report.patch

@@ -111,10 +111,10 @@ index b622cedeeee017f042bcf92485d81832030a8030..f1d3042e7f224059547ac840524cae5d
 +    // Yatopia end
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 6ced06643cd9740e2c62bc8f10d150a2f9a92e31..161263242860fbae7b05766f006a7a83df82fc03 100644
+index 4b484d5c2a605188f55ea8cdc0c2839ee6d850ff..a246f43f2e28864b4795a0ffddfec361e1318938 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-@@ -250,4 +250,13 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
+@@ -252,4 +252,13 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
                     '}';
      }
      // Paper end

patches/server/0002-Brandings.patch

@@ -55,7 +55,7 @@ index ca2c46bb22d4aca818f2aad107da42ebe09f2d2f..e6439b95959af5e8761ea818a66344ee
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 5d98678c0d1eedef3cba4b962eef1270a27436db..065aa458b3ecd2287d57079c5ff8bf4358b83180 100644
+index 1345ee267a61caf97e5b4f6ee641cadb10698fb6..dfc36958e5b1a1ac82113d2d0929a17d83e4da54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -280,7 +280,7 @@ public class Main {

patches/server/0006-Yatopia-configuration.patch

@@ -106,7 +106,7 @@ index 5022827a4fb08279fd0be346804fc36babea0cb8..82d82e73cfab8689d9c87019d2992a3b
          public void broadcast(BaseComponent component) {
              for (Player player : getOnlinePlayers()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 065aa458b3ecd2287d57079c5ff8bf4358b83180..27a2355bae6d082764081b2694f4f05597f5b3e5 100644
+index dfc36958e5b1a1ac82113d2d0929a17d83e4da54..0d326b2f27b5191caeecd5fc89fa8498c426885a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -162,6 +162,14 @@ public class Main {

patches/server/0019-Redirect-Configs.patch

@@ -52,7 +52,7 @@ index 87622c770963b1675f4c36f355a3707e0f92727a..70d07a7e1881d02f6d92ea65bcf9bd5a
          this.setAllowFlight(dedicatedserverproperties.allowFlight);
          this.setResourcePack(dedicatedserverproperties.resourcePack, this.ba());
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 27a2355bae6d082764081b2694f4f05597f5b3e5..595ea06a8aee1930407f0c5a41313951044af3f4 100644
+index 0d326b2f27b5191caeecd5fc89fa8498c426885a..a23b0fb8df7418cf60257a7458f56c4dbcb8f7eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -308,7 +308,7 @@ public class Main {

upstream/Empirecraft

@@ -1 +1 @@
-Subproject commit c7ef1a7a3ab3825b1f40be5ad355b81b61cb002a
+Subproject commit e187791e8f70b01a05c6169bd89b412494293e21

upstreamCommits/Empirecraft

@@ -1 +1 @@
-c7ef1a7a3ab3825b1f40be5ad355b81b61cb002a
+e187791e8f70b01a05c6169bd89b412494293e21