From 569ddc84a7bdd6fe008e29afb3abcab38b402499 Mon Sep 17 00:00:00 2001 From: ThiagoROX <51332006+SrBedrock@users.noreply.github.com> Date: Mon, 28 Apr 2025 16:29:46 -0300 Subject: [PATCH 1/3] Block sign line edits if the event has been cancelled --- .../com/earth2me/essentials/commands/Commandeditsign.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandeditsign.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandeditsign.java index 669751de0dc..2c239ce3f14 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandeditsign.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandeditsign.java @@ -96,6 +96,11 @@ protected void run(final Server server, final User user, final String commandLab final int line = args.length == 1 ? -1 : Integer.parseInt(args[1]) - 1; final String[] existingLines = sign.getLines(); + + if (callSignEvent(sign, user.getBase(), existingLines)) { + return; + } + if (line == -1) { for (int i = 0; i < 4; i++) { existingLines[i] = FormatUtil.formatString(user, "essentials.editsign", user.getSignCopy().get(i)); @@ -105,8 +110,6 @@ protected void run(final Server server, final User user, final String commandLab existingLines[line] = FormatUtil.formatString(user, "essentials.editsign", user.getSignCopy().get(line)); user.sendTl("editsignPasteLine", line + 1, commandLabel); } - - callSignEvent(sign, user.getBase(), existingLines); } else { throw new NotEnoughArgumentsException(); } From a9539367e2042b779485f8e09132bb6d3f7eb7ad Mon Sep 17 00:00:00 2001 From: ThiagoROX <51332006+SrBedrock@users.noreply.github.com> Date: Mon, 12 May 2025 19:43:17 -0300 Subject: [PATCH 2/3] Refactor sign editing logic to ensure event is called after updating lines --- .../earth2me/essentials/commands/Commandeditsign.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandeditsign.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandeditsign.java index 2c239ce3f14..b8911cc368a 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandeditsign.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandeditsign.java @@ -97,17 +97,19 @@ protected void run(final Server server, final User user, final String commandLab final String[] existingLines = sign.getLines(); - if (callSignEvent(sign, user.getBase(), existingLines)) { - return; - } - if (line == -1) { for (int i = 0; i < 4; i++) { existingLines[i] = FormatUtil.formatString(user, "essentials.editsign", user.getSignCopy().get(i)); } + if (callSignEvent(sign, user.getBase(), existingLines)) { + return; + } user.sendTl("editsignPaste", commandLabel); } else { existingLines[line] = FormatUtil.formatString(user, "essentials.editsign", user.getSignCopy().get(line)); + if (callSignEvent(sign, user.getBase(), existingLines)) { + return; + } user.sendTl("editsignPasteLine", line + 1, commandLabel); } } else { From cdaaefa3efe253027c88b5da8c3385abdd30dab2 Mon Sep 17 00:00:00 2001 From: ThiagoROX <51332006+SrBedrock@users.noreply.github.com> Date: Mon, 12 May 2025 19:44:16 -0300 Subject: [PATCH 3/3] Remove unnecessary blank line --- .../java/com/earth2me/essentials/commands/Commandeditsign.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandeditsign.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandeditsign.java index b8911cc368a..b6908bdae56 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandeditsign.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandeditsign.java @@ -96,7 +96,6 @@ protected void run(final Server server, final User user, final String commandLab final int line = args.length == 1 ? -1 : Integer.parseInt(args[1]) - 1; final String[] existingLines = sign.getLines(); - if (line == -1) { for (int i = 0; i < 4; i++) { existingLines[i] = FormatUtil.formatString(user, "essentials.editsign", user.getSignCopy().get(i));