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

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: 1d73f6c Updated Upstream (Paper) EMC Changes: 81f5e1fa Updated Paper faf92d5c Updated Paper 7e1e4bad Update patch name to reflect what actually is being changed 019ceb9f Update patch name for fishing hook api 647b2063 Separate out a patch for using getType in the ItemStack isSimilar method 38734f9b Updated Paper ac260ccd Update to 1.16.3 4977edff Updated Paper Purpur Changes: debedee Add predicate to recipe's ExactChoice ingredient 2459033 Rebuild patches 17d8ee8 Add option to disable zombies pathfinding to villagers only when lagging 1e25c2f Fix typo/error in a purpur world setting da9953a Updated Upstream (Paper)
2024-11-22 02:25:51 +01:00 · 2020-10-03 10:16:41 +03:00 · 2020-10-03 10:16:41 +03:00 · 8a67951956
commit 8a67951956
parent f33511fdd2
10 changed files with 59 additions and 9 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -13,7 +13,7 @@
 [submodule "Empirecraft"]
 	path = Empirecraft
 	url = https://github.com/starlis/empirecraft.git
-	branch = ver/1.16.2
+	branch = master
 [submodule "Origami"]
 	path = Origami
 	url = https://github.com/Minebench/Origami.git
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit ff909c448adee41a4de623acaf181b87314bdeaa
+Subproject commit 81f5e1fa341c3bcdeffd40026356732ed8032f80
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 8dfb30b7e4c3de3f230134bb155e2a6dc567772f
+Subproject commit debedee58753438601acf766297f73380f362aaa
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 8ba1babf17f8dfdbc3a0d3e64137e03a4f53caae
+Subproject commit 1d73f6c98a24405f3458ce15fe491cc97434f5e3
--- a/patches/server/0001-Yatopia-Server-Fixes.patch
+++ b/patches/server/0001-Yatopia-Server-Fixes.patch
@ -119,6 +119,43 @@ index 02f5ccf54210776770d3215afb7c8e82f750d57e..00000000000000000000000000000000
 -         public int pigmenPortalSpawn = 2000;
 -         public double pigmenPortalBoost = 0.0;
 -         public boolean pigmenFarmsWaterAi = false;
+diff --git a/src/main/java/net/minecraft/server/AdvancementDataWorld.java b/src/main/java/net/minecraft/server/AdvancementDataWorld.java
+index cc0aedf584095f59b4015acc45752d4d6009e154..7b6afeaab4486f90b954f2cd3b044e7bbe31f249 100644
+--- a/src/main/java/net/minecraft/server/AdvancementDataWorld.java
+++ b/src/main/java/net/minecraft/server/AdvancementDataWorld.java
+@@ -45,7 +45,7 @@ public class AdvancementDataWorld extends ResourceDataJson {
+                 AdvancementDataWorld.LOGGER.error("Parsing error loading custom advancement {}: {}", minecraftkey, jsonparseexception.getMessage());
+             }
+ 
+-        }
+        }); // Yatopia - fix akarin's shit
+         Advancements advancements = new Advancements();
+ 
+         advancements.a((Map) map1);
+diff --git a/src/main/java/net/minecraft/server/AdvancementDataWorld.java.rej b/src/main/java/net/minecraft/server/AdvancementDataWorld.java.rej
+deleted file mode 100644
+index e050fe9d3c77054d643570ef380a747c9d4812d4..0000000000000000000000000000000000000000
+--- a/src/main/java/net/minecraft/server/AdvancementDataWorld.java.rej
+++ /dev/null
+@@ -1,18 +0,0 @@
+-diff a/src/main/java/net/minecraft/server/AdvancementDataWorld.java b/src/main/java/net/minecraft/server/AdvancementDataWorld.java	(rejected hunks)
+-@@ -28,10 +29,12 @@ public class AdvancementDataWorld extends ResourceDataJson {
+-     protected void a(Map<MinecraftKey, JsonElement> map, IResourceManager iresourcemanager, GameProfilerFiller gameprofilerfiller) {
+-         Map<MinecraftKey, Advancement.SerializedAdvancement> map1 = Maps.newHashMap();
+- 
+--        map.forEach((minecraftkey, jsonelement) -> {
+--            // Spigot start
+--            if (org.spigotmc.SpigotConfig.disabledAdvancements != null && (org.spigotmc.SpigotConfig.disabledAdvancements.contains("*") || org.spigotmc.SpigotConfig.disabledAdvancements.contains(minecraftkey.toString()))) {
+--                return;
+-+        for (Map.Entry<MinecraftKey, JsonElement> entry : map.entrySet()) {
+-+            MinecraftKey minecraftkey = entry.getKey();
+-+            JsonElement jsonelement = entry.getValue();
+-+// Spigot start
+-+            if (SpigotConfig.disabledAdvancements != null && (SpigotConfig.disabledAdvancements.contains("*") || SpigotConfig.disabledAdvancements.contains(minecraftkey.toString()))) {
+-+                continue;
+-             }
+-             // Spigot end
+- 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 index e811295b4d6afcd920f60e0ce5440e43300d9085..d1064bd1c76eb23ce12e4a0703ce9f2622952897 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
@ -2380,7 +2417,7 @@ index bada470cba41cce9beb9eb04227b42c1d489d731..00000000000000000000000000000000
 -     private int c;
 -     private TileEntityShulkerBox.AnimationPhase i;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 06348f26fa4f0a5f64ca1b651665a9062e38c7de..bbbbeaafe8d699d59b04fe44a09b6b5fd9f1fac5 100644
+index c0815269be89c2b9d316ccaf8ccfa15beec98cc4..b06264b2315d7fed50946050445117c8aa930b3c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -96,6 +96,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
--- a/patches/server/0003-Brandings.patch
+++ b/patches/server/0003-Brandings.patch
@ -167,6 +167,19 @@ index b07659d2df48f3d131c8ddf94ff2a1e12afc3d08..42628d6dbf54977d34442f46c89b771a
     private final String serverVersion;
     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
+--- 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 {
+                     if (buildDate.before(deadline.getTime())) {
+                         // Paper start - This is some stupid bullshit
+                         System.err.println("*** Warning, you've not updated in a while! ***");
+-                        System.err.println("*** Please download a new build ***"); // Paper // Tuinity
+                        System.err.println("*** Please download a new build as per instructions from https://yatopia.net/download ***"); // Paper // Tuinity // Yatopia
+                         //System.err.println("*** Server will start in 20 seconds ***");
+                         //Thread.sleep(TimeUnit.SECONDS.toMillis(20));
+                         // Paper End
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 index 3ebaa9463e365831de37d8fa3cc191693f5b856f..56af3160015a5cf34586d2b8e7c073cea8ce52a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
--- a/patches/server/0006-Yatopia-configuration.patch
+++ b/patches/server/0006-Yatopia-configuration.patch
@ -304,7 +304,7 @@ index 4bae0e82bc25b576a23b5f05af7c3ad944a54bcf..78d7fc805a1aeb0d31e51a5aa68e92d9
         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 b3651d69720cd40593d0febb58380203972ca87b..e1fdb891ca612cd360983ce121b01faab3f50d68 100644
+index 2e0dcd78a1ec5d817c44831c279c47dc98902681..a14ae29b1c248b208adfc9eb22048ba76b09502f 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 {
--- a/patches/server/0021-Optimize-TileEntity-load-unload.patch
+++ b/patches/server/0021-Optimize-TileEntity-load-unload.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Optimize TileEntity load/unload


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bbbbeaafe8d699d59b04fe44a09b6b5fd9f1fac5..47dcc1b9242cb6d035d554ab0ed235b11238f469 100644
+index b06264b2315d7fed50946050445117c8aa930b3c..1b08df02c18230bffb37a945944073fff22b16c9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -42,9 +42,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
--- a/patches/server/0023-Redirect-Configs.patch
+++ b/patches/server/0023-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 e1fdb891ca612cd360983ce121b01faab3f50d68..ced65104baf3a8a7d4a1aaaba0a863eaf0a5c169 100644
+index a14ae29b1c248b208adfc9eb22048ba76b09502f..e3104fd23de7fc1dec6ee471377d86bb10cf95a5 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 {
--- a/scripts/fetchUpstream.sh
+++ b/scripts/fetchUpstream.sh
@ -15,7 +15,7 @@ function update {

 function updateAll {
  update Akarin 1.16.2
-  update Empirecraft ver/1.16.2
+  update Empirecraft master
  update Origami 1.16
  update Purpur ver/1.16.3
  update Rainforest ver/1.16