From 0b0e7c42f835e4deb3ea9bdfe855965a41747852 Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Fri, 10 Sep 2021 19:14:22 -0400 Subject: [PATCH 1/2] Bump EssentialsX depend to stable release --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 070259a..a1a4211 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ essentialsx-repo - https://repo.essentialsx.net/snapshots/ + https://repo.essentialsx.net/releases/ velocity @@ -182,7 +182,7 @@ net.essentialsx EssentialsXDiscord - 2.19.0-SNAPSHOT + 2.19.0 provided From 141672f546e236602ecee372361e48b1f6d06201 Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Sun, 12 Sep 2021 22:03:18 -0400 Subject: [PATCH 2/2] Fix messages not sending in bungee mode --- .../mineverse/Aust1n46/chat/listeners/ChatListener.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/mineverse/Aust1n46/chat/listeners/ChatListener.java b/src/main/java/mineverse/Aust1n46/chat/listeners/ChatListener.java index df0d9ed..e395c07 100644 --- a/src/main/java/mineverse/Aust1n46/chat/listeners/ChatListener.java +++ b/src/main/java/mineverse/Aust1n46/chat/listeners/ChatListener.java @@ -510,6 +510,10 @@ public class ChatListener implements Listener { String globalJSON = event.getGlobalJSON(); int hash = event.getHash(); boolean bungee = event.isBungee(); + + if (essentialsDiscordHook && channel.isDefaultchannel()) { + Bukkit.getServicesManager().load(DiscordService.class).sendChatMessage(mcp.getPlayer(), chat); + } if(!bungee) { if(Database.isEnabled()) { @@ -527,10 +531,6 @@ public class ChatListener implements Listener { Format.sendPacketPlayOutChat(p, packet); } Bukkit.getConsoleSender().sendMessage(consoleChat); - - if (essentialsDiscordHook && channel.isDefaultchannel()) { - Bukkit.getServicesManager().load(DiscordService.class).sendChatMessage(mcp.getPlayer(), chat); - } return; } else {