ChomeNS/chomens-bot-java
3
1
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: ChomeNS:743072d8e31bc946118055f3a4edc30c84cbe9ad
Branches Tags
ChomeNS:master
...
compare: ChomeNS:32c3801acf8fdf0dd2c88b051960b107d04e2b35
Branches Tags
ChomeNS:master

2 commits
743072d8e3 ... 32c3801acf

Author SHA1 Message Date
ChomeNS
32c3801acf Fix SeenCommand when the same player is online in multiple servers 2024-10-26 18:33:41 +07:00
ChomeNS
9b214c7111 Correct the message 2024-10-26 18:18:16 +07:00
2 changed files with 26 additions and 7 deletions
Show stats Expand all files Collapse all files

11
src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java
View file

@ -33,6 +33,8 @@ public class FindAltsCommand extends Command {
public Component execute(CommandContext context) throws Exception { public Component execute(CommandContext context) throws Exception {
final Bot bot = context.bot; final Bot bot = context.bot;
boolean argumentIsIP = true;
String targetIP; String targetIP;
final String player = context.getString(true, true); final String player = context.getString(true, true);
@ -41,6 +43,8 @@ public class FindAltsCommand extends Command {
if (playerEntry == null) targetIP = player; if (playerEntry == null) targetIP = player;
else { else {
argumentIsIP = false;
final CompletableFuture<String> future = bot.players.getPlayerIP(playerEntry); final CompletableFuture<String> future = bot.players.getPlayerIP(playerEntry);
targetIP = future.get(5, TimeUnit.SECONDS); targetIP = future.get(5, TimeUnit.SECONDS);
@ -67,9 +71,12 @@ public class FindAltsCommand extends Command {
.map(Map.Entry::getKey); .map(Map.Entry::getKey);
Component component = Component Component component = Component
.translatable("Possible alts for the player %s:") .translatable("Possible alts for the %s %s:")
.color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor)) .color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor))
.arguments(Component.text(player).color(ColorUtilities.getColorByString(bot.config.colorPalette.username))) .arguments(
Component.text(argumentIsIP ? "IP" : "player"),
Component.text(player).color(ColorUtilities.getColorByString(bot.config.colorPalette.username))
)
.appendNewline(); .appendNewline();
int i = 0; int i = 0;

22
src/main/java/me/chayapak1/chomens_bot/commands/SeenCommand.java
View file

@ -34,14 +34,26 @@ public class SeenCommand extends Command {
final String player = context.getString(true, true); final String player = context.getString(true, true);
boolean online = false;
Component onlineComponents = Component.empty();
for (Bot eachBot : bot.bots) { for (Bot eachBot : bot.bots) {
if (eachBot.players.getEntry(player) != null) return Component.empty() if (eachBot.players.getEntry(player) != null) {
.append(Component.text(player)) online = true;
.append(Component.text(" is currently online on "))
.append(Component.text(eachBot.host + ":" + eachBot.port)) onlineComponents = onlineComponents.append(
.color(NamedTextColor.RED); Component.empty()
.append(Component.text(player))
.append(Component.text(" is currently online on "))
.append(Component.text(eachBot.host + ":" + eachBot.port))
.color(NamedTextColor.RED)
);
}
} }
if (online) return onlineComponents;
final JsonElement playerElement = PlayersPersistentDataPlugin.playersObject.get(player); final JsonElement playerElement = PlayersPersistentDataPlugin.playersObject.get(player);
if (playerElement == null) throw new CommandException(Component.translatable( if (playerElement == null) throw new CommandException(Component.translatable(
"%s was never seen", "%s was never seen",