Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '2.x' into mc/1.20.5

This commit is contained in:
Josh Roy 2024-04-29 21:31:13 -04:00
parent 9cd7b6534e cde7184da3
commit 132fa13442
No known key found for this signature in database
GPG Key ID: 64C8142336ED1F69
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/main/java/com/earth2me/essentials/commands/Commandgamemode.java
View File

@ -55,7 +55,7 @@ public class Commandgamemode extends EssentialsLoopCommand {
} }
if (isProhibitedChange(user, gameMode)) { if (isProhibitedChange(user, gameMode)) {
user.sendTl("cantGamemode", gameMode.name()); user.sendTl("cantGamemode", user.playerTl(gameMode.toString().toLowerCase(Locale.ENGLISH)));
return; return;
} }

5
Essentials/src/main/java/com/earth2me/essentials/commands/Commandhelpop.java
View File

@ -51,6 +51,11 @@ public class Commandhelpop extends EssentialsCommand {
final HelpopMessageSendEvent sendEvent = new HelpopMessageSendEvent(from, recipients, message); final HelpopMessageSendEvent sendEvent = new HelpopMessageSendEvent(from, recipients, message);
ess.getServer().getPluginManager().callEvent(sendEvent); 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()) { for (IUser recipient : sendEvent.getRecipients()) {
recipient.sendTl("helpOp", from.getDisplayName(), message); recipient.sendTl("helpOp", from.getDisplayName(), message);
} }