From 204b0808df17659d61dfdc20a01708f2b65f7b49 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 2 Jul 2020 22:37:50 +0200 Subject: [PATCH] Updated Upstream (Tuinity) Upstream has released updates that appears to apply and compile correctly Tuinity Changes: bdbb111 Updated Upstream (Paper) ef0a6c4 Optimise collision checking in player move packets --- Tuinity | 2 +- fetchUpstream.sh | 2 ++ patches/server/0002-Brandings.patch | 6 +++--- patches/server/0003-Don-t-save-Fireworks-and-Arrows.patch | 6 +++--- patches/server/0005-Add-getLastTickMs-api.patch | 8 ++++---- ...0006-Add-config-yapfa-command-and-basic-settings.patch | 8 ++++---- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Tuinity b/Tuinity index 4d6f26b0..bdbb111a 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit 4d6f26b057c2451164b961bba0b2e0eb81729b8f +Subproject commit bdbb111a35882f1767bae8d8b24930fd481c54fa diff --git a/fetchUpstream.sh b/fetchUpstream.sh index 1488d3f9..3a7e3213 100644 --- a/fetchUpstream.sh +++ b/fetchUpstream.sh @@ -1,4 +1,6 @@ cd Tuinity +git clean -fx +git clean -fd git fetch git reset --hard origin/ver/1.16 git submodule update --init --recursive -f diff --git a/patches/server/0002-Brandings.patch b/patches/server/0002-Brandings.patch index 9684cd7b..36a47b95 100644 --- a/patches/server/0002-Brandings.patch +++ b/patches/server/0002-Brandings.patch @@ -1,4 +1,4 @@ -From 6c6a44282d87ee73246a8e26b3132fe869daf684 Mon Sep 17 00:00:00 2001 +From 61f96970034aa6ba01b9fbc70ad9651cf0fe0fdd Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 18:37:34 +0100 Subject: [PATCH] Brandings @@ -66,10 +66,10 @@ index eb71fa6e39..6949761d8b 100644 public CrashReport b(CrashReport crashreport) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index cebcb845b5..11fbd116b7 100644 +index 2d042e0581..d33b57a5c7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -229,7 +229,7 @@ import javax.annotation.Nullable; // Paper +@@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper import javax.annotation.Nonnull; // Paper public final class CraftServer implements Server { diff --git a/patches/server/0003-Don-t-save-Fireworks-and-Arrows.patch b/patches/server/0003-Don-t-save-Fireworks-and-Arrows.patch index 93446153..25eced78 100644 --- a/patches/server/0003-Don-t-save-Fireworks-and-Arrows.patch +++ b/patches/server/0003-Don-t-save-Fireworks-and-Arrows.patch @@ -1,4 +1,4 @@ -From ad1958aac77ac13abf4be47aafc7e07aabbf0c96 Mon Sep 17 00:00:00 2001 +From e94583e48c0633681292a7f9eff241a52dbfbf50 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 21:39:58 +0100 Subject: [PATCH] Don't save Fireworks and Arrows @@ -8,10 +8,10 @@ Subject: [PATCH] Don't save Fireworks and Arrows 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 8b1957e81e..ce5048d21d 100644 +index 818afb4f49..9364f40c9b 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1722,7 +1722,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -1711,7 +1711,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke } public boolean a_(NBTTagCompound nbttagcompound) { diff --git a/patches/server/0005-Add-getLastTickMs-api.patch b/patches/server/0005-Add-getLastTickMs-api.patch index 5fb06aba..82fab6c9 100644 --- a/patches/server/0005-Add-getLastTickMs-api.patch +++ b/patches/server/0005-Add-getLastTickMs-api.patch @@ -1,4 +1,4 @@ -From dd873e44d15d7ed73b6c6767299784c0e42e46e0 Mon Sep 17 00:00:00 2001 +From 3dd24c60dd437f8c89046d2755a885b25fcc546a Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 5 Mar 2020 21:13:33 +0100 Subject: [PATCH] Add getLastTickMs() api @@ -10,7 +10,7 @@ Subject: [PATCH] Add getLastTickMs() api 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 56e41760fd..90a793e8dc 100644 +index 6949761d8b..ca166e498c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -933,6 +933,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 5 Mar 2020 22:31:50 +0100 Subject: [PATCH] Add config, yapfa command and basic settings @@ -366,7 +366,7 @@ index 0000000000..35ac0206c9 +} \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 34beb503f4..86a8d1fa34 100644 +index 578f7809cb..d697ccc427 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -7,6 +7,7 @@ import com.mojang.authlib.GameProfileRepository; @@ -394,10 +394,10 @@ index 34beb503f4..86a8d1fa34 100644 this.setPVP(dedicatedserverproperties.pvp); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ce5048d21d..06634718a3 100644 +index 9364f40c9b..a588a4798f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1040,7 +1040,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -1029,7 +1029,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this); VoxelShape voxelshape = this.world.getWorldBorder().c(); Stream stream = !this.world.getWorldBorder().isInBounds(axisalignedbb) ? Stream.empty() : Stream.of(voxelshape); // Paper