diff --git a/Tuinity b/Tuinity index 699f5f2f..489faf00 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit 699f5f2fb02e78493f44499a6b6f91c8d2406922 +Subproject commit 489faf00462e476cb51a625a6b63fa418d7b7777 diff --git a/patches/server/0002-Brandings.patch b/patches/server/0002-Brandings.patch index 64d752df..598e977e 100644 --- a/patches/server/0002-Brandings.patch +++ b/patches/server/0002-Brandings.patch @@ -70,10 +70,10 @@ index d434bd93bc26840129274f45a303fe2c1a44f132..8fc533009f417c1f18e7d118ac2ca1b8 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 f1e60981abc46807f8004f0ac49127a2bb83fc42..936d97530f546c9467fbf6b3dcde3df270e2422e 100644 +index 90c1067ca23e566a96d71e06c273d44397928b64..b10401598601e422d7d6835cc10fd4807bc24e49 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -323,7 +323,7 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -326,7 +326,7 @@ public final class CraftMagicNumbers implements UnsafeValues { @Override public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { diff --git a/patches/server/0014-Purpur-Add-more-timings-timers.patch b/patches/server/0014-Purpur-Add-more-timings-timers.patch index 403759c5..647322c2 100644 --- a/patches/server/0014-Purpur-Add-more-timings-timers.patch +++ b/patches/server/0014-Purpur-Add-more-timings-timers.patch @@ -196,10 +196,10 @@ index d3f0327a2a7cdedf3fe8d10df981a9f1cb378d26..cce7cac92b3256576fb35d5d03719b15 public final Stream getExecutingGoals() { return d(); } // Paper - OBFHELPER diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 8388629f573ff8ac4aea0b8fe6b041e293f70a2d..90b159db4e36d67e742dcfc92dbb56af7f9f9acb 100644 +index 2bee2dab9f19899c491bd381063b9185adcb5b2e..1a3972a786dc9fb131e88adf00bd1b345bda06ef 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1337,7 +1337,9 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1339,7 +1339,9 @@ public class WorldServer extends World implements GeneratorAccessSeed { return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString(); }); gameprofilerfiller.c("tickPassenger"); diff --git a/patches/server/0015-Modify-default-configs.patch b/patches/server/0015-Modify-default-configs.patch index 5262e423..246dcb10 100644 --- a/patches/server/0015-Modify-default-configs.patch +++ b/patches/server/0015-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 741c06a27e664211a7023a6369f8e69cbb41a321..f48fb8c3e637d0a7259bc92e5fb090c346750e47 100644 +index 56e4359ba32339e1bef58061585ff3e12e4215f3..8b607a76ab5cb6beadff3dc5e6832a394982063e 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 { diff --git a/patches/server/0028-Global-Eula-file.patch b/patches/server/0028-Global-Eula-file.patch index 18435548..9eafa900 100644 --- a/patches/server/0028-Global-Eula-file.patch +++ b/patches/server/0028-Global-Eula-file.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Sat, 25 Jul 2020 17:16:18 +0200 -Subject: [PATCH] Global Eula file +Subject: [PATCH] Global Eula file diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java