From 6a2527ccdbc1d7f08f32770e02f82b79c7e78720 Mon Sep 17 00:00:00 2001 From: Charles DeLancey <46200123+Evidentsinger14@users.noreply.github.com> Date: Sun, 28 Apr 2024 04:39:26 -0400 Subject: [PATCH 1/3] Fix sender not receiving helpop message (#5769) --- .../java/com/earth2me/essentials/commands/Commandhelpop.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhelpop.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhelpop.java index 28d5870dd..c0a819d83 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhelpop.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhelpop.java @@ -51,6 +51,8 @@ public class Commandhelpop extends EssentialsCommand { final HelpopMessageSendEvent sendEvent = new HelpopMessageSendEvent(from, recipients, message); ess.getServer().getPluginManager().callEvent(sendEvent); + from.sendTl("helpOp", from.getDisplayName(), message); + for (IUser recipient : sendEvent.getRecipients()) { recipient.sendTl("helpOp", from.getDisplayName(), message); } From 549283a1e51708a5a19c36c1f3ec9dae32b1abc8 Mon Sep 17 00:00:00 2001 From: DarkLaw <44745161+ImDarkLaw@users.noreply.github.com> Date: Sun, 28 Apr 2024 11:44:21 +0300 Subject: [PATCH 2/3] Translate Gamemode placeholder in cantGamemode message (#5771) --- .../java/com/earth2me/essentials/commands/Commandgamemode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandgamemode.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandgamemode.java index 52a2a2215..b5c6d05d7 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandgamemode.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandgamemode.java @@ -55,7 +55,7 @@ public class Commandgamemode extends EssentialsLoopCommand { } if (isProhibitedChange(user, gameMode)) { - user.sendTl("cantGamemode", gameMode.name()); + user.sendTl("cantGamemode", user.playerTl(gameMode.toString().toLowerCase(Locale.ENGLISH))); return; } From cde7184da39f623e58e305b7d00e4be5f8ac7ddb Mon Sep 17 00:00:00 2001 From: Charles DeLancey <46200123+Evidentsinger14@users.noreply.github.com> Date: Mon, 29 Apr 2024 21:26:49 -0400 Subject: [PATCH 3/3] Fix duplicated messages with /helpop (#5776) --- .../java/com/earth2me/essentials/commands/Commandhelpop.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhelpop.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhelpop.java index c0a819d83..690348a98 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhelpop.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhelpop.java @@ -51,7 +51,10 @@ public class Commandhelpop extends EssentialsCommand { final HelpopMessageSendEvent sendEvent = new HelpopMessageSendEvent(from, recipients, message); ess.getServer().getPluginManager().callEvent(sendEvent); - from.sendTl("helpOp", from.getDisplayName(), message); + final IUser sender = (IUser) from; + if(!recipients.contains(sender)){ + from.sendTl("helpOp", from.getDisplayName(), message); + } for (IUser recipient : sendEvent.getRecipients()) { recipient.sendTl("helpOp", from.getDisplayName(), message);