From 553da9baf654b67b8747a93030dc53aa6ce0f1c0 Mon Sep 17 00:00:00 2001 From: Luck Date: Wed, 8 Aug 2018 08:58:58 +0100 Subject: [PATCH] Give some form of feedback when trying to applyedits no changes instead of no feedback at all (#1136) --- .../common/commands/misc/ApplyEditsCommand.java | 12 ++++++++++-- .../luckperms/common/locale/message/Message.java | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/ApplyEditsCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ApplyEditsCommand.java index af1d7319e..3f40bfb79 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/ApplyEditsCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/ApplyEditsCommand.java @@ -76,13 +76,21 @@ public class ApplyEditsCommand extends SingleCommand { return CommandResult.FAILURE; } + boolean success = false; + if (data.has("tabs") && data.get("tabs").isJsonArray()) { JsonArray rows = data.get("tabs").getAsJsonArray(); for (JsonElement row : rows) { - read(row.getAsJsonObject(), sender, plugin); + if (read(row.getAsJsonObject(), sender, plugin)) { + success = true; + } } } else { - read(data, sender, plugin); + success = read(data, sender, plugin); + } + + if (!success) { + Message.APPLY_EDITS_TARGET_NO_CHANGES_PRESENT.send(sender); } return CommandResult.SUCCESS; diff --git a/common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java b/common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java index add1c1a2c..529c051fd 100644 --- a/common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java +++ b/common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java @@ -155,6 +155,7 @@ public enum Message { APPLY_EDITS_TARGET_USER_NOT_UUID("&cTarget user &4{}&c is not a valid uuid.", true), APPLY_EDITS_TARGET_USER_UNABLE_TO_LOAD("&cUnable to load target user &4{}&c.", true), APPLY_EDITS_TARGET_UNKNOWN("&cInvalid target. &7({})", true), + APPLY_EDITS_TARGET_NO_CHANGES_PRESENT("&aNo changes were applied from the web editor. The returned data didn't contain any edits.", true), APPLY_EDITS_SUCCESS("&aWeb editor data was applied to &b{}&a successfully.", true), APPLY_EDITS_SUCCESS_SUMMARY("&7(&a{} &7{} and &c{} &7{})", true), APPLY_EDITS_DIFF_ADDED("&a+ &f{}", false),