From 1e07d212323064bfb974fa37cf4b8e6bb281f5f7 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Sun, 24 May 2020 13:44:25 +0200 Subject: [PATCH] Update upstream --- Tuinity | 2 +- patches/server/0001-Modify-POM.patch | 8 ++++---- patches/server/0002-Brandings.patch | 8 ++++---- patches/server/0004-EMC-PlayerUseItem-Event.patch | 12 ++++++------ patches/server/0011-EMC-Disable-Snooper.patch | 6 +++--- patches/server/0017-EMC-Accept-the-EULA.patch | 6 +++--- patches/server/0035-Add-getLastTickMs-api.patch | 10 +++++----- .../server/0037-Kill-the-vanilla-GameProfiler.patch | 6 +++--- .../0041-Add-option-for-pushable-TileEntities.patch | 6 +++--- .../server/0042-Add-NBT-API-as-first-class-lib.patch | 6 +++--- patches/server/0043-Player-saving-async-FileIO.patch | 8 ++++---- .../server/0050-Purpur-Add-more-timings-timers.patch | 6 +++--- 12 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Tuinity b/Tuinity index 6eb873ca..121cca1e 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit 6eb873cadacf046e8d542b24426e5297f08fa878 +Subproject commit 121cca1e2fc2e47a6475f1c0a7a1397236701f16 diff --git a/patches/server/0001-Modify-POM.patch b/patches/server/0001-Modify-POM.patch index 98308a0b..8d3bd3ca 100644 --- a/patches/server/0001-Modify-POM.patch +++ b/patches/server/0001-Modify-POM.patch @@ -1,4 +1,4 @@ -From a3282d8ebfd6a10c6ccb8ed3f5c42a8e09b78fa6 Mon Sep 17 00:00:00 2001 +From 12c6f0850f54b35a108041a4be02a26df06d5a82 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 17:08:07 +0100 Subject: [PATCH] Modify POM @@ -8,7 +8,7 @@ Subject: [PATCH] Modify POM 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml -index d8c0790f30..b9ca31f0fb 100644 +index ba3d10a1b7..f2cc703fe6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,12 @@ @@ -48,7 +48,7 @@ index d8c0790f30..b9ca31f0fb 100644 ${project.version} compile -@@ -143,6 +144,10 @@ +@@ -148,6 +149,10 @@ Please see https://www.spigotmc.org/go/maven for more information. --> @@ -59,7 +59,7 @@ index d8c0790f30..b9ca31f0fb 100644 spigotmc-public https://hub.spigotmc.org/nexus/content/groups/public/ -@@ -158,15 +163,15 @@ +@@ -163,15 +168,15 @@ diff --git a/patches/server/0002-Brandings.patch b/patches/server/0002-Brandings.patch index 27b94ee3..8ea1ca16 100644 --- a/patches/server/0002-Brandings.patch +++ b/patches/server/0002-Brandings.patch @@ -1,4 +1,4 @@ -From 66972e785671f061e8d110f39a9bf9d0abf3fdf1 Mon Sep 17 00:00:00 2001 +From 07849069eed17d58d7c61ecfa2e3bba7d0555111 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 ecca604030..569ba87cee 100644 +index 85cc5914e1..32468041ea 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1617,7 +1617,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 22 Dec 2012 00:35:15 -0500 Subject: [PATCH] EMC PlayerUseItem Event @@ -23,10 +23,10 @@ index 3fc2360a10..5ad0aacf01 100644 this.setSlot(EnumItemSlot.MAINHAND, itemstack); } else { diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 9fb008f64d..54ce069e50 100644 +index 272c1f0eaf..76a8d94229 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java -@@ -426,6 +426,15 @@ public class PlayerInteractManager { +@@ -432,6 +432,15 @@ public class PlayerInteractManager { } public EnumInteractionResult a(EntityHuman entityhuman, World world, ItemStack itemstack, EnumHand enumhand) { @@ -42,7 +42,7 @@ index 9fb008f64d..54ce069e50 100644 if (this.gamemode == EnumGamemode.SPECTATOR) { return EnumInteractionResult.PASS; } else if (entityhuman.getCooldownTracker().hasCooldown(itemstack.getItem())) { -@@ -433,27 +442,53 @@ public class PlayerInteractManager { +@@ -439,27 +448,53 @@ public class PlayerInteractManager { } else { int i = itemstack.getCount(); int j = itemstack.getDamage(); @@ -102,7 +102,7 @@ index 9fb008f64d..54ce069e50 100644 ((EntityPlayer) entityhuman).updateInventory(entityhuman.defaultContainer); } -@@ -467,6 +502,7 @@ public class PlayerInteractManager { +@@ -473,6 +508,7 @@ public class PlayerInteractManager { public boolean firedInteract = false; public EnumInteractionResult a(EntityHuman entityhuman, World world, ItemStack itemstack, EnumHand enumhand, MovingObjectPositionBlock movingobjectpositionblock) { BlockPosition blockposition = movingobjectpositionblock.getBlockPosition(); @@ -110,7 +110,7 @@ index 9fb008f64d..54ce069e50 100644 IBlockData iblockdata = world.getType(blockposition); EnumInteractionResult enuminteractionresult = EnumInteractionResult.PASS; boolean cancelledBlock = false; -@@ -534,17 +570,45 @@ public class PlayerInteractManager { +@@ -540,17 +576,45 @@ public class PlayerInteractManager { } if (!itemstack.isEmpty() && enuminteractionresult != EnumInteractionResult.SUCCESS && !interactResult) { // add !interactResult SPIGOT-764 diff --git a/patches/server/0011-EMC-Disable-Snooper.patch b/patches/server/0011-EMC-Disable-Snooper.patch index e07c6e02..bf408413 100644 --- a/patches/server/0011-EMC-Disable-Snooper.patch +++ b/patches/server/0011-EMC-Disable-Snooper.patch @@ -1,4 +1,4 @@ -From c6cf67c185e236bd9e3fe3d6204c42a1b40be23e Mon Sep 17 00:00:00 2001 +From dd8d9f054298ee190dbf501086ed38219a9a1701 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 569ba87cee..2335f13c55 100644 +index 32468041ea..04aa83f0c6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1267,11 +1267,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 2335f13c55..049860a211 100644 +index 04aa83f0c6..e361f4a7f1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1476,6 +1476,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 5 Mar 2020 21:13:33 +0100 Subject: [PATCH] Add getLastTickMs() api @@ -10,10 +10,10 @@ 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 049860a211..3daa46271b 100644 +index e361f4a7f1..01fb435f26 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 3daa46271b..fb21fba051 100644 +index 01fb435f26..43bec703f0 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 Date: Sun, 29 Mar 2020 01:59:27 +0100 Subject: [PATCH] Add option for pushable TileEntities @@ -669,10 +669,10 @@ index 0000000000..b32f231981 +} \ 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 82a623d63d..0e1ab3fdff 100644 +index d620f8e920..ae823c2c9a 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -384,6 +384,13 @@ public class WorldServer extends World { +@@ -390,6 +390,13 @@ public class WorldServer extends World { if (type instanceof ITileEntity) { TileEntity replacement = ((ITileEntity) type).createTile(this); diff --git a/patches/server/0042-Add-NBT-API-as-first-class-lib.patch b/patches/server/0042-Add-NBT-API-as-first-class-lib.patch index cc4c9026..60540a4a 100644 --- a/patches/server/0042-Add-NBT-API-as-first-class-lib.patch +++ b/patches/server/0042-Add-NBT-API-as-first-class-lib.patch @@ -1,4 +1,4 @@ -From 6ad7b7497e3c376674145ed58f375ba082a18708 Mon Sep 17 00:00:00 2001 +From ef033a81b8d3d245c710b948b1f2243eb8db8c82 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 2 Apr 2020 18:49:38 +0200 Subject: [PATCH] Add NBT-API as first-class lib @@ -8,10 +8,10 @@ Subject: [PATCH] Add NBT-API as first-class lib 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml -index b9ca31f0fb..c76bae0ca0 100644 +index f2cc703fe6..8893d9626e 100644 --- a/pom.xml +++ b/pom.xml -@@ -293,6 +293,10 @@ +@@ -305,6 +305,10 @@ net.minecraft.server net.minecraft.server.v${minecraft_version} diff --git a/patches/server/0043-Player-saving-async-FileIO.patch b/patches/server/0043-Player-saving-async-FileIO.patch index f8c83dd7..41d7eecf 100644 --- a/patches/server/0043-Player-saving-async-FileIO.patch +++ b/patches/server/0043-Player-saving-async-FileIO.patch @@ -1,4 +1,4 @@ -From bb740c4b93bccde23565a0097224cba6f65bc052 Mon Sep 17 00:00:00 2001 +From c153e75244501d62f7a6e871dc4c2db8e39d9ee0 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Sat, 4 Apr 2020 23:23:04 +0200 Subject: [PATCH] Player saving async FileIO @@ -183,7 +183,7 @@ index c1e8ff6ab3..db4f628830 100644 nbttagcompound.set("ShoulderEntityLeft", this.getShoulderEntityLeft()); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 9b726de6da..a06340d0b3 100644 +index 269580ae2a..b2af3be151 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -16,6 +16,8 @@ import java.util.Map; @@ -195,7 +195,7 @@ index 9b726de6da..a06340d0b3 100644 import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@@ -1187,6 +1189,28 @@ public abstract class PlayerList { +@@ -1203,6 +1205,28 @@ public abstract class PlayerList { if (team != null) scoreboard.removeTeam(team); } // Paper end @@ -224,7 +224,7 @@ index 9b726de6da..a06340d0b3 100644 } // Paper end -@@ -1226,13 +1250,13 @@ public abstract class PlayerList { +@@ -1242,13 +1266,13 @@ public abstract class PlayerList { File file = new File(this.server.getWorldServer(DimensionManager.OVERWORLD).getDataManager().getDirectory(), "stats"); File file1 = new File(file, uuid + ".json"); diff --git a/patches/server/0050-Purpur-Add-more-timings-timers.patch b/patches/server/0050-Purpur-Add-more-timings-timers.patch index 3f68a277..0da2f56d 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 198fff335f9fcf828187388cd74198a03a49f46a Mon Sep 17 00:00:00 2001 +From d95050df2dd50d305522f68fb5652f125e4b1245 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Tue, 21 Apr 2020 15:49:52 +0200 Subject: [PATCH] Purpur Add more timings timers @@ -200,10 +200,10 @@ index a68fc11ec6..95dde66531 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 0e1ab3fdff..80c097de77 100644 +index ae823c2c9a..dcd689e1e6 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -980,7 +980,9 @@ public class WorldServer extends World { +@@ -986,7 +986,9 @@ public class WorldServer extends World { return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString(); }); gameprofilerfiller.c("tickPassenger");