From 4eefcbc41ba7f11a9abd17812b3467db5e2b0b5a Mon Sep 17 00:00:00 2001
From: Ivan Pekov <ivan@mrivanplays.com>
Date: Tue, 1 Sep 2020 08:36:11 +0300
Subject: [PATCH] Updated Upstream (Tuinity)

Upstream has released updates that appears to apply and compile correctly
Tuinity Changes:
ba0bfda Updated Upstream (Paper)
---
 Tuinity                                        | 2 +-
 patches/server/0001-Yatopia-Server-Fixes.patch | 4 ++--
 patches/server/0003-Brandings.patch            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Tuinity b/Tuinity
index 3dc7b9e3..ba0bfdad 160000
--- a/Tuinity
+++ b/Tuinity
@@ -1 +1 @@
-Subproject commit 3dc7b9e37343f9a1537b476029bfb339f1360231
+Subproject commit ba0bfdaddc0eccf2b4ee12f65d559cec751becfd
diff --git a/patches/server/0001-Yatopia-Server-Fixes.patch b/patches/server/0001-Yatopia-Server-Fixes.patch
index aece5460..150f9313 100644
--- a/patches/server/0001-Yatopia-Server-Fixes.patch
+++ b/patches/server/0001-Yatopia-Server-Fixes.patch
@@ -1151,7 +1151,7 @@ index be7a4b07540f6cc29c9ed76668bc1eaf9850013c..00000000000000000000000000000000
 -         if (this.eO()) {
 -             ++this.bz;
 diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-index 7b2c459adc489702137944602627e0fc54af26e8..6b4fad730cc43bf2c70e499adbf9bf28d8d111d7 100644
+index 66bfebe1c2a803bfed439f4d09f7ffa37fce78a8..1904d493c356f521bbae41ea1fe3a38ad252e744 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 @@ -19,17 +19,6 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -3173,7 +3173,7 @@ index 916603085d652444027e4513b77293ece84a6c4f..00000000000000000000000000000000
 -                 acceptsAll(asList("server-name"), "Name of the server")
 -                         .withRequiredArg()
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 6aa384765c6629bc80315368ba1990aec35ef52f..254afa94b1c215ff8c7ff0724503d4c9b2f60bb6 100644
+index de574ae92a8c055195c8919be4aec848489baa86..981327f6ff5f18bf5c0b56859370d867506f4417 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -682,8 +682,12 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0003-Brandings.patch b/patches/server/0003-Brandings.patch
index 6329cdef..16b23261 100644
--- a/patches/server/0003-Brandings.patch
+++ b/patches/server/0003-Brandings.patch
@@ -146,10 +146,10 @@ index 510e82002ed6ada5c2f4b14e01021068806a98e8..8bc7c1598807dc3c34355c347983047d
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index c1efe830dd0807d5f7bda10cb582556af6d23383..2b433f80abd9482291f3d722b2373f8e1f46cc70 100644
+index a9728c6c538822b8c751b5d08f5fcd14031dbc77..2be65ae6a04855986b4a8fad9b8dbdb5e2f0860d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -326,7 +326,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -327,7 +327,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {