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

Fix database timeout when not releasing connection. Fix '+' and '*' not

Browse Source 
being escaped properly.
This commit is contained in:
Aust1n46 2020-03-26 12:33:03 -04:00
parent a7ff8e29a3
commit 2e4b748845
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MineverseChat/Messages.yml
View File

@ -1,4 +1,4 @@
Version: 2.18.0 Version: 2.18.1
BlockCommandPlayer: '&cYou have been blocked from entering command {command}.' BlockCommandPlayer: '&cYou have been blocked from entering command {command}.'
BlockCommandSender: '&cBlocked player &6{player} &cfrom entering command {command}.' BlockCommandSender: '&cBlocked player &6{player} &cfrom entering command {command}.'
BlockedCommand: '&cYou are blocked from entering this command: {command}' BlockedCommand: '&cYou are blocked from entering this command: {command}'

2
MineverseChat/bungee.yml
View File

@ -1,4 +1,4 @@
name: VentureChat name: VentureChat
main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee
version: 2.18.0 version: 2.18.1
author: Aust1n46 author: Aust1n46

14
MineverseChat/mineverse/Aust1n46/chat/database/Database.java
View File

@ -20,12 +20,11 @@ public abstract class Database {
public void writeVentureChat(String time, String uuid, String name, String server, String channel, String text, String type) { public void writeVentureChat(String time, String uuid, String name, String server, String channel, String text, String type) {
MineverseChat plugin = MineverseChat.getInstance(); MineverseChat plugin = MineverseChat.getInstance();
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
try { try(final Connection conn = dataSource.getConnection();
final Connection conn = dataSource.getConnection(); final PreparedStatement statement = conn.prepareStatement(
final PreparedStatement statement = conn.prepareStatement( "INSERT INTO VentureChat " +
"INSERT INTO VentureChat " + "(ChatTime, UUID, Name, Server, Channel, Text, Type) " +
"(ChatTime, UUID, Name, Server, Channel, Text, Type) " + "VALUES (?, ?, ?, ?, ?, ?, ?)")) {
"VALUES (?, ?, ?, ?, ?, ?, ?)");
statement.setString(1, time); statement.setString(1, time);
statement.setString(2, uuid); statement.setString(2, uuid);
statement.setString(3, name); statement.setString(3, name);
@ -34,7 +33,8 @@ public abstract class Database {
statement.setString(6, text); statement.setString(6, text);
statement.setString(7, type); statement.setString(7, type);
statement.executeUpdate(); statement.executeUpdate();
} catch(SQLException e) { }
catch(SQLException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
}); });

6
MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java
View File

@ -34,8 +34,8 @@ public class Format {
String prefix = ""; String prefix = "";
String suffix = ""; String suffix = "";
try { try {
prefix = FormatStringAll(MineverseChat.chat.getPlayerPrefix(sender.getPlayer()).replace("|", "")); prefix = FormatStringAll(MineverseChat.chat.getPlayerPrefix(sender.getPlayer()).replace("|", "").replace("+", "").replace("*", ""));
suffix = FormatStringAll(MineverseChat.chat.getPlayerSuffix(sender.getPlayer()).replace("|", "")); suffix = FormatStringAll(MineverseChat.chat.getPlayerSuffix(sender.getPlayer()).replace("|", "").replace("+", "").replace("*", ""));
if(suffix.equals("")) { if(suffix.equals("")) {
suffix = "venturechat_no_suffix_code"; suffix = "venturechat_no_suffix_code";
} }
@ -52,7 +52,7 @@ public class Format {
} }
String nickname = ""; String nickname = "";
if(sender.getPlayer() != null) { if(sender.getPlayer() != null) {
nickname = FormatStringAll(sender.getPlayer().getDisplayName().replace("|", "")); nickname = FormatStringAll(sender.getPlayer().getDisplayName().replace("|", "").replace("+", "").replace("*", ""));
} }
json += convertPlaceholders(f, JSONformat, prefix, nickname, suffix, sender); json += convertPlaceholders(f, JSONformat, prefix, nickname, suffix, sender);
json += "]}"; json += "]}";

2
MineverseChat/plugin.yml
View File

@ -1,5 +1,5 @@
name: VentureChat name: VentureChat
version: 2.18.0 version: 2.18.1
api-version: 1.13 api-version: 1.13
main: mineverse.Aust1n46.chat.MineverseChat main: mineverse.Aust1n46.chat.MineverseChat
depend: [Vault, ProtocolLib, PlaceholderAPI] depend: [Vault, ProtocolLib, PlaceholderAPI]