From 9b3679fbd3dfd78974e2792dffd99157454f01ce Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 31 Mar 2020 05:21:27 +0100 Subject: [PATCH] Don't duplicate velocity entry into hidden-configs also, rebuild patches --- .../0317-Add-Velocity-IP-Forwarding-Support.patch | 10 ++++++---- Spigot-Server-Patches/0331-Book-Size-Limits.patch | 6 +++--- .../0392-Asynchronous-chunk-IO-and-loading.patch | 6 +++--- ...atrol-spawn-settings-and-per-player-option.patch} | 12 ++++++------ 4 files changed, 18 insertions(+), 16 deletions(-) rename Spigot-Server-Patches/{0435-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0451-Pillager-patrol-spawn-settings-and-per-player-option.patch} (96%) diff --git a/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch index a57a7ea1d9..33c63437ca 100644 --- a/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch +++ b/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch @@ -1,4 +1,4 @@ -From 6e93e0626a1b78e77f6f0ab7fe9f31f0fbc75d43 Mon Sep 17 00:00:00 2001 +From edd5923a20b3dcc4a673f8dedbd3600e6c481a5c Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 8 Oct 2018 14:36:14 -0400 Subject: [PATCH] Add Velocity IP Forwarding Support @@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13 login plugin message packet. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 092bff78ab..a987916055 100644 +index 092bff78ab..421e78d624 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -8,6 +8,7 @@ import java.io.IOException; @@ -34,7 +34,7 @@ index 092bff78ab..a987916055 100644 } public static int packetInSpamThreshold = 300; -@@ -336,4 +337,19 @@ public class PaperConfig { +@@ -336,4 +337,21 @@ public class PaperConfig { } } } @@ -46,7 +46,9 @@ index 092bff78ab..a987916055 100644 + velocitySupport = getBoolean("settings.velocity-support.enabled", false); + velocityOnlineMode = getBoolean("settings.velocity-support.online-mode", false); + String secret = getString("settings.velocity-support.secret", ""); -+ TimingsManager.hiddenConfigs.add("settings.velocity-support.secret"); ++ if (TimingsManager.hiddenConfigs.contains("settings.velocity-support.secret")) { ++ TimingsManager.hiddenConfigs.add("settings.velocity-support.secret"); ++ } + if (velocitySupport && secret.isEmpty()) { + fatal("Velocity support is enabled, but no secret key was specified. A secret key is required!"); + } else { diff --git a/Spigot-Server-Patches/0331-Book-Size-Limits.patch b/Spigot-Server-Patches/0331-Book-Size-Limits.patch index 7cbf07e39a..f93510145c 100644 --- a/Spigot-Server-Patches/0331-Book-Size-Limits.patch +++ b/Spigot-Server-Patches/0331-Book-Size-Limits.patch @@ -1,4 +1,4 @@ -From 968b20b483f3384d41dbbe90e279fe32a64c598d Mon Sep 17 00:00:00 2001 +From cc86452dafe8e20308867928af10553f9f385ca8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Nov 2018 23:08:50 -0500 Subject: [PATCH] Book Size Limits @@ -6,10 +6,10 @@ Subject: [PATCH] Book Size Limits Puts some limits on the size of books. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index a987916055..30c794cfbf 100644 +index 421e78d624..47c4c20502 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -352,4 +352,11 @@ public class PaperConfig { +@@ -354,4 +354,11 @@ public class PaperConfig { velocitySecretKey = secret.getBytes(StandardCharsets.UTF_8); } } diff --git a/Spigot-Server-Patches/0392-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0392-Asynchronous-chunk-IO-and-loading.patch index 2d0915cdec..7143075860 100644 --- a/Spigot-Server-Patches/0392-Asynchronous-chunk-IO-and-loading.patch +++ b/Spigot-Server-Patches/0392-Asynchronous-chunk-IO-and-loading.patch @@ -1,4 +1,4 @@ -From d20ece1f23e5a10ab447b9b23b433ce5d4989084 Mon Sep 17 00:00:00 2001 +From 3a31b47397ded83cb461dbdad9e81ab444e5bd0e Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 13 Jul 2019 09:23:10 -0700 Subject: [PATCH] Asynchronous chunk IO and loading @@ -161,7 +161,7 @@ index 27ce4a828e..30bafb214b 100644 public static Timing getTickList(WorldServer worldserver, String timingsType) { diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 8d1e871dd2..93ac863332 100644 +index 4735d30253..5093c56f4e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -1,5 +1,6 @@ @@ -171,7 +171,7 @@ index 8d1e871dd2..93ac863332 100644 import com.google.common.base.Strings; import com.google.common.base.Throwables; -@@ -365,4 +366,64 @@ public class PaperConfig { +@@ -367,4 +368,64 @@ public class PaperConfig { maxBookPageSize = getInt("settings.book-size.page-max", maxBookPageSize); maxBookTotalSizeMultiplier = getDouble("settings.book-size.total-multiplier", maxBookTotalSizeMultiplier); } diff --git a/Spigot-Server-Patches/0435-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0451-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 96% rename from Spigot-Server-Patches/0435-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to Spigot-Server-Patches/0451-Pillager-patrol-spawn-settings-and-per-player-option.patch index a7d9c9bdf2..5732fe750c 100644 --- a/Spigot-Server-Patches/0435-Pillager-patrol-spawn-settings-and-per-player-option.patch +++ b/Spigot-Server-Patches/0451-Pillager-patrol-spawn-settings-and-per-player-option.patch @@ -1,4 +1,4 @@ -From 81740bc0e805b9b73bba0d7d3694300e609a6cf1 Mon Sep 17 00:00:00 2001 +From f70336604876762f2029a026ba88f7c10744df44 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sat, 1 Feb 2020 16:50:39 +0100 Subject: [PATCH] Pillager patrol spawn settings and per player options @@ -10,10 +10,10 @@ When not per player it will use the Vanilla mechanic of one delay per world and the world age for the start day. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index bce502181..3f7841471 100644 +index e93176d8f..659a011e9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -636,10 +636,21 @@ public class PaperWorldConfig { +@@ -641,10 +641,21 @@ public class PaperWorldConfig { } public boolean disablePillagerPatrols = false; @@ -36,10 +36,10 @@ index bce502181..3f7841471 100644 private void entitiesTargetWithFollowRange() { entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 15230a834..c49e48e57 100644 +index 43774bc9a..e353d9336 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -76,6 +76,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -77,6 +77,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public boolean viewingCredits; private int containerUpdateDelay; // Paper public long loginTime; // Paper @@ -140,5 +140,5 @@ index 3b6034038..9c95c0ccf 100644 return this.a(t0, Counter.DEFAULT); } -- -2.18.0.windows.1 +2.26.0