From 2e4b74884504f0a4669c03eee8ff4953f1408984 Mon Sep 17 00:00:00 2001
From: Aust1n46 <aust1n46@yahoo.com>
Date: Thu, 26 Mar 2020 12:33:03 -0400
Subject: [PATCH] Fix database timeout when not releasing connection.  Fix '+'
 and '*' not being escaped properly.

---
 MineverseChat/Messages.yml                         |  2 +-
 MineverseChat/bungee.yml                           |  2 +-
 .../mineverse/Aust1n46/chat/database/Database.java | 14 +++++++-------
 .../mineverse/Aust1n46/chat/utilities/Format.java  |  6 +++---
 MineverseChat/plugin.yml                           |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/MineverseChat/Messages.yml b/MineverseChat/Messages.yml
index 96b71eb..22c8469 100644
--- a/MineverseChat/Messages.yml
+++ b/MineverseChat/Messages.yml
@@ -1,4 +1,4 @@
-Version: 2.18.0
+Version: 2.18.1
 BlockCommandPlayer: '&cYou have been blocked from entering command {command}.'
 BlockCommandSender: '&cBlocked player &6{player} &cfrom entering command {command}.'
 BlockedCommand: '&cYou are blocked from entering this command: {command}'
diff --git a/MineverseChat/bungee.yml b/MineverseChat/bungee.yml
index 26e0439..c33ef78 100644
--- a/MineverseChat/bungee.yml
+++ b/MineverseChat/bungee.yml
@@ -1,4 +1,4 @@
 name: VentureChat
 main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee
-version: 2.18.0
+version: 2.18.1
 author: Aust1n46
\ No newline at end of file
diff --git a/MineverseChat/mineverse/Aust1n46/chat/database/Database.java b/MineverseChat/mineverse/Aust1n46/chat/database/Database.java
index edbaa24..37b7d0a 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/database/Database.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/database/Database.java
@@ -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) {
 		MineverseChat plugin = MineverseChat.getInstance();
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
-			try {
-				final Connection conn = dataSource.getConnection();
-				final PreparedStatement statement = conn.prepareStatement(
-					"INSERT INTO VentureChat " +
-					"(ChatTime, UUID, Name, Server, Channel, Text, Type) " +
-					"VALUES (?, ?, ?, ?, ?, ?, ?)");
+			try(final Connection conn = dataSource.getConnection();
+					final PreparedStatement statement = conn.prepareStatement(
+							"INSERT INTO VentureChat " + 
+							"(ChatTime, UUID, Name, Server, Channel, Text, Type) " + 
+							"VALUES (?, ?, ?, ?, ?, ?, ?)")) {
 				statement.setString(1, time);
 				statement.setString(2, uuid);
 				statement.setString(3, name);
@@ -34,7 +33,8 @@ public abstract class Database {
 				statement.setString(6, text);
 				statement.setString(7, type);
 				statement.executeUpdate();
-			} catch(SQLException e) {
+			} 
+			catch(SQLException e) {
 				throw new RuntimeException(e);
 			}
 		});
diff --git a/MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java b/MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java
index 5ba326e..4ab1350 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java
@@ -34,8 +34,8 @@ public class Format {
 		String prefix = "";
 		String suffix = "";
 		try {
-			prefix = FormatStringAll(MineverseChat.chat.getPlayerPrefix(sender.getPlayer()).replace("|", ""));
-			suffix = FormatStringAll(MineverseChat.chat.getPlayerSuffix(sender.getPlayer()).replace("|", ""));
+			prefix = FormatStringAll(MineverseChat.chat.getPlayerPrefix(sender.getPlayer()).replace("|", "").replace("+", "").replace("*", ""));
+			suffix = FormatStringAll(MineverseChat.chat.getPlayerSuffix(sender.getPlayer()).replace("|", "").replace("+", "").replace("*", ""));
 			if(suffix.equals("")) {
 				suffix = "venturechat_no_suffix_code";
 			}
@@ -52,7 +52,7 @@ public class Format {
 		}	
 		String nickname = "";
 		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 += "]}";
diff --git a/MineverseChat/plugin.yml b/MineverseChat/plugin.yml
index ef561bb..579cb3d 100644
--- a/MineverseChat/plugin.yml
+++ b/MineverseChat/plugin.yml
@@ -1,5 +1,5 @@
 name: VentureChat
-version: 2.18.0
+version: 2.18.1
 api-version: 1.13
 main: mineverse.Aust1n46.chat.MineverseChat
 depend: [Vault, ProtocolLib, PlaceholderAPI]