From 92a69a93657798ccc4f8deb7c19049a34366cff9 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Sat, 6 Jun 2020 19:33:30 +0200
Subject: [PATCH] Update Upstream
---
Tuinity | 2 +-
patches/server/0002-Brandings.patch | 10 +++++-----
.../0041-Add-option-for-pushable-TileEntities.patch | 6 +++---
.../server/0050-Purpur-Add-more-timings-timers.patch | 8 ++++----
patches/server/0058-lithium-MixinBiome.patch | 8 ++++----
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/Tuinity b/Tuinity
index d8b8905f..32ac48d8 160000
--- a/Tuinity
+++ b/Tuinity
@@ -1 +1 @@
-Subproject commit d8b8905f9829b9386bd291f9e5ad48bdece9dded
+Subproject commit 32ac48d8b2577bb9ba33ed78ac277700b8049846
diff --git a/patches/server/0002-Brandings.patch b/patches/server/0002-Brandings.patch
index 88101cb9..72681091 100644
--- a/patches/server/0002-Brandings.patch
+++ b/patches/server/0002-Brandings.patch
@@ -1,4 +1,4 @@
-From 13f89b74b1436e976886022660635024de615d9f Mon Sep 17 00:00:00 2001
+From b6acd3d10cde8bc00e11f486c433daa36bad69b8 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Wed, 26 Feb 2020 18:37:34 +0100
Subject: [PATCH] Brandings
@@ -53,10 +53,10 @@ index 000000000..b7a73408e
+}
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a2ab9d5d4..e3f0a3e78 100644
+index 533caec8c..6ef81f2ff 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1624,7 +1624,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1626,7 +1626,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {
@@ -79,10 +79,10 @@ index 0f97cf2b4..b281f05c4 100644
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 b58f2ef5c..c66a63a8f 100644
+index 004b6ce13..d68251d70 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -306,7 +306,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -312,7 +312,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
diff --git a/patches/server/0041-Add-option-for-pushable-TileEntities.patch b/patches/server/0041-Add-option-for-pushable-TileEntities.patch
index 76b29a5e..075493b4 100644
--- a/patches/server/0041-Add-option-for-pushable-TileEntities.patch
+++ b/patches/server/0041-Add-option-for-pushable-TileEntities.patch
@@ -1,4 +1,4 @@
-From af9085217948103cff26160050ed7921cf82e33f Mon Sep 17 00:00:00 2001
+From 2bf37c8c22d78962b83dc0b6e2976d366b15cf91 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Sun, 29 Mar 2020 01:59:27 +0100
Subject: [PATCH] Add option for pushable TileEntities
@@ -669,10 +669,10 @@ index 000000000..b32f23198
+}
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 30adf5295..6998ffe76 100644
+index 9338e090c..7f1faba2a 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -714,6 +714,13 @@ public class WorldServer extends World {
+@@ -711,6 +711,13 @@ public class WorldServer extends World {
if (type instanceof ITileEntity) {
TileEntity replacement = ((ITileEntity) type).createTile(this);
diff --git a/patches/server/0050-Purpur-Add-more-timings-timers.patch b/patches/server/0050-Purpur-Add-more-timings-timers.patch
index 7e25d3ee..b2af7ca4 100644
--- a/patches/server/0050-Purpur-Add-more-timings-timers.patch
+++ b/patches/server/0050-Purpur-Add-more-timings-timers.patch
@@ -1,4 +1,4 @@
-From 6648efbcbfca05c1806c2a031b493e7fd1a26493 Mon Sep 17 00:00:00 2001
+From 710ef3d3ebe847d4e1015d4c9c5f561c4c6b2746 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Tue, 21 Apr 2020 15:49:52 +0200
Subject: [PATCH] Purpur Add more timings timers
@@ -12,7 +12,7 @@ Subject: [PATCH] Purpur Add more timings timers
5 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
-index fdb135fa3..00423cc3a 100644
+index abf4b221c..037da236c 100644
--- a/src/main/java/co/aikar/timings/MinecraftTimings.java
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
@@ -45,6 +45,28 @@ public final class MinecraftTimings {
@@ -200,10 +200,10 @@ index a68fc11ec..95dde6653 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 6998ffe76..c3a9464ca 100644
+index 7f1faba2a..3d4080e32 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1310,7 +1310,9 @@ public class WorldServer extends World {
+@@ -1307,7 +1307,9 @@ public class WorldServer extends World {
return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString();
});
gameprofilerfiller.c("tickPassenger");
diff --git a/patches/server/0058-lithium-MixinBiome.patch b/patches/server/0058-lithium-MixinBiome.patch
index e8ed4374..f1968944 100644
--- a/patches/server/0058-lithium-MixinBiome.patch
+++ b/patches/server/0058-lithium-MixinBiome.patch
@@ -1,4 +1,4 @@
-From cdd5815dc7ea0f29cae45cb0615049b7fc08a8ab Mon Sep 17 00:00:00 2001
+From 711fc967058b9944b020a43c664ee9911a855539 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Tue, 12 May 2020 00:38:31 +0200
Subject: [PATCH] lithium MixinBiome
@@ -11,7 +11,7 @@ Subject: [PATCH] lithium MixinBiome
diff --git a/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedList.java b/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedList.java
new file mode 100644
-index 0000000000..a2e3e96e1e
+index 000000000..a2e3e96e1
--- /dev/null
+++ b/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedList.java
@@ -0,0 +1,168 @@
@@ -185,7 +185,7 @@ index 0000000000..a2e3e96e1e
+}
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index 0102a170dc..5d08bb50f7 100644
+index ef6c85557..49ca5f8cc 100644
--- a/src/main/java/net/minecraft/server/BiomeBase.java
+++ b/src/main/java/net/minecraft/server/BiomeBase.java
@@ -4,6 +4,8 @@ import com.google.common.collect.Lists;
@@ -197,7 +197,7 @@ index 0102a170dc..5d08bb50f7 100644
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-@@ -92,7 +94,7 @@ public abstract class BiomeBase {
+@@ -104,7 +106,7 @@ public abstract class BiomeBase {
for (j = 0; j < i; ++j) {
EnumCreatureType enumcreaturetype = aenumcreaturetype[j];