Merge branch '2.x' into mc/1.20.5

EssentialsX · Apr 30, 2024 · 132fa13 · 132fa13
2 parents 9cd7b65 + cde7184
commit 132fa13
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -55,7 +55,7 @@ protected void run(final Server server, final User user, final String commandLab
         }
 
         if (isProhibitedChange(user, gameMode)) {
-            user.sendTl("cantGamemode", gameMode.name());
+            user.sendTl("cantGamemode", user.playerTl(gameMode.toString().toLowerCase(Locale.ENGLISH)));
             return;
         }
 

diff --git 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,11 @@ private void sendMessage(final IMessageRecipient from, final String[] args) thro
         final HelpopMessageSendEvent sendEvent = new HelpopMessageSendEvent(from, recipients, message);
         ess.getServer().getPluginManager().callEvent(sendEvent);
 
+        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);
         }