Updated Upstream and Sidestream(s) (Tuinity/EMC)

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.

Tuinity Changes:
7f251e0 Updated Upstream (Paper)

EMC Changes:
ef2f460b Updated Paper

Empirecraft

@@ -1 +1 @@
-Subproject commit dc2ae4f575d0d00f385fdf34fa9c782bb355ffe2
+Subproject commit ef2f460be60474957d2023f569b0a74eddc28214

Tuinity

@@ -1 +1 @@
-Subproject commit 7d458368e31ed86b1a2de8ecaa16ff26bbb94673
+Subproject commit 7f251e08443c33161f2eb05ede5e8dfc95dbee84

patches/server/0001-Yatopia-Server-Fixes.patch

@@ -1816,7 +1816,7 @@ index 44b67715e6c1b113b4651a965e8006e9a10a05bf..00000000000000000000000000000000
 -     // Purpur end
 - }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 16fd48c617ebced744966fd1b4cd155c20774ef4..b3651d69720cd40593d0febb58380203972ca87b 100644
+index 77cf8cf57682043ba318410619925f989336f24c..dc644857662e8fa058db4471f1b1c084850528e9 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/server/0003-Brandings.patch

@@ -168,7 +168,7 @@ index ed594eb6c8102b0ce1b52f2d2db714aa9fdeffd0..7277919e1cc5ee8f8fead434a1a33c90
      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 b3651d69720cd40593d0febb58380203972ca87b..2e0dcd78a1ec5d817c44831c279c47dc98902681 100644
+index dc644857662e8fa058db4471f1b1c084850528e9..75a15227b84f5467aeabab948677eda00c0c8e04 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -275,7 +275,7 @@ public class Main {

patches/server/0007-Yatopia-configuration.patch

@@ -304,7 +304,7 @@ index 0645185e2d73f7001a07a9f5c8461da71b1327d5..efbfcc5038a1019725eba46e5379a86e
          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 2e0dcd78a1ec5d817c44831c279c47dc98902681..a14ae29b1c248b208adfc9eb22048ba76b09502f 100644
+index 75a15227b84f5467aeabab948677eda00c0c8e04..e5408e7b87bb6df01ba4908880e2053acf8d7b87 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/0024-Redirect-Configs.patch

@@ -58,7 +58,7 @@ index 72d7a017f2aa7f2fde3b5de437e7fd2e051edd24..6c280d64bb069fba0d52a7d8b4eb6a08
          this.setPVP(dedicatedserverproperties.pvp);
          this.setAllowFlight(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index a14ae29b1c248b208adfc9eb22048ba76b09502f..e3104fd23de7fc1dec6ee471377d86bb10cf95a5 100644
+index e5408e7b87bb6df01ba4908880e2053acf8d7b87..ed16c260699eed86f6f52ee7bd83ea553f81453c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -303,7 +303,7 @@ public class Main {

patches/server/0066-lithium-PerlinNoiseSamplerMixin.patch

@@ -10,7 +10,7 @@ you can find the original code on https://github.com/jellysquid3/lithium-fabric/
 Co-authored-by:  Bud Gidiere <sgidiere@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/NoiseGeneratorPerlin.java b/src/main/java/net/minecraft/server/NoiseGeneratorPerlin.java
-index d7ca619b228e2a5a461085e0c5222e6a36a66fe0..43836d07df27b96036a6b77f88aa66e05738a614 100644
+index d7ca619b228e2a5a461085e0c5222e6a36a66fe0..ea157542df2617eec6b5a62331e1daa3c086ffae 100644
 --- a/src/main/java/net/minecraft/server/NoiseGeneratorPerlin.java
 +++ b/src/main/java/net/minecraft/server/NoiseGeneratorPerlin.java
 @@ -1,6 +1,7 @@