From 8ab8ecd2f757ef4a598c03db69f52faa93f82908 Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Thu, 15 May 2025 19:57:15 +0700 Subject: [PATCH] fix: make findalts use the ip from the current player list first but if not found then use the one from the database --- build-number.txt | 2 +- .../chayapak1/chomens_bot/commands/FindAltsCommand.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build-number.txt b/build-number.txt index 45230b8c..0f2e8c5a 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -3196 \ No newline at end of file +3197 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java index f05a7ae7..c306d24e 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java @@ -8,6 +8,7 @@ import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.command.CommandException; import me.chayapak1.chomens_bot.command.TrustLevel; import me.chayapak1.chomens_bot.data.chat.ChatPacketType; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.plugins.DatabasePlugin; import net.kyori.adventure.text.Component; @@ -49,7 +50,12 @@ public class FindAltsCommand extends Command { final String player = context.getString(true, true); DatabasePlugin.EXECUTOR_SERVICE.submit(() -> { - final String ipFromUsername = bot.playersDatabase.getPlayerIP(player); + final PlayerEntry playerInTheServer = bot.players.getEntry(player); + + final String ipFromUsername; + + if (playerInTheServer == null || playerInTheServer.ip == null) ipFromUsername = bot.playersDatabase.getPlayerIP(player); + else ipFromUsername = playerInTheServer.ip; if (ipFromUsername == null) { context.sendOutput(handle(bot, player, player, allServer));