mirror/VentureChat
1
0
Fork 1
mirror of https://github.com/Aust1n46/VentureChat.git synced 2025-05-23 02:19:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged in fix/bungee-chat (pull request #11)

Browse Source 
Fix EssXDiscord messages not sending in bungee mode

Approved-by: Aust1n46
This commit is contained in:
JRoy 2021-09-13 23:49:54 +00:00 committed by Aust1n46
commit 8934c9bcc2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -109,7 +109,7 @@
</repository> </repository>
<repository> <repository>
<id>essentialsx-repo</id> <id>essentialsx-repo</id>
<url>https://repo.essentialsx.net/snapshots/</url> <url>https://repo.essentialsx.net/releases/</url>
</repository> </repository>
<repository> <repository>
<id>velocity</id> <id>velocity</id>
@ -182,7 +182,7 @@
<dependency> <dependency>
<groupId>net.essentialsx</groupId> <groupId>net.essentialsx</groupId>
<artifactId>EssentialsXDiscord</artifactId> <artifactId>EssentialsXDiscord</artifactId>
<version>2.19.0-SNAPSHOT</version> <version>2.19.0</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>

8
src/main/java/mineverse/Aust1n46/chat/listeners/ChatListener.java
View File

@ -511,6 +511,10 @@ public class ChatListener implements Listener {
int hash = event.getHash(); int hash = event.getHash();
boolean bungee = event.isBungee(); boolean bungee = event.isBungee();
if (essentialsDiscordHook && channel.isDefaultchannel()) {
Bukkit.getServicesManager().load(DiscordService.class).sendChatMessage(mcp.getPlayer(), chat);
}
if(!bungee) { if(!bungee) {
if(Database.isEnabled()) { if(Database.isEnabled()) {
Database.writeVentureChat(mcp.getUUID().toString(), mcp.getName(), "Local", channel.getName(), chat.replace("'", "''"), "Chat"); Database.writeVentureChat(mcp.getUUID().toString(), mcp.getName(), "Local", channel.getName(), chat.replace("'", "''"), "Chat");
@ -527,10 +531,6 @@ public class ChatListener implements Listener {
Format.sendPacketPlayOutChat(p, packet); Format.sendPacketPlayOutChat(p, packet);
} }
Bukkit.getConsoleSender().sendMessage(consoleChat); Bukkit.getConsoleSender().sendMessage(consoleChat);
if (essentialsDiscordHook && channel.isDefaultchannel()) {
Bukkit.getServicesManager().load(DiscordService.class).sendChatMessage(mcp.getPlayer(), chat);
}
return; return;
} }
else { else {