From 00747a519d25706c3362fb39b4fd3ac2b31f9ccc Mon Sep 17 00:00:00 2001 From: tr7zw Date: Sun, 10 May 2020 16:03:44 +0200 Subject: [PATCH] Update Upstream --- Tuinity | 2 +- patches/server/0002-Brandings.patch | 10 +++++----- patches/server/0008-EMC-MovedTooQuickly-event.patch | 6 +++--- patches/server/0011-EMC-Disable-Snooper.patch | 6 +++--- patches/server/0017-EMC-Accept-the-EULA.patch | 6 +++--- patches/server/0022-EMC-ServerReloadEvent.patch | 6 +++--- patches/server/0038-Add-getLastTickMs-api.patch | 12 ++++++------ .../server/0040-Kill-the-vanilla-GameProfiler.patch | 6 +++--- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Tuinity b/Tuinity index 3591effa..3c538c5a 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit 3591effade8ce818ec09ba2caef0fc9eca9e8728 +Subproject commit 3c538c5a9b865be6d123a14e9a39718d3b4e5a0c diff --git a/patches/server/0002-Brandings.patch b/patches/server/0002-Brandings.patch index 2f5d5414..d0bbb70d 100644 --- a/patches/server/0002-Brandings.patch +++ b/patches/server/0002-Brandings.patch @@ -1,4 +1,4 @@ -From 5a4b45d22b066e2d3709d3eaa53de1a812f41334 Mon Sep 17 00:00:00 2001 +From 82a7a72b210e82f166cfbcc8b5f09842eba657f3 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 18:37:34 +0100 Subject: [PATCH] Brandings @@ -53,10 +53,10 @@ index 0000000000..b7a73408ea +} \ 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 f379121b2d..6dd3992674 100644 +index 1bf73ca92f..b228f4ca47 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1601,7 +1601,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 28 Sep 2013 22:01:47 -0400 Subject: [PATCH] EMC MovedTooQuickly event @@ -9,10 +9,10 @@ also make creative immune to this event 1 file changed, 2 insertions(+) diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index e53c629d34..8ac03749f2 100644 +index fa324898f8..1bab7c7641 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1028,9 +1028,11 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1026,9 +1026,11 @@ public class PlayerConnection implements PacketListenerPlayIn { if (d11 - d10 > Math.max(f2, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && !this.isExemptPlayer()) { // CraftBukkit end diff --git a/patches/server/0011-EMC-Disable-Snooper.patch b/patches/server/0011-EMC-Disable-Snooper.patch index 07f0ce9e..787b59ab 100644 --- a/patches/server/0011-EMC-Disable-Snooper.patch +++ b/patches/server/0011-EMC-Disable-Snooper.patch @@ -1,4 +1,4 @@ -From 6f505028e051515133561088fd09851b1a3656a4 Mon Sep 17 00:00:00 2001 +From 6708fc20e79dea2392eeea8d3cfab254cba741a9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 10 Jan 2014 22:05:59 -0500 Subject: [PATCH] EMC Disable Snooper @@ -9,10 +9,10 @@ What purpose does it provide... 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6dd3992674..a7adcb9f09 100644 +index b228f4ca47..e1de3f7257 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1251,11 +1251,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 5 Sep 2014 23:04:54 -0400 Subject: [PATCH] EMC Accept the EULA @@ -9,10 +9,10 @@ Starlis LLC, the owner of Empire Minecraft, accepts the Minecraft EULA with this 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a7adcb9f09..6e9ff069e3 100644 +index e1de3f7257..b1360c1b2c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1460,6 +1460,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 25 Jun 2015 21:00:09 -0400 Subject: [PATCH] EMC ServerReloadEvent @@ -8,10 +8,10 @@ Subject: [PATCH] EMC ServerReloadEvent 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index df8bb734ae..35d0b9c4b8 100644 +index 186986ee61..0d98264bda 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -779,6 +779,7 @@ public final class CraftServer implements Server { +@@ -780,6 +780,7 @@ public final class CraftServer implements Server { @Override public void reload() { org.spigotmc.WatchdogThread.hasStarted = false; // Paper - Disable watchdog early timeout on reload diff --git a/patches/server/0038-Add-getLastTickMs-api.patch b/patches/server/0038-Add-getLastTickMs-api.patch index 34a8c397..94dd2f29 100644 --- a/patches/server/0038-Add-getLastTickMs-api.patch +++ b/patches/server/0038-Add-getLastTickMs-api.patch @@ -1,4 +1,4 @@ -From d7e946139230a8c4f15891dd08a01d486ea9e0bd Mon Sep 17 00:00:00 2001 +From 1523e20cc6f7f2f0230303851e2d5a364504e118 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, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1be982dcd5..136602ac31 100644 +index b9c9bf0387..0aca5993ec 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -893,6 +893,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 5 Mar 2020 23:08:01 +0100 Subject: [PATCH] Kill the vanilla "GameProfiler" @@ -67,7 +67,7 @@ index 0000000000..96a2270a81 + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 136602ac31..5305799002 100644 +index 0aca5993ec..5bcc38fd02 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -80,7 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant