From 0898adac99f6ea1025887ac79add43f60413dacb Mon Sep 17 00:00:00 2001 From: Kenzie Togami Date: Mon, 9 Sep 2019 03:47:32 -0700 Subject: [PATCH] Add defaultVerticalHeight to other configurations --- worldedit-bukkit/src/main/resources/defaults/config.yml | 4 +++- .../main/java/com/sk89q/worldedit/util/YAMLConfiguration.java | 3 +++ .../src/main/resources/defaults/worldedit.properties | 1 + .../src/main/resources/defaults/worldedit.properties | 1 + .../worldedit/sponge/config/ConfigurateConfiguration.java | 2 ++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/worldedit-bukkit/src/main/resources/defaults/config.yml b/worldedit-bukkit/src/main/resources/defaults/config.yml index 32ecab7cf..70ec16e9e 100644 --- a/worldedit-bukkit/src/main/resources/defaults/config.yml +++ b/worldedit-bukkit/src/main/resources/defaults/config.yml @@ -3,7 +3,7 @@ # # About editing this file: # - DO NOT USE TABS. You MUST use spaces or Bukkit will complain and post -# errors. If you use an editor, like Notepad++ (recommended for Windows +# errors. If you use an editor, like Notepad++ (recommended for Windows # users), you must configure it to "replace tabs with spaces." # This can be changed in Settings > Preferences > Language Menu. # - Don't get rid of indentations. They are indented so some entries that are @@ -20,6 +20,8 @@ limits: max-blocks-changed: default: -1 maximum: -1 + vertical-height: + default: 256 max-polygonal-points: default: -1 maximum: 20 diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/YAMLConfiguration.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/YAMLConfiguration.java index be676b132..11bf94e11 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/YAMLConfiguration.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/YAMLConfiguration.java @@ -62,6 +62,9 @@ public void load() { maxChangeLimit = Math.max(-1, config.getInt("limits.max-blocks-changed.maximum", maxChangeLimit)); + defaultVerticalHeight = Math.max(1, + config.getInt("limits.vertical-height.default", defaultVerticalHeight)); + defaultMaxPolygonalPoints = Math.max(-1, config.getInt("limits.max-polygonal-points.default", defaultMaxPolygonalPoints)); maxPolygonalPoints = Math.max(-1, diff --git a/worldedit-fabric/src/main/resources/defaults/worldedit.properties b/worldedit-fabric/src/main/resources/defaults/worldedit.properties index d0296c15c..6b8e4895e 100644 --- a/worldedit-fabric/src/main/resources/defaults/worldedit.properties +++ b/worldedit-fabric/src/main/resources/defaults/worldedit.properties @@ -20,6 +20,7 @@ use-inventory-creative-override=false log-file=worldedit.log log-format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS %4$s]: %5$s%6$s%n max-changed-blocks=-1 +default-vertical-height=256 nav-wand-distance=50 butcher-default-radius=-1 default-max-changed-blocks=-1 diff --git a/worldedit-forge/src/main/resources/defaults/worldedit.properties b/worldedit-forge/src/main/resources/defaults/worldedit.properties index d0296c15c..6b8e4895e 100644 --- a/worldedit-forge/src/main/resources/defaults/worldedit.properties +++ b/worldedit-forge/src/main/resources/defaults/worldedit.properties @@ -20,6 +20,7 @@ use-inventory-creative-override=false log-file=worldedit.log log-format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS %4$s]: %5$s%6$s%n max-changed-blocks=-1 +default-vertical-height=256 nav-wand-distance=50 butcher-default-radius=-1 default-max-changed-blocks=-1 diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/config/ConfigurateConfiguration.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/config/ConfigurateConfiguration.java index 377633000..3ada1e9fd 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/config/ConfigurateConfiguration.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/config/ConfigurateConfiguration.java @@ -69,6 +69,8 @@ public void load() { defaultChangeLimit = Math.max(-1, node.getNode("limits", "max-blocks-changed", "default").getInt(defaultChangeLimit)); maxChangeLimit = Math.max(-1, node.getNode("limits", "max-blocks-changed", "maximum").getInt(maxChangeLimit)); + defaultVerticalHeight = Math.max(1, node.getNode("limits", "vertical-height", "default").getInt(defaultVerticalHeight)); + defaultMaxPolygonalPoints = Math.max(-1, node.getNode("limits", "max-polygonal-points", "default").getInt(defaultMaxPolygonalPoints)); maxPolygonalPoints = Math.max(-1, node.getNode("limits", "max-polygonal-points", "maximum").getInt(maxPolygonalPoints));