Skip to content

Validate category multiplier input for admin command #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RecoTG wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Validate category multiplier input for admin command #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/main/java/com/yourorg/servershop/commands/AdminCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,18 @@ private boolean handleCategory(CommandSender sender, String[] args) {
if (sub.equals("setmult") && args.length >= 3) {
String cat = args[1];
double m;
try { m = Double.parseDouble(args[2]); } catch (Exception e) { sender.sendMessage(plugin.prefixed("Bad number.")); return true; }
try {
m = Double.parseDouble(args[2]);
} catch (Exception e) {
sender.sendMessage(plugin.prefixed("Multiplier must be a number between 0.0 and 10.0."));
return true;
}
if (Double.isNaN(m) || Double.isInfinite(m) || m < 0.0 || m > 10.0) {
sender.sendMessage(plugin.prefixed("Multiplier must be between 0.0 and 10.0."));
return true;
}
plugin.categorySettings().setMultiplier(cat, m);
sender.sendMessage(plugin.prefixed("Set multiplier for "+cat+" to x"+m));
sender.sendMessage(plugin.prefixed("Set multiplier for " + cat + " to x" + m));
return true;
}
if (sub.equals("toggle") && args.length >= 3) {
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/com/yourorg/servershop/config/CategorySettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ public CategorySettings(ServerShopPlugin plugin) {
public synchronized boolean isEnabled(String name) { Entry e = map.get(name); return e == null ? true : e.enabled; }
public synchronized double multiplier(String name) { Entry e = map.get(name); return e == null ? 1.0 : e.multiplier; }
public synchronized void setEnabled(String name, boolean on) { ensureCategory(name); map.get(name).enabled = on; save(); }
public synchronized void setMultiplier(String name, double m) { ensureCategory(name); map.get(name).multiplier = Math.max(0.0, m); save(); }
public synchronized void setMultiplier(String name, double m) {
ensureCategory(name);
if (Double.isNaN(m) || Double.isInfinite(m)) return;
map.get(name).multiplier = Math.max(0.0, Math.min(10.0, m));
save();
}
public synchronized Set<String> categories() { return new LinkedHashSet<>(map.keySet()); }

public synchronized void load() {
Expand Down
Loading