Skip to content

Fixes /msg Bug, Simplify Logic #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RitzKid76 merged 2 commits into from
Jun 13, 2025
Merged

Fixes /msg Bug, Simplify Logic #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12f0566
Fixes /msg sending messages to all users with a character in their na…
Garsooon Jun 4, 2025
eb345b4
Merge branch 'master' into msg-All-match
Garsooon Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 14 additions & 26 deletions Essentials/src/main/java/com/earth2me/essentials/commands/Commandmsg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

import java.util.List;


public class Commandmsg extends EssentialsCommand {
public Commandmsg() {
super("msg");
Expand All @@ -30,21 +28,17 @@ public void run(Server server, CommandSender sender, String commandLabel, String
}

String message = getFinalArg(args, 1);

if (sender instanceof Player) {
User user = ess.getUser(sender);
if (user.isMuted()) {
throw new Exception(Util.i18n("voiceSilenced"));
}

if (user.isAuthorized("essentials.chat.color"))
{
if (user.isAuthorized("essentials.chat.color")) {
message = (message.replaceAll("&([0-9a-f])", "§$1"));
}
}

String translatedMe = Util.i18n("me");

String translatedMe = Util.i18n("me");
IReplyTo replyTo = sender instanceof Player ? ess.getUser(sender) : Console.getConsoleReplyTo();
String senderName = sender instanceof Player ? ((Player) sender).getDisplayName() : Console.NAME;

Expand All @@ -58,31 +52,25 @@ public void run(Server server, CommandSender sender, String commandLabel, String
}

List<Player> matches = server.matchPlayer(args[0]);

if (matches.isEmpty()) {
throw new Exception(Util.i18n("playerNotFound"));
}

int i = 0;
for (Player p : matches) {
final User u = ess.getUser(p);
if (u.isHidden()) {
i++;
}
}
if (i == matches.size()) {
Player targetPlayer = matches.get(0);
final User u = ess.getUser(targetPlayer);

if (u.isHidden()) {
throw new Exception(Util.i18n("playerNotFound"));
}

for (Player p : matches) {
sender.sendMessage(Util.format("msgFormat", translatedMe, p.getDisplayName(), message));
final User u = ess.getUser(p);
if (sender instanceof Player && (u.isIgnoredPlayer(((Player) sender).getName()) || u.isHidden())) {
continue;
}
p.sendMessage(Util.format("msgFormat", senderName, translatedMe, message));
replyTo.setReplyTo(ess.getUser(p));
ess.getUser(p).setReplyTo(sender);
sender.sendMessage(Util.format("msgFormat", translatedMe, targetPlayer.getDisplayName(), message));

if (sender instanceof Player && (u.isIgnoredPlayer(((Player) sender).getName()))) {
return;
}

targetPlayer.sendMessage(Util.format("msgFormat", senderName, translatedMe, message));
replyTo.setReplyTo(ess.getUser(targetPlayer));
ess.getUser(targetPlayer).setReplyTo(sender);
}
}