diff --git a/src/main/java/xyz/etztech/minealert/listeners/GriefAlertListener.java b/src/main/java/xyz/etztech/minealert/listeners/GriefAlertListener.java index db22cf6..9db4ae7 100644 --- a/src/main/java/xyz/etztech/minealert/listeners/GriefAlertListener.java +++ b/src/main/java/xyz/etztech/minealert/listeners/GriefAlertListener.java @@ -74,9 +74,9 @@ public class GriefAlertListener implements Listener { extra.append(" and pinging Discord"); Embed embed = new Embed() .color(color.getInt()) - .description(alert) + .description(Javacord.escapeFormat(alert)) .timestamp(OffsetDateTime.now()) - .author(new Author(Javacord.escapeFormat(playerName), + .author(new Author(playerName, !"".equals(usernameURL) ? usernameURL : "", String.format("https://minotar.net/helm/%s/100.png", playerName), "")); diff --git a/src/main/java/xyz/etztech/minealert/listeners/OreAlertListener.java b/src/main/java/xyz/etztech/minealert/listeners/OreAlertListener.java index f152902..dfd29e1 100644 --- a/src/main/java/xyz/etztech/minealert/listeners/OreAlertListener.java +++ b/src/main/java/xyz/etztech/minealert/listeners/OreAlertListener.java @@ -200,9 +200,9 @@ public class OreAlertListener implements Listener { if (!"".equals(webhook)) { Embed embed = new Embed() .color(Color.hexToInt(hexColor)) - .description(message) + .description(Javacord.escapeFormat(message)) .timestamp(OffsetDateTime.now()) - .author(new Author(Javacord.escapeFormat(event.getPlayer().getName()), + .author(new Author(event.getPlayer().getName(), !"".equals(usernameURL) ? usernameURL : "", String.format("https://minotar.net/helm/%s/100.png", event.getPlayer().getName()), "")); @@ -227,40 +227,40 @@ public class OreAlertListener implements Listener { public static Queue getQueue() { return queue; } -} -class BlockEvent { - private final Player player; - private final Material material; - private final Location location; - private final Boolean parent; - private final Date time; + private static class BlockEvent { + private final Player player; + private final Material material; + private final Location location; + private final Boolean parent; + private final Date time; - BlockEvent(Player player, Material material, Location location, Boolean parent) { - this.player = player; - this.material = material; - this.location = location; - this.parent = parent; - this.time = Calendar.getInstance().getTime(); - } + BlockEvent(Player player, Material material, Location location, Boolean parent) { + this.player = player; + this.material = material; + this.location = location; + this.parent = parent; + this.time = Calendar.getInstance().getTime(); + } - public Player getPlayer() { - return player; - } + public Player getPlayer() { + return player; + } - public Material getMaterial() { - return material; - } + public Material getMaterial() { + return material; + } - public Location getLocation() { - return location; - } + public Location getLocation() { + return location; + } - public Boolean isParent() { - return parent; - } + public Boolean isParent() { + return parent; + } - public Date getTime() { - return time; + public Date getTime() { + return time; + } } }