From 1e75e541950097d7050081b3f64af4aac82fea99 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 5 Jul 2020 02:12:14 -0400 Subject: [PATCH] Move bedrock config under unsupported, add comments to these configs Hopefully help 'technical minecrafters' find and understand these configs by adding notes to them, and fixing the incorrect config placement on the bedrock config. --- .../Add-option-for-console-having-all-permissions.patch | 2 +- .../Fix-piston-physics-inconsistency-MC-188840.patch | 1 + ...ct-Bedrock-and-End-Portal-Frames-from-being-des.patch | 9 ++++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/Add-option-for-console-having-all-permissions.patch b/Spigot-Server-Patches/Add-option-for-console-having-all-permissions.patch index 11041ef94..ff489c689 100644 --- a/Spigot-Server-Patches/Add-option-for-console-having-all-permissions.patch +++ b/Spigot-Server-Patches/Add-option-for-console-having-all-permissions.patch @@ -9,7 +9,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -0,0 +0,0 @@ public class PaperConfig { - allowBlockPermanentBreakingExploits = getBoolean("allow-perm-block-break-exploits", allowBlockPermanentBreakingExploits); + } + public static boolean consoleHasAllPermissions = false; diff --git a/Spigot-Server-Patches/Fix-piston-physics-inconsistency-MC-188840.patch b/Spigot-Server-Patches/Fix-piston-physics-inconsistency-MC-188840.patch index 583a4a392..9a2ff8f2a 100644 --- a/Spigot-Server-Patches/Fix-piston-physics-inconsistency-MC-188840.patch +++ b/Spigot-Server-Patches/Fix-piston-physics-inconsistency-MC-188840.patch @@ -41,6 +41,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + public static boolean allowPistonDuplication; + private static void allowPistonDuplication() { ++ config.set("settings.unsupported-settings.allow-piston-duplication-readme", "This setting controls if player should be able to use TNT duplication, but this also allows duplicating carpet, rails and potentially other items"); + allowPistonDuplication = getBoolean("settings.unsupported-settings.allow-piston-duplication", config.getBoolean("settings.unsupported-settings.allow-tnt-duplication", false)); + set("settings.unsupported-settings.allow-tnt-duplication", null); + } diff --git a/Spigot-Server-Patches/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/Spigot-Server-Patches/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch index 22866d1f2..7d2a4c366 100644 --- a/Spigot-Server-Patches/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch +++ b/Spigot-Server-Patches/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch @@ -23,7 +23,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + + public static boolean allowBlockPermanentBreakingExploits = false; + private static void allowBlockPermanentBreakingExploits() { -+ allowBlockPermanentBreakingExploits = getBoolean("allow-perm-block-break-exploits", allowBlockPermanentBreakingExploits); ++ if (config.contains("allow-perm-block-break-exploits")) { ++ allowBlockPermanentBreakingExploits = config.getBoolean("allow-perm-block-break-exploits", false); ++ config.set("allow-perm-block-break-exploits", null); ++ } ++ ++ config.set("settings.unsupported-settings.allow-permanent-block-break-exploits-readme", "This setting controls if players should be able to break bedrock, end portals and other intended to be permanent blocks."); ++ allowBlockPermanentBreakingExploits = getBoolean("settings.unsupported-settings.allow-permanent-block-break-exploits", allowBlockPermanentBreakingExploits); ++ + } + }