From f336fe364bf031ac6fb3a49aecfaab8b01a7528f Mon Sep 17 00:00:00 2001 From: AffluentAvo Date: Fri, 7 Aug 2020 16:27:27 +0200 Subject: [PATCH] finished changes i just started but forgot to finish --- .../sokobot/listener/CommandListener.java | 18 ++++++++++-------- .../me/polymarsdev/sokobot/util/GameUtil.java | 3 +-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/me/polymarsdev/sokobot/listener/CommandListener.java b/src/main/java/me/polymarsdev/sokobot/listener/CommandListener.java index 8759eab..bf28863 100644 --- a/src/main/java/me/polymarsdev/sokobot/listener/CommandListener.java +++ b/src/main/java/me/polymarsdev/sokobot/listener/CommandListener.java @@ -47,14 +47,16 @@ public class CommandListener extends ListenerAdapter { message.addReaction("U+2B06").queue(); message.addReaction("U+2B07").queue(); message.addReaction("U+1F504").queue(); - MessageEmbed.Footer footerObject = embed.getFooter(); - if (footerObject != null) { - String footer = footerObject.getText(); - if (footer != null) { - long playerId = Long.parseLong(footer.substring(10, footer.length() - 1)); - if (GameUtil.hasGame(playerId)) { - Game game = GameUtil.getGame(playerId); - game.setGameMessage(message); + List fields = embed.getFields(); + for (MessageEmbed.Field field : fields) { + if (field.getName() != null && field.getName().equals("Player")) { + if (field.getValue() != null) { + long playerId = Long + .parseLong(field.getValue().substring(2, field.getValue().length() - 1)); + if (GameUtil.hasGame(playerId)) { + Game game = GameUtil.getGame(playerId); + game.setGameMessage(message); + } } } } diff --git a/src/main/java/me/polymarsdev/sokobot/util/GameUtil.java b/src/main/java/me/polymarsdev/sokobot/util/GameUtil.java index f3cc4ed..fb3a4ca 100644 --- a/src/main/java/me/polymarsdev/sokobot/util/GameUtil.java +++ b/src/main/java/me/polymarsdev/sokobot/util/GameUtil.java @@ -36,7 +36,6 @@ public class GameUtil { embed.setDescription(game); embed.addField("Enter direction (``up``, ``down``, ``left``, ``right``/``wasd``) or ``r`` to reset", "", false); embed.addField("Player", user.getAsMention(), false); - embed.setFooter("Game of " + user.getAsMention(), user.getAvatarUrl()); channel.sendMessage(embed.build()).queue(); } @@ -45,7 +44,7 @@ public class GameUtil { embed.setTitle("Sokobot | Level " + level); embed.setDescription(game); embed.addField("Enter direction (``up``, ``down``, ``left``, ``right``/``wasd``) or ``r`` to reset", "", false); - embed.setFooter("Game of " + user.getAsMention(), user.getAvatarUrl()); + embed.addField("Player", user.getAsMention(), false); message.editMessage(embed.build()).queue(); }