Updated Upstream and Sidestream(s) (Tuinity/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:
47a29f8 Updated Upstream (Paper)

Purpur Changes:
5656968 Set name visible when using a Name Tag on an Armor Stand
e7b397b Apply display names from item forms of entities to entities and vice versa
641bbec Add end dimension noise cache patch from Paper PR queue
f7d6be9 Fix #77 Add option to disable console hex color support
b3b4a11 Updated Upstream (Paper)
f9db92c Breeding configuration patches (#95)
686640f Option to use farmland mechanics from Alpha
2536628 Fix download links in readme

PATCHES.md

@@ -108,7 +108,6 @@ # Patches
 | server |  Remove some streams and object allocations      | Phoenix616 |  |
 | server |  Remove vanilla profiler callers      | Sotr |  |
 | server |  Respect PlayerKickEvent leaveMessage      | Ivan Pekov |  |
-| server |  Respect rotation when respawning      | Ivan Pekov |  |
 | server |  Send more packets immediately      | MrIvanPlays |  |
 | server |  Shutdown Bootstrap thread pool      | foss-mc |  |
 | server |  Skip events if there's no listeners      | William Blake Galbreath |  |

Purpur

@@ -1 +1 @@
-Subproject commit 519ac08d10389f8b3e28892e45d076e296bcaa61
+Subproject commit 56569681b43e3fec3426cca43271b04eaf93f100

Tuinity

@@ -1 +1 @@
-Subproject commit aaef5d7fa4052464a9760e06a04c00739ccde7bb
+Subproject commit 47a29f8434891ecac58dced9716aa8ba11dadbc4

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

@@ -1329,7 +1329,7 @@ index 3a35169eaf680c45fe42922eb5f0014fa422c31c..00000000000000000000000000000000
 -             }
 -             // Spigot Start
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 78dc3c38def9cadd5fe504b1c66470e444a433c4..fbe1d388fa721e09ab63bed618bc20b958c652fe 100644
+index 7acbe311158edae05af09653f2deadfbc036ed76..507e13bcd2f4b012338a3114e6187acc2ca51b84 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -872,9 +872,9 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1413,7 +1413,7 @@ index 78dc3c38def9cadd5fe504b1c66470e444a433c4..fbe1d388fa721e09ab63bed618bc20b9
                      // Paper start - EAR 2
                      if (isActive) {
                      entity1.passengerTick();
-@@ -1469,7 +1469,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1470,7 +1470,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
                          entity.syncPositionOf(entity1);
                      }
                      // Paper end - EAR 2
@@ -1422,7 +1422,7 @@ index 78dc3c38def9cadd5fe504b1c66470e444a433c4..fbe1d388fa721e09ab63bed618bc20b9
                  }
  
                  this.chunkCheck(entity1);
-@@ -1491,7 +1491,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1492,7 +1492,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
  
      public void chunkCheck(Entity entity) {
          if (entity.cl()) {
@@ -1529,7 +1529,7 @@ index 8aa3dd3a0a0db575292be8d9c73bb3083849622b..00000000000000000000000000000000
 -             int j =  Math.min(15, Math.max(0, MathHelper.floor(entity.locY() / 16.0D))); // Paper - stay consistent with chunk add/remove behavior
 -             int k = MathHelper.floor(entity.locZ() / 16.0D);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 31f918778317f05bd5b09f4a8ee55bb4b71defd1..cb568bd17f4ac650f20859d2ac8d430bc928d718 100644
+index 31f918778317f05bd5b09f4a8ee55bb4b71defd1..689a1541853e03e8e6d7a30bc5937978124aba2c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -129,11 +129,6 @@ public class PurpurConfig {
@@ -1544,7 +1544,7 @@ index 31f918778317f05bd5b09f4a8ee55bb4b71defd1..cb568bd17f4ac650f20859d2ac8d430b
      public static double laggingThreshold = 19.0D;
      private static void tickLoopSettings() {
          laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
-@@ -172,4 +167,14 @@ public class PurpurConfig {
+@@ -172,4 +167,19 @@ public class PurpurConfig {
      private static void fixItemPositionDesync() {
          fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
      }
@@ -1557,6 +1557,11 @@ index 31f918778317f05bd5b09f4a8ee55bb4b71defd1..cb568bd17f4ac650f20859d2ac8d430b
 +            set("settings.enchantment.allow-infinite-and-mending-together", null);
 +        }
 +         allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
++    }
++
++    public static boolean useHexColorsInConsole = true;
++    private static void loggerSettings() {
++        useHexColorsInConsole = getBoolean("settings.logger.hex-color-support-in-console", useHexColorsInConsole);
 +    }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java.rej b/src/main/java/net/pl3x/purpur/PurpurConfig.java.rej

patches/server/0007-Yatopia-configuration.patch

@@ -67,7 +67,7 @@ index 9ae1b9b40324da3d7a35bf8bbd6b3bea242f2b73..5e657f5ed9536a6d3e23d840ee57319d
          if (this.isFireProof() || this.world.isClientSide) {
              this.extinguish();
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 312ad786861667e02c57d06fd3567e3f8c13cd69..6e20c86977258ddbca59936e28f2f5d04f2944fb 100644
+index bf95b1e9f3855c968be8baab47716f77d672140e..9f3b432f093d2020b74ad0af352c8418ff5b6942 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -188,7 +188,7 @@ public abstract class PlayerList {

patches/server/0029-Optimize-some-stuff-in-WorldServer-ticking.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize some stuff in WorldServer ticking
 Replaced some streams and some array lists with glue lists
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index fbe1d388fa721e09ab63bed618bc20b958c652fe..219a33195e5309a1bac279154c9be0ed7dbf2563 100644
+index 507e13bcd2f4b012338a3114e6187acc2ca51b84..9417032aecb79916a9dbde71e2447d00018e3b28 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -64,11 +64,11 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -73,7 +73,7 @@ index fbe1d388fa721e09ab63bed618bc20b958c652fe..219a33195e5309a1bac279154c9be0ed
      }
  
      // Paper start - optimise random block ticking
-@@ -1920,8 +1928,9 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1918,8 +1926,9 @@ public class WorldServer extends World implements GeneratorAccessSeed {
          // Spigot start
          if ( entity instanceof EntityHuman )
          {
@@ -84,7 +84,7 @@ index fbe1d388fa721e09ab63bed618bc20b958c652fe..219a33195e5309a1bac279154c9be0ed
                  for (Object o : worldData.data.values() )
                  {
                      if ( o instanceof WorldMap )
-@@ -1938,7 +1947,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1936,7 +1945,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
                          }
                      }
                  }

patches/server/0034-lithium-collision-optimizations.patch

@@ -1141,7 +1141,7 @@ index db735e29d427cc8f4bd4ba54c7a44daf9fed9e61..877ef81bd8285167ce11c116b8ad803f
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 219a33195e5309a1bac279154c9be0ed7dbf2563..bc46696d7e397684025affcc7b59028596df7f5e 100644
+index 9417032aecb79916a9dbde71e2447d00018e3b28..a728b5a95a02e713c288e52dd6b8e309e55241e8 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -787,8 +787,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1159,7 +1159,7 @@ index 219a33195e5309a1bac279154c9be0ed7dbf2563..bc46696d7e397684025affcc7b590285
      }
  
      @Override
-@@ -1871,12 +1877,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1869,12 +1875,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
          }
          // Spigot End
          this.tileEntityListUnload.addAll(chunk.getTileEntities().values());

patches/server/0041-Stop-wasting-resources-on-JsonList-get.patch

@@ -55,7 +55,7 @@ index 4094ef76b7b05de1bfcc28aa0ef13033abadeb7e..0224a6d0e47e836fa485b39e7b4ce5b8
          Throwable throwable = null;
  
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 6e20c86977258ddbca59936e28f2f5d04f2944fb..ad756029c97bf73594eabb7ef5c803b205477777 100644
+index 9f3b432f093d2020b74ad0af352c8418ff5b6942..cc44389ab91e12c86dc9f58d5e34e5fbb4a5ac87 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -636,6 +636,7 @@ public abstract class PlayerList {

patches/server/0044-Fix-LightEngineThreaded-memory-leak.patch

@@ -18,10 +18,10 @@ index 2f9c97dd4e1d705a87772d18c7ab4883a876af08..f3494ac1ad659352ca5595adf9e6919b
              return this.size == 0 && this.pendingTasks.isEmpty();
          }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index bc46696d7e397684025affcc7b59028596df7f5e..735d40fede0710e9578cc60163e6c63c58ade9e5 100644
+index a728b5a95a02e713c288e52dd6b8e309e55241e8..d2e3cab67cdcb195747710ae719693dedc092038 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1913,6 +1913,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1911,6 +1911,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
          }
          // Paper end
  

patches/server/0045-Respect-PlayerKickEvent-leaveMessage.patch

@@ -39,7 +39,7 @@ index d796f2e5bce4c244bb392185d7810815df964781..b1b22d652f0bc4b6d2bff57438861677
              this.minecraftServer.getPlayerList().sendMessage(CraftChatMessage.fromString(quitMessage));
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ad756029c97bf73594eabb7ef5c803b205477777..7a065d4b83259874af07320806b852c9b6adafd2 100644
+index cc44389ab91e12c86dc9f58d5e34e5fbb4a5ac87..314505d1e66ae1b692d28f46484035d217e9d07b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -499,6 +499,11 @@ public abstract class PlayerList {

patches/server/0053-PaperPR-Fix-merging-spawning-values.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] PaperPR: Fix merging spawning values
 This patch is licensed under bukkit's original license, GPLv3
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 9108321741e9d3f896c43be8f204735b1b73127e..b16ca40d49a0cc8f4fb3b1de1ce695b367040ad4 100644
+index 5cd3871dc480ddd3f7ab7ecfdac5cf98c1f37144..888cc227729e1585456ef9eedb8c5e9ab8402459 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -157,9 +157,12 @@ public final class SpawnerCreature {

patches/server/0053-Respect-rotation-when-respawning.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ivan Pekov <ivan@mrivanplays.com>
-Date: Mon, 28 Sep 2020 16:23:11 +0300
-Subject: [PATCH] Respect rotation when respawning
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7a065d4b83259874af07320806b852c9b6adafd2..c547d7a7ef109e98524762dab91f0795659ebbc6 100644
---- a/src/main/java/net/minecraft/server/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -814,7 +814,7 @@ public abstract class PlayerList {
-                     entityplayer1.setRespawnPosition(worldserver1.getDimensionKey(), blockposition, f, flag1, false);
-                     flag2 = !flag && flag3;
-                     isBedSpawn = true;
--                    location = new Location(worldserver1.getWorld(), vec3d.x, vec3d.y, vec3d.z);
-+                    location = new Location(worldserver1.getWorld(), vec3d.x, vec3d.y, vec3d.z, f1, 0.0F); // Yatopia - respect rotation
-                 } else if (blockposition != null) {
-                     entityplayer1.playerConnection.sendPacket(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.a, 0.0F));
-                 }