Update version number 6.5.2

VotingPlugin/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>votingplugin</artifactId>
-	<version>6.5.1</version>
+	<version>6.5.2</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>

VotingPlugin/src/com/bencodez/votingplugin/bungee/BungeeMySQL.java

@@ -84,7 +84,10 @@ public class BungeeMySQL {
 			Query q = new Query(mysql, "USE " + database + ";");
 			q.executeUpdateAsync();
 		} catch (SQLException e) {
-			e.printStackTrace();
+			bungee.getLogger().severe("Failed to send use database query: " + database + " Error: " + e.getMessage());
+			if (bungee.getConfig().getDebug()) {
+				e.printStackTrace();
+			}
 		}
 		String sql = "CREATE TABLE IF NOT EXISTS " + getName() + " (";
 		sql += "uuid VARCHAR(37),";

VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/BungeeMySQL.java

@@ -82,6 +82,10 @@ public class BungeeMySQL {
 			Query q = new Query(mysql, "USE " + database + ";");
 			q.executeUpdateAsync();
 		} catch (SQLException e) {
+			plugin.getLogger().error("Failed to send use database query: " + database + " Error: " + e.getMessage());
+			if (plugin.getConfig().getDebug()) {
+				e.printStackTrace();
+			}
 			e.printStackTrace();
 		}
 		String sql = "CREATE TABLE IF NOT EXISTS " + getName() + " (";

VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/VotingPluginVelocity.java

@@ -506,6 +506,16 @@ public class VotingPluginVelocity {
 			}
 		}
 
+		try {
+			getVersionFile();
+			if (versionFile != null) {
+				versionFile.delete();
+				versionFile.getParentFile().delete();
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
 		Metrics metrics = metricsFactory.make(this, 11547);
 
 		metrics.addCustomChart(new SimplePie("bungee_method", () -> getConfig().getBungeeMethod().toString()));
@@ -520,15 +530,8 @@ public class VotingPluginVelocity {
 
 		metrics.addCustomChart(new SimplePie("waitforuseronline", () -> "" + getConfig().getWaitForUserOnline()));
 
-		try {
-			getVersionFile();
-			if (versionFile != null) {
-				versionFile.delete();
-				versionFile.getParentFile().delete();
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+		metrics.addCustomChart(new SimplePie("plugin_version", () -> "" + version));
+
 		logger.info("VotingPlugin velocity loaded, method: " + method.toString() + ", PluginMessagingVersion: "
 				+ BungeeVersion.getPluginMessageVersion() + ", Internal Jar Version: " + version);
 	}

VotingPlugin/src/com/bencodez/votingplugin/listeners/PlayerVoteListener.java

@@ -71,6 +71,10 @@ public class PlayerVoteListener implements Listener {
 		}
 
 		VoteSite voteSite = event.getVoteSite();
+		
+		if (voteSite == null) {
+			voteSite = plugin.getVoteSite(plugin.getVoteSiteName(true, event.getServiceSite()), true);
+		}
 
 		// check valid service sites
 		if (voteSite == null) {

VotingPlugin/src/com/bencodez/votingplugin/listeners/VotiferEvent.java

@@ -80,12 +80,12 @@ public class VotiferEvent implements Listener {
 							"Ignoring vote from votifier since pluginmessaging or socket bungee method is enabled, this means you aren't setup correctly for those methods");
 					return;
 				}
-				String voteSiteName = plugin.getVoteSiteName(false, voteSite);
+				String voteSiteNameStr = plugin.getVoteSiteName(false, voteSite);
 
 				ArrayList<String> sites = plugin.getConfigVoteSites().getVoteSitesNames(false);
 				boolean createSite = false;
 				if (sites != null) {
-					if (!sites.contains(voteSiteName)) {
+					if (!sites.contains(voteSiteNameStr)) {
 						createSite = true;
 					}
 				} else {
@@ -93,15 +93,17 @@ public class VotiferEvent implements Listener {
 				}
 
 				if (plugin.getConfigFile().isAutoCreateVoteSites() && createSite) {
-					plugin.getLogger().warning("VoteSite with service site '" + voteSiteName
+					plugin.getLogger().warning("VoteSite with service site '" + voteSiteNameStr
 							+ "' does not exist, attempting to generaterate...");
-					plugin.getConfigVoteSites().generateVoteSite(voteSiteName);
+					plugin.getConfigVoteSites().generateVoteSite(voteSiteNameStr);
 
 					plugin.getLogger().info("Current known service sites: "
 							+ ArrayUtils.getInstance().makeStringList(plugin.getServerData().getServiceSites()));
 				}
 
-				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName, false), voteUsername,
+				String voteSiteName = plugin.getVoteSiteName(true, voteSite);
+
+				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName, true), voteUsername,
 						voteSite, true);
 				plugin.getServer().getPluginManager().callEvent(voteEvent);