From 258ae0734acc0cee36a15e3eeb2e1aee77c67265 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 12 Dec 2020 18:54:25 -0600 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: 9c9583cd2 [Auto] Updated Upstream (Bukkit/CraftBukkit/Spigot) --- Paper | 2 +- current-paper | 2 +- patches/api/0001-Tuinity-API-Changes.patch | 4 +-- patches/api/0003-Purpur-config-files.patch | 4 +-- patches/api/0009-Bring-back-server-name.patch | 8 ++--- patches/api/0012-Lagging-threshold.patch | 8 ++--- .../server/0001-Tuinity-Server-Changes.patch | 34 +++++-------------- patches/server/0002-Rebrand.patch | 2 +- patches/server/0003-Purpur-config-files.patch | 10 +++--- .../server/0010-Bring-back-server-name.patch | 4 +-- patches/server/0013-Lagging-threshold.patch | 4 +-- ...0080-Add-5-second-tps-average-in-tps.patch | 4 +-- 12 files changed, 34 insertions(+), 52 deletions(-) diff --git a/Paper b/Paper index 31ac45a0a..9c9583cd2 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 31ac45a0a272c4c759fd4927172e5e81dd4a34ba +Subproject commit 9c9583cd2b6e369eab7b5c61c33282b6a1d5ce8a diff --git a/current-paper b/current-paper index a27dee55b..ace707dbf 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.4--b294b7890a3a5b0285fd69dd2695acc73c9a74d5 +1.16.4--cfa07cbe0585adc3e575cf7c520dc0c17936b9f4 diff --git a/patches/api/0001-Tuinity-API-Changes.patch b/patches/api/0001-Tuinity-API-Changes.patch index eb1bc1b1d..02f814992 100644 --- a/patches/api/0001-Tuinity-API-Changes.patch +++ b/patches/api/0001-Tuinity-API-Changes.patch @@ -37,10 +37,10 @@ index 1c33b1f4d2366116dd45478b8ad9cdb51fd6bb57..4516ba097e8afc3e422efc368311fa66 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 3e6331807f2c411cef3c2774a503f162685e8b46..7a51edbde474bf610cb5928de4b1bbe2edf34638 100644 +index 8e01e1bbb7cfd98b47dbdb3a0e132dafd1413de6..b45ad8df8b7a44c9e6d12326e5ea85e8d166a16c 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1475,6 +1475,14 @@ public interface Server extends PluginMessageRecipient { +@@ -1482,6 +1482,14 @@ public interface Server extends PluginMessageRecipient { } // Paper end diff --git a/patches/api/0003-Purpur-config-files.patch b/patches/api/0003-Purpur-config-files.patch index bc1051e97..257372bec 100644 --- a/patches/api/0003-Purpur-config-files.patch +++ b/patches/api/0003-Purpur-config-files.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 7a51edbde474bf610cb5928de4b1bbe2edf34638..49343ce93b1792c668cada267bc45601e91216f4 100644 +index b45ad8df8b7a44c9e6d12326e5ea85e8d166a16c..c69143ba156f6aa3cf3ffb9ee3f6d461867982c5 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1483,6 +1483,18 @@ public interface Server extends PluginMessageRecipient { +@@ -1490,6 +1490,18 @@ public interface Server extends PluginMessageRecipient { } // Tuinity end - add config to timings report diff --git a/patches/api/0009-Bring-back-server-name.patch b/patches/api/0009-Bring-back-server-name.patch index 71f96ab57..8fed27d72 100644 --- a/patches/api/0009-Bring-back-server-name.patch +++ b/patches/api/0009-Bring-back-server-name.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 464b2161f42a9a3969336820bc793274f4d6e942..55a0590cc2a045d341824a37425195927aa3626b 100644 +index fecd7b14d317f55eb1ce7b5c6af9913917971427..d070b420f4cb90610d7018a7fbbc88074268b02b 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1808,4 +1808,15 @@ public final class Bukkit { +@@ -1817,4 +1817,15 @@ public final class Bukkit { public static Server.Spigot spigot() { return server.spigot(); } @@ -25,10 +25,10 @@ index 464b2161f42a9a3969336820bc793274f4d6e942..55a0590cc2a045d341824a3742519592 + // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 49343ce93b1792c668cada267bc45601e91216f4..69c1cbdf7776de5f556acd07b6b3cfedecbc07e0 100644 +index c69143ba156f6aa3cf3ffb9ee3f6d461867982c5..dce7d8126c4a628270b09608e4561c419238b0f4 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1595,4 +1595,13 @@ public interface Server extends PluginMessageRecipient { +@@ -1602,4 +1602,13 @@ public interface Server extends PluginMessageRecipient { @NotNull com.destroystokyo.paper.entity.ai.MobGoals getMobGoals(); // Paper end diff --git a/patches/api/0012-Lagging-threshold.patch b/patches/api/0012-Lagging-threshold.patch index 5a7db6d4e..a0e4cefae 100644 --- a/patches/api/0012-Lagging-threshold.patch +++ b/patches/api/0012-Lagging-threshold.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 55a0590cc2a045d341824a37425195927aa3626b..39e00f922414504a4faa7a183d356d574567a43d 100644 +index d070b420f4cb90610d7018a7fbbc88074268b02b..ba8eb67291c9848b367419f4c8110161ac7fab0d 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1818,5 +1818,14 @@ public final class Bukkit { +@@ -1827,5 +1827,14 @@ public final class Bukkit { public static String getServerName() { return server.getServerName(); } @@ -24,10 +24,10 @@ index 55a0590cc2a045d341824a37425195927aa3626b..39e00f922414504a4faa7a183d356d57 // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 69c1cbdf7776de5f556acd07b6b3cfedecbc07e0..237b00389c98685cc316ce61c1e8318f78b4bca6 100644 +index dce7d8126c4a628270b09608e4561c419238b0f4..05b47c2462a00451fc64c79c3eda116fc8003a9f 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1603,5 +1603,12 @@ public interface Server extends PluginMessageRecipient { +@@ -1610,5 +1610,12 @@ public interface Server extends PluginMessageRecipient { */ @NotNull String getServerName(); diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index 42e43843c..f8b266ba7 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -6535,7 +6535,7 @@ index 2d887af902a33b0e28d8f0a6ac2e59c815a7856e..2291135eaef64c403183724cb6e413cd @Override public BlockPosition immutableCopy() { diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index dcbae1c4512cf267719934785ea60de8ae66052d..96bdb95800f337f49d5194fb8d3b32b808a978ca 100644 +index 9c078d30afef20bd1ea5975299c5513334829b19..e5169c5c7a71566c22c5b3c4686e56ee65816e53 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -91,6 +91,175 @@ public class Chunk implements IChunkAccess { @@ -6770,32 +6770,14 @@ index dcbae1c4512cf267719934785ea60de8ae66052d..96bdb95800f337f49d5194fb8d3b32b8 return; } if (entity instanceof EntityItem) { -@@ -873,6 +1048,7 @@ public class Chunk implements IChunkAccess { - } - - public void a(@Nullable Entity entity, AxisAlignedBB axisalignedbb, List list, @Nullable Predicate predicate) { -+ org.spigotmc.AsyncCatcher.catchOp("Chunk get entities call"); // Tuinity - int i = MathHelper.floor((axisalignedbb.minY - 2.0D) / 16.0D); - int j = MathHelper.floor((axisalignedbb.maxY + 2.0D) / 16.0D); - -@@ -912,6 +1088,7 @@ public class Chunk implements IChunkAccess { - } - - public void a(@Nullable EntityTypes entitytypes, AxisAlignedBB axisalignedbb, List list, Predicate predicate) { -+ org.spigotmc.AsyncCatcher.catchOp("Chunk get entities (by type) call"); // Tuinity - int i = MathHelper.floor((axisalignedbb.minY - 2.0D) / 16.0D); - int j = MathHelper.floor((axisalignedbb.maxY + 2.0D) / 16.0D); - -@@ -941,7 +1118,9 @@ public class Chunk implements IChunkAccess { +@@ -943,6 +1118,7 @@ public class Chunk implements IChunkAccess { } + public final void getEntities(Class oclass, AxisAlignedBB axisalignedbb, List list, @Nullable Predicate predicate) { this.a(oclass, axisalignedbb, list, predicate); } // Tuinity - OBFHELPER public void a(Class oclass, AxisAlignedBB axisalignedbb, List list, @Nullable Predicate predicate) { -+ org.spigotmc.AsyncCatcher.catchOp("Chunk get entities (by class) call"); // Tuinity + org.spigotmc.AsyncCatcher.catchOp("Chunk getEntities call"); // Spigot int i = MathHelper.floor((axisalignedbb.minY - 2.0D) / 16.0D); - int j = MathHelper.floor((axisalignedbb.maxY + 2.0D) / 16.0D); - diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java index 8eecdcde510661ec3a13a25a04ba394f6b6dc012..187a639347413a3aef1b6025926e2bf5936c11fd 100644 --- a/src/main/java/net/minecraft/server/ChunkCache.java @@ -14769,7 +14751,7 @@ index 7511e38130f38703164395a670f12d1af648ff04..e602efcb3fad390bb6bff1055e782bba } value.append("},"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0aa1da6cc13c15d3e222986e60dc42edbe5477de..89a654b472dac986de7852b39c3ca72458d43c2d 100644 +index dc7de2b59ec5ca3e5fba34dbb2aa2e6aed8f95cb..a383ba5e897101a3da1544c877148b43be7a6319 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper @@ -14781,7 +14763,7 @@ index 0aa1da6cc13c15d3e222986e60dc42edbe5477de..89a654b472dac986de7852b39c3ca724 private final String serverVersion; private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); -@@ -856,6 +856,7 @@ public final class CraftServer implements Server { +@@ -861,6 +861,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper @@ -14789,7 +14771,7 @@ index 0aa1da6cc13c15d3e222986e60dc42edbe5477de..89a654b472dac986de7852b39c3ca724 for (WorldServer world : console.getWorlds()) { world.worldDataServer.setDifficulty(config.difficulty); world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals); -@@ -890,6 +891,7 @@ public final class CraftServer implements Server { +@@ -895,6 +896,7 @@ public final class CraftServer implements Server { } world.spigotConfig.init(); // Spigot world.paperConfig.init(); // Paper @@ -14797,7 +14779,7 @@ index 0aa1da6cc13c15d3e222986e60dc42edbe5477de..89a654b472dac986de7852b39c3ca724 } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -1853,7 +1855,10 @@ public final class CraftServer implements Server { +@@ -1858,7 +1860,10 @@ public final class CraftServer implements Server { @Override public boolean isPrimaryThread() { @@ -14809,7 +14791,7 @@ index 0aa1da6cc13c15d3e222986e60dc42edbe5477de..89a654b472dac986de7852b39c3ca724 } @Override -@@ -2275,6 +2280,14 @@ public final class CraftServer implements Server { +@@ -2280,6 +2285,14 @@ public final class CraftServer implements Server { return com.destroystokyo.paper.PaperConfig.config; } diff --git a/patches/server/0002-Rebrand.patch b/patches/server/0002-Rebrand.patch index bcc133a75..3fdd4d779 100644 --- a/patches/server/0002-Rebrand.patch +++ b/patches/server/0002-Rebrand.patch @@ -245,7 +245,7 @@ index 0000000000000000000000000000000000000000..d8b408f061d96e2fa8e2e587462e2221 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 89a654b472dac986de7852b39c3ca72458d43c2d..991a79914805039ffe2572022b5f02628531f134 100644 +index a383ba5e897101a3da1544c877148b43be7a6319..92bfae8f8249e70105fd848f01f950b67bb1d97e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch index abfdb6acd..83572fba4 100644 --- a/patches/server/0003-Purpur-config-files.patch +++ b/patches/server/0003-Purpur-config-files.patch @@ -373,10 +373,10 @@ index 0000000000000000000000000000000000000000..4904be939c7a4b1d1583fd7b6232c930 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 991a79914805039ffe2572022b5f02628531f134..53ed0465a9f16dd82d77baec92683f287b4996ac 100644 +index 92bfae8f8249e70105fd848f01f950b67bb1d97e..7502726207073bdac6fc4166064575696f6a7270 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -857,6 +857,7 @@ public final class CraftServer implements Server { +@@ -862,6 +862,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper com.tuinity.tuinity.config.TuinityConfig.init((File) console.options.valueOf("tuinity-settings")); // Tuinity - Server Config @@ -384,7 +384,7 @@ index 991a79914805039ffe2572022b5f02628531f134..53ed0465a9f16dd82d77baec92683f28 for (WorldServer world : console.getWorlds()) { world.worldDataServer.setDifficulty(config.difficulty); world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals); -@@ -892,6 +893,7 @@ public final class CraftServer implements Server { +@@ -897,6 +898,7 @@ public final class CraftServer implements Server { world.spigotConfig.init(); // Spigot world.paperConfig.init(); // Paper world.tuinityConfig.init(); // Tuinity - Server Config @@ -392,7 +392,7 @@ index 991a79914805039ffe2572022b5f02628531f134..53ed0465a9f16dd82d77baec92683f28 } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -910,6 +912,7 @@ public final class CraftServer implements Server { +@@ -915,6 +917,7 @@ public final class CraftServer implements Server { reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper @@ -400,7 +400,7 @@ index 991a79914805039ffe2572022b5f02628531f134..53ed0465a9f16dd82d77baec92683f28 overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*"); ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2288,6 +2291,18 @@ public final class CraftServer implements Server { +@@ -2293,6 +2296,18 @@ public final class CraftServer implements Server { } // Tuinity end - add config to timings report diff --git a/patches/server/0010-Bring-back-server-name.patch b/patches/server/0010-Bring-back-server-name.patch index 2b5c95816..ebeb72a67 100644 --- a/patches/server/0010-Bring-back-server-name.patch +++ b/patches/server/0010-Bring-back-server-name.patch @@ -17,10 +17,10 @@ index 65961a03728852bd75367083a0de6fd0082b17cb..780474397acb4d0e7ecb4540e1a2db57 public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true); public final boolean pvp = this.getBoolean("pvp", true); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 53ed0465a9f16dd82d77baec92683f287b4996ac..2df140c9bb42e7dc7cb29de40dd8dd3988b7a9ef 100644 +index 7502726207073bdac6fc4166064575696f6a7270..c2ac3c69e75de35e38aa262f0634f58005fd3daf 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2440,4 +2440,11 @@ public final class CraftServer implements Server { +@@ -2445,4 +2445,11 @@ public final class CraftServer implements Server { return mobGoals; } // Paper end diff --git a/patches/server/0013-Lagging-threshold.patch b/patches/server/0013-Lagging-threshold.patch index c96af5650..8d4996a94 100644 --- a/patches/server/0013-Lagging-threshold.patch +++ b/patches/server/0013-Lagging-threshold.patch @@ -41,10 +41,10 @@ index 8b57cff58c1c87e3494d63d7a08487b3b5450836..0f39db0d35fae1d2c1b0dffc9aab715a public static boolean enderChestSixRows = false; public static boolean enderChestPermissionRows = false; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2df140c9bb42e7dc7cb29de40dd8dd3988b7a9ef..4acc9ca619877fe244e16a6086b81a12950b33e5 100644 +index c2ac3c69e75de35e38aa262f0634f58005fd3daf..d61f103c1909a82615e49f63b0bdf92e718764ac 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2446,5 +2446,10 @@ public final class CraftServer implements Server { +@@ -2451,5 +2451,10 @@ public final class CraftServer implements Server { public String getServerName() { return getProperties().serverName; } diff --git a/patches/server/0080-Add-5-second-tps-average-in-tps.patch b/patches/server/0080-Add-5-second-tps-average-in-tps.patch index cbc05c4e8..8c485bb8e 100644 --- a/patches/server/0080-Add-5-second-tps-average-in-tps.patch +++ b/patches/server/0080-Add-5-second-tps-average-in-tps.patch @@ -47,10 +47,10 @@ index 2d01bc9c5f95e7bd950a8c9137d1a1ab74a6cb72..dd1e083289b875f1b87ae2aa6179c7ba lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur tickSection = curTime; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4acc9ca619877fe244e16a6086b81a12950b33e5..3dec164f6485870a6dacf76391be1f0c7fa6fef4 100644 +index d61f103c1909a82615e49f63b0bdf92e718764ac..b3bc2d908a028fe182f4be2ed4d2bb6a1e9ec5cb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2238,6 +2238,7 @@ public final class CraftServer implements Server { +@@ -2243,6 +2243,7 @@ public final class CraftServer implements Server { @Override public double[] getTPS() { return new double[] {