From d4301d4a64847788e7d936fecd4dcf31f57ea330 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 14 Sep 2020 13:19:01 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: 613bdc3f [Auto] Updated Upstream (Bukkit/CraftBukkit) --- Paper | 2 +- current-paper | 2 +- patches/server/0001-Tuinity-Server-Changes.patch | 12 ++++++------ patches/server/0002-Rebrand.patch | 8 ++++---- patches/server/0003-Purpur-config-files.patch | 10 +++++----- patches/server/0010-Bring-back-server-name.patch | 4 ++-- patches/server/0013-Lagging-threshold.patch | 6 +++--- .../0084-Add-5-second-tps-average-in-tps.patch | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Paper b/Paper index d35903e6f..613bdc3f9 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit d35903e6fa3ec9c2ecb77ba2273ccd4a0c39a6c4 +Subproject commit 613bdc3f969d476c3425cfde96fd217e936c892a diff --git a/current-paper b/current-paper index d79569099..73b82d4de 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.3--61eec1654f42a8e0092870650ef958ac4b06b7fa +1.16.3--619f642be5997215a6a95196323d6241af956f4f diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index 84f6aa357..65ef7ea92 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -7292,10 +7292,10 @@ index ff8ba5457..ecedc167d 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index fd649a0d2..77adc7528 100644 +index d8d29d145..786ddcee7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper +@@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper import javax.annotation.Nonnull; // Paper public final class CraftServer implements Server { @@ -7304,7 +7304,7 @@ index fd649a0d2..77adc7528 100644 private final String serverVersion; private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); -@@ -854,6 +854,7 @@ public final class CraftServer implements Server { +@@ -856,6 +856,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 @@ -7312,7 +7312,7 @@ index fd649a0d2..77adc7528 100644 for (WorldServer world : console.getWorlds()) { world.worldDataServer.setDifficulty(config.difficulty); world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals); -@@ -888,6 +889,7 @@ public final class CraftServer implements Server { +@@ -890,6 +891,7 @@ public final class CraftServer implements Server { } world.spigotConfig.init(); // Spigot world.paperConfig.init(); // Paper @@ -7320,7 +7320,7 @@ index fd649a0d2..77adc7528 100644 } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -1829,7 +1831,10 @@ public final class CraftServer implements Server { +@@ -1831,7 +1833,10 @@ public final class CraftServer implements Server { @Override public boolean isPrimaryThread() { @@ -7332,7 +7332,7 @@ index fd649a0d2..77adc7528 100644 } @Override -@@ -2239,6 +2244,14 @@ public final class CraftServer implements Server { +@@ -2250,6 +2255,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 4eb5fb5de..d9c561060 100644 --- a/patches/server/0002-Rebrand.patch +++ b/patches/server/0002-Rebrand.patch @@ -232,10 +232,10 @@ index 000000000..d8b408f06 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 77adc7528..6d21293e5 100644 +index 786ddcee7..c7a9b31e3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper +@@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper import javax.annotation.Nonnull; // Paper public final class CraftServer implements Server { @@ -245,10 +245,10 @@ index 77adc7528..6d21293e5 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 b5ec7a161..88f58e755 100644 +index 0b2bc20d1..63bfd1c70 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -327,7 +327,7 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -347,7 +347,7 @@ public final class CraftMagicNumbers implements UnsafeValues { @Override public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch index 858434781..6176b50fb 100644 --- a/patches/server/0003-Purpur-config-files.patch +++ b/patches/server/0003-Purpur-config-files.patch @@ -344,10 +344,10 @@ index 000000000..4904be939 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6d21293e5..918ca762c 100644 +index c7a9b31e3..09097ec75 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -855,6 +855,7 @@ public final class CraftServer implements Server { +@@ -857,6 +857,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 @@ -355,7 +355,7 @@ index 6d21293e5..918ca762c 100644 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 { +@@ -892,6 +893,7 @@ public final class CraftServer implements Server { world.spigotConfig.init(); // Spigot world.paperConfig.init(); // Paper world.tuinityConfig.init(); // Tuinity - Server Config @@ -363,7 +363,7 @@ index 6d21293e5..918ca762c 100644 } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -908,6 +910,7 @@ public final class CraftServer implements Server { +@@ -910,6 +912,7 @@ public final class CraftServer implements Server { reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper @@ -371,7 +371,7 @@ index 6d21293e5..918ca762c 100644 overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*"); ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2252,6 +2255,18 @@ public final class CraftServer implements Server { +@@ -2263,6 +2266,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 3c05fb8b7..19085ed87 100644 --- a/patches/server/0010-Bring-back-server-name.patch +++ b/patches/server/0010-Bring-back-server-name.patch @@ -17,10 +17,10 @@ index 23f8e144f..6797fa2e8 100644 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 7f5493a6d..5b53ec0a9 100644 +index 09097ec75..d46f51098 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2404,4 +2404,11 @@ public final class CraftServer implements Server { +@@ -2415,4 +2415,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 2e6c35e89..3a283664e 100644 --- a/patches/server/0013-Lagging-threshold.patch +++ b/patches/server/0013-Lagging-threshold.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 847c2d3d1..22dadf6d2 100644 +index 8b2ebe956..72b9b4a75 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -166,6 +166,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant