From 6d0288b04186f945dcc7a902989fdbca306c99fc Mon Sep 17 00:00:00 2001
From: ishland <ishlandmc@yeah.net>
Date: Sat, 14 Nov 2020 15:21:42 +0800
Subject: [PATCH] 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:
4fb7f5d Updated Upstream (Paper)

Purpur Changes:
f513a2f Updated Upstream (Paper)
---
 Purpur                                                    | 2 +-
 Tuinity                                                   | 2 +-
 patches/server/0001-Yatopia-Server-Fixes.patch            | 2 +-
 patches/server/0071-Configurable-criterion-triggers.patch | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Purpur b/Purpur
index 4a95a552..f513a2f4 160000
--- a/Purpur
+++ b/Purpur
@@ -1 +1 @@
-Subproject commit 4a95a5522584edd5a7f68bb054000c99840805b2
+Subproject commit f513a2f49b6f9bfa72e74e8aa737bca7cdb87c41
diff --git a/Tuinity b/Tuinity
index adfab32e..4fb7f5d4 160000
--- a/Tuinity
+++ b/Tuinity
@@ -1 +1 @@
-Subproject commit adfab32e364ec0f6adfb3c2b4d989dcd43dc1bb5
+Subproject commit 4fb7f5d44a1eb0a8593405753a69400fdc00d5e2
diff --git a/patches/server/0001-Yatopia-Server-Fixes.patch b/patches/server/0001-Yatopia-Server-Fixes.patch
index e9556f13..e2d8069f 100644
--- a/patches/server/0001-Yatopia-Server-Fixes.patch
+++ b/patches/server/0001-Yatopia-Server-Fixes.patch
@@ -976,7 +976,7 @@ index 9f3608357280a269c655b00feed22ebc29922d52..00000000000000000000000000000000
 -         if (this.eO()) {
 -             ++this.bA;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 56677b8bf45af217c0a4a50fc7aea76ca012cbd7..5ba8313c196bf4ffed6c22e1461a8219fbe2f2d9 100644
+index 59d47a9f75450573b26b82b6f432af7bdc46a783..5a940fe2cbe81c89007fe768196cac3b37be8e8a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -919,7 +919,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/patches/server/0071-Configurable-criterion-triggers.patch b/patches/server/0071-Configurable-criterion-triggers.patch
index 4a3e3aa1..964bf90c 100644
--- a/patches/server/0071-Configurable-criterion-triggers.patch
+++ b/patches/server/0071-Configurable-criterion-triggers.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable criterion triggers
 This patch adds toggles for three criterion triggers that are called every tick. These can be very unnecessary, and especially in the case of CriterionTriggerEnterBlock, quite heavy.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5ba8313c196bf4ffed6c22e1461a8219fbe2f2d9..2d1e10ca339f1b2f66621123cb80f35e7b1d171c 100644
+index 5a940fe2cbe81c89007fe768196cac3b37be8e8a..ec36a398a0e6b12b2e2d81e05d45ea4d5abcc486 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -430,6 +430,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {