From 79b2a97c9e84a7b3fe19e166a54b88967452f59d Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 20 Dec 2022 16:44:49 -0500 Subject: [PATCH] Clamp /searchcontainer radius (#117) Default max is 10 because that's the default server view distance. --- .../com/lishid/openinv/commands/SearchContainerCommand.java | 4 ++++ .../src/main/java/com/lishid/openinv/util/ConfigUpdater.java | 1 + plugin/src/main/resources/config.yml | 2 ++ 3 files changed, 7 insertions(+) diff --git a/plugin/src/main/java/com/lishid/openinv/commands/SearchContainerCommand.java b/plugin/src/main/java/com/lishid/openinv/commands/SearchContainerCommand.java index bef78bb..161dfed 100644 --- a/plugin/src/main/java/com/lishid/openinv/commands/SearchContainerCommand.java +++ b/plugin/src/main/java/com/lishid/openinv/commands/SearchContainerCommand.java @@ -76,6 +76,10 @@ public class SearchContainerCommand implements TabExecutor { } } + // Clamp radius. + int configMax = plugin.getConfig().getInt("settings.command.searchcontainer.max-radius", 10); + radius = Math.max(0, Math.min(radius, configMax)); + World world = senderPlayer.getWorld(); Chunk centerChunk = senderPlayer.getLocation().getChunk(); StringBuilder locations = new StringBuilder(); diff --git a/plugin/src/main/java/com/lishid/openinv/util/ConfigUpdater.java b/plugin/src/main/java/com/lishid/openinv/util/ConfigUpdater.java index 6c74613..a657f84 100644 --- a/plugin/src/main/java/com/lishid/openinv/util/ConfigUpdater.java +++ b/plugin/src/main/java/com/lishid/openinv/util/ConfigUpdater.java @@ -71,6 +71,7 @@ public record ConfigUpdater(OpenInv plugin) { private void updateConfig5To6() { plugin.getServer().getScheduler().runTask(plugin, () -> { plugin.getConfig().set("settings.command.open.no-args-opens-self", false); + plugin.getConfig().set("settings.command.searchcontainer.max-radius", 10); plugin.getConfig().set("config-version", 6); }); } diff --git a/plugin/src/main/resources/config.yml b/plugin/src/main/resources/config.yml index 38edd51..6a68c9c 100644 --- a/plugin/src/main/resources/config.yml +++ b/plugin/src/main/resources/config.yml @@ -3,6 +3,8 @@ settings: command: open: no-args-opens-self: false + searchcontainer: + max-radius: 10 disable-offline-access: false disable-saving: false locale: 'en_us'