From 3f0df15bb20a8912408c48e31ff5933ab75b7c85 Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Fri, 27 Mar 2020 14:37:35 -0400 Subject: [PATCH] Update database to log incoming bungee chat with proper server names. --- .../mineverse/Aust1n46/chat/MineverseChat.java | 9 +++++++++ .../chat/bungee/MineverseChatBungee.java | 1 + .../Aust1n46/chat/listeners/ChatListener.java | 18 +++++++++--------- .../chat/listeners/CommandListener.java | 4 ++-- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java index 7af9b47..da58e62 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java @@ -694,6 +694,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { ByteArrayOutputStream stream = new ByteArrayOutputStream(); DataOutputStream out = new DataOutputStream(stream); if(subchannel.equals("Chat")) { + String server = msgin.readUTF(); String chatchannel = msgin.readUTF(); String senderName = msgin.readUTF(); UUID senderUUID = UUID.fromString(msgin.readUTF()); @@ -732,6 +733,14 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { }); Bukkit.getConsoleSender().sendMessage(consoleChat); + + if(db != null) { + Calendar currentDate = Calendar.getInstance(); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String date = formatter.format(currentDate.getTime()); + db.writeVentureChat(date, senderUUID.toString(), senderName, server, chatchannel, chat.replace("'", "''"), "Chat"); + } + for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { if(p.isListening(chatChannelObject.getName())) { if(!p.getBungeeToggle() && MineverseChatAPI.getOnlineMineverseChatPlayer(senderName) == null) { diff --git a/MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java b/MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java index 4c0e2c1..7bddbbb 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java +++ b/MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java @@ -163,6 +163,7 @@ public class MineverseChatBungee extends Plugin implements Listener { String primaryGroup = in.readUTF(); String nickname = in.readUTF(); out.writeUTF("Chat"); + out.writeUTF(ser.getInfo().getName()); out.writeUTF(chatchannel); out.writeUTF(senderName); out.writeUTF(senderUUID); diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java index 6df4d79..765b076 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java @@ -160,7 +160,7 @@ public class ChatListener implements Listener { Calendar currentDate = Calendar.getInstance(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String date = formatter.format(currentDate.getTime()); - plugin.db.writeVentureChat(date, mcp.getUUID().toString(), mcp.getName(), plugin.getServer().getName(), "Messaging_Component", chat.replace("'", "''"), "Chat"); + plugin.db.writeVentureChat(date, mcp.getUUID().toString(), mcp.getName(), "Local", "Messaging_Component", chat.replace("'", "''"), "Chat"); } } return; @@ -196,7 +196,7 @@ public class ChatListener implements Listener { Calendar currentDate = Calendar.getInstance(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String date = formatter.format(currentDate.getTime()); - plugin.db.writeVentureChat(date, mcp.getUUID().toString(), mcp.getName(), plugin.getServer().getName(), "Party_Component", chat.replace("'", "''"), "Chat"); + plugin.db.writeVentureChat(date, mcp.getUUID().toString(), mcp.getName(), "Local", "Party_Component", chat.replace("'", "''"), "Chat"); } return; } @@ -485,14 +485,14 @@ public class ChatListener implements Listener { int hash = event.getHash(); boolean bungee = event.isBungee(); - if(plugin.db != null) { - Calendar currentDate = Calendar.getInstance(); - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String date = formatter.format(currentDate.getTime()); - plugin.db.writeVentureChat(date, mcp.getUUID().toString(), mcp.getName(), plugin.getServer().getName(), channel.getName(), chat.replace("'", "''"), "Chat"); - } - if(!bungee) { + if(plugin.db != null) { + Calendar currentDate = Calendar.getInstance(); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String date = formatter.format(currentDate.getTime()); + plugin.db.writeVentureChat(date, mcp.getUUID().toString(), mcp.getName(), "Local", channel.getName(), chat.replace("'", "''"), "Chat"); + } + if(recipientCount == 1) { if(!plugin.getConfig().getString("emptychannelalert", "&6No one is listening to you.").equals("")) { mcp.getPlayer().sendMessage(Format.FormatStringAll(plugin.getConfig().getString("emptychannelalert", "&6No one is listening to you."))); diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java index c83326f..45e25e5 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java @@ -98,7 +98,7 @@ public class CommandListener implements CommandExecutor, Listener { Calendar currentDate = Calendar.getInstance(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String date = formatter.format(currentDate.getTime()); - plugin.db.writeVentureChat(date, mcp.getUUID().toString(), mcp.getName(), plugin.getServer().getName(), "Command_Component", event.getMessage().replace("'", "''"), "Command"); + plugin.db.writeVentureChat(date, mcp.getUUID().toString(), mcp.getName(), "Local", "Command_Component", event.getMessage().replace("'", "''"), "Command"); } for(Alias a : aa.getAliases()) { @@ -200,7 +200,7 @@ public class CommandListener implements CommandExecutor, Listener { Calendar currentDate = Calendar.getInstance(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String date = formatter.format(currentDate.getTime()); - plugin.db.writeVentureChat(date, "N/A", "Console", plugin.getServer().getName(), "Command_Component", event.getCommand().replace("'", "''") , "Command"); + plugin.db.writeVentureChat(date, "N/A", "Console", "Local", "Command_Component", event.getCommand().replace("'", "''") , "Command"); } }