From ca7aabbb2f7a1cdba69097f81ff86e1bbad1cd13 Mon Sep 17 00:00:00 2001
From: Ivan Pekov <ivan@mrivanplays.com>
Date: Tue, 10 Nov 2020 13:26:44 +0200
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:
ee5df4c Updated Upstream (Paper)

Purpur Changes:
a295636 Updated Upstream (Paper)
ec6e3b3 Updated Upstream (Paper)
---
 Purpur                                           | 2 +-
 Tuinity                                          | 2 +-
 patches/server/0011-Modify-default-configs.patch | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Purpur b/Purpur
index 1eaac716..a295636d 160000
--- a/Purpur
+++ b/Purpur
@@ -1 +1 @@
-Subproject commit 1eaac716d263fa68cd84bc115166f3b7b6b8cb69
+Subproject commit a295636d230d1f34d2f43b429540bcd0b144e547
diff --git a/Tuinity b/Tuinity
index f559558e..ee5df4c7 160000
--- a/Tuinity
+++ b/Tuinity
@@ -1 +1 @@
-Subproject commit f559558e25dd98e073a8d22ec567c23e82e6fce2
+Subproject commit ee5df4c7d489324d84fcdbf89eeac60cad12c9d6
diff --git a/patches/server/0011-Modify-default-configs.patch b/patches/server/0011-Modify-default-configs.patch
index 0e06984d..05b7fd92 100644
--- a/patches/server/0011-Modify-default-configs.patch
+++ b/patches/server/0011-Modify-default-configs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Modify default configs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c4633989c7747f3429c9c13a36613f81971a6b50..41d1e0f84c9ee35b3418100342c2fdaaf2b77498 100644
+index 6ab0a51b421dc696aec292f2db955311c9cc31e3..82591dcebdbf34649728b60b22d8f78a70cd23a0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -201,7 +201,7 @@ public class PaperConfig {
@@ -18,7 +18,7 @@ index c4633989c7747f3429c9c13a36613f81971a6b50..41d1e0f84c9ee35b3418100342c2fdaa
          TimingsManager.privacy = getBoolean("timings.server-name-privacy", false);
          TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses"));
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 26287b3e4007c02b9d78d60453fa16d3cfaae638..b32002c1aa40648fb4732a368f8ff0f345fcda9b 100644
+index 4aacf8a5b2e98b0f8c1e27569ff7591fee32c725..f64da7db530aeeadac06a09f514c5fbf70f20683 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -591,7 +591,7 @@ public class PaperWorldConfig {