Update version number to 6.3.3

README.md

@@ -8,10 +8,23 @@ https://www.spigotmc.org/resources/votingplugin.15358/
 
 ## License
 ### Creative Commons Arttribution 3.0 Unported
-https://github.com/Ben12345rocks/VotingPlugin/blob/master/VotingPlugin/Resources/LICENSE.txt
+https://github.com/BenCodez/VotingPlugin/blob/master/VotingPlugin/Resources/LICENSE.txt
 
 ### Maven:
 
+    <repository>
+	    <id>BenCodez Repo</id>
+	    <url>https://nexus.bencodez.com/repository/maven-public/</url>
+    </repository>
+
+    <dependency>
+        <groupId>com.bencodez</groupId>
+	    <artifactId>votingplugin</artifactId>
+	    <version>LATEST</version>
+	    <scope>provided</scope>
+    </dependency>
+
+    BACKUP/OLD WAY
     <repository>
         <id>jitpack.io</id>
         <url>https://jitpack.io</url>
@@ -26,6 +39,5 @@ https://github.com/Ben12345rocks/VotingPlugin/blob/master/VotingPlugin/Resources
   
   Versions:  
   LATEST - latest stable release  
-  BRANCH-SNAPHSOT - unstable builds  
  
     

VotingPlugin/.classpath

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="Resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

VotingPlugin/.gitignore

@@ -1,3 +1,7 @@
 /bin/
 /target/
-/doc/
+/doc/
+/.idea/
+/*.iml
+/.settings/
+/.classpath

VotingPlugin/.settings/net.sf.jautodoc.prefs

@@ -1,7 +0,0 @@
-add_todo=false
-eclipse.preferences.version=1
-include_subpackages=true
-mode=mode_replace
-project_specific_settings=true
-replacements=<?xml version\="1.0" standalone\="yes"?>\n\n<replacements>\n<replacement key\="get" scope\="1" mode\="0">Gets the</replacement>\n<replacement key\="set" scope\="1" mode\="0">Sets the</replacement>\n<replacement key\="add" scope\="1" mode\="0">Adds the</replacement>\n<replacement key\="edit" scope\="1" mode\="0">Edits the</replacement>\n<replacement key\="remove" scope\="1" mode\="0">Removes the</replacement>\n<replacement key\="init" scope\="1" mode\="0">Inits the</replacement>\n<replacement key\="parse" scope\="1" mode\="0">Parses the</replacement>\n<replacement key\="create" scope\="1" mode\="0">Creates the</replacement>\n<replacement key\="build" scope\="1" mode\="0">Builds the</replacement>\n<replacement key\="is" scope\="1" mode\="0">Checks if is</replacement>\n<replacement key\="print" scope\="1" mode\="0">Prints the</replacement>\n<replacement key\="has" scope\="1" mode\="0">Checks for</replacement>\n</replacements>\n\n
-use_internal_formatter=true

VotingPlugin/.settings/org.eclipse.core.resources.prefs

@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=Cp1252
-encoding/Resources=Cp1252
-encoding/src=Cp1252

VotingPlugin/.settings/org.eclipse.jdt.core.prefs

@@ -1,30 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=disabled
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8

VotingPlugin/.settings/org.eclipse.ltk.core.refactoring.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

VotingPlugin/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=dev
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

VotingPlugin/.settings/org.eclipse.mylyn.tasks.ui.prefs

@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-project.repository.kind=github
-project.repository.url=http\://github.com/Ben12345rocks/VotingPlugin

VotingPlugin/.settings/org.eclipse.wst.validation.prefs

@@ -1,8 +0,0 @@
-DELEGATES_PREFERENCE=delegateValidatorList
-USER_BUILD_PREFERENCE=enabledBuildValidatorList
-USER_MANUAL_PREFERENCE=enabledManualValidatorList
-USER_PREFERENCE=overrideGlobalPreferencesfalse
-eclipse.preferences.version=1
-override=false
-suspend=false
-vf.version=3

VotingPlugin/.settings/org.jboss.ide.eclipse.as.core.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.jboss.ide.eclipse.as.core.singledeployable.deployableList=\n

VotingPlugin/Resources/BungeeSettings.yml

@@ -29,6 +29,10 @@ BungeeBroadcast: false
 # Whether to broadcast on cached votes
 BungeeBroadcastAlways: false
 
+# If true, the server won't broadcast votes
+# To be used in conjuction with Broadcast setting on bungee
+DisableBroadcast: false
+
 # If true, offline rewards will be stored per server, rather than global
 # This shouldn't need to be set unless you get alot of cross server rewards issues
 # You can also specify the server within the rewards

VotingPlugin/Resources/Config.yml

@@ -27,35 +27,12 @@ MySQL:
   # Affecting this value may affect performance
   MaxSize: -1
   # Table name prefix, for use with mutliple servers
+  # Don't use with PLUGINMESSAGING bungee setup
   Prefix: ''
   #UseSSL: true
   #PublicKeyRetrieval: false
   #Additional info on connection string
   #Line: ''
-  
-# ---------------------------------------------------------
-# Mysql cache options 
-# Clearing cache forces the plugin to pull from database
-# Not needed unless you are using multiple servers
-# If using a bungee setup most of these options are overriden automatically
-# ---------------------------------------------------------
-
-# Clear cache on update, setting to true reduces update speed
-# Also may require AlwaysUpdate set to true
-ClearCacheOnUpdate: false
-
-# Clear cache on player join always
-ClearCacheOnJoin: false
-
-# Clears cache for the player who voted only
-# Only effects if using mysql
-# Would recommend for some bungee setups
-ClearCacheOnVote: false
-
-# Clear cache when player leaves
-ClearCacheOnLeave: false
-
-ClearCacheOnVoteShopPurchase: true
 
 # --------------------
 # AllowUnJoined options
@@ -375,7 +352,7 @@ LoadTopVoter:
   
 # Maxium number of players to show on top voter
 # Set to -1 for no limit
-MaxiumNumberOfTopVotersToLoad: -1
+MaxiumNumberOfTopVotersToLoad: 1000
 
 # When top voter awards are given (even if there are none listed) it will store top voters
 # Files will created in TopVoters folder.
@@ -577,7 +554,8 @@ LoadCommandAliases: true
 # Requires AuthMe
 WaitUntilLoggedIn: true
 
-# Preload skulls to improve performance
+# Preload skulls to improve performance for vote top
+# when using skulls as the item to display players
 # If false, skulls will be cached as they are used
 # assuming loadskulls is enabled
 PreloadSkulls: false
@@ -601,6 +579,7 @@ GeyserPrefixSupport: false
 GeyserPrefix: '*'
 
 # Enable to true for extra player checks
+# Recommend leaving this to false
 ExtraBackgroundUpdate: false
 
 # This will prevent spam clicking GUI's to prevent exploits

VotingPlugin/Resources/GUI.yml

@@ -12,6 +12,7 @@ GUIMethod:
   Last: CHEST #BOOK not available (future update?)
   Next: CHEST 
   Total: CHEST #BOOK not available (future update?)
+  # GUI for /vote
   URL: CHEST
   Best: CHEST #BOOK not available (future update?)
   Streak: CHEST #BOOK not available (future update?)
@@ -119,6 +120,7 @@ CHEST:
       Material: 'EMERALD_BLOCK'
       Data: 0
       Amount: 1
+    # URL when clicking item in /vote (GUI version)
     URLText: '%VoteUrl%'
     # #Add Extra items
     # ExtraItems:

VotingPlugin/Resources/SpecialRewards.yml

@@ -55,7 +55,7 @@ VoteParty:
   GiveAllPlayers: false
   # If true, give online players the vote party reward
   # Can also use RewardType: ONLINE if you wanted
-  GiveOnlinePlayersOnly: false
+  GiveOnlinePlayersOnly: true
   # If true, the vote count will reset each day
   ResetEachDay: false
   # If true, the vote count will reset each week
@@ -145,8 +145,10 @@ VoteStreak:
     Week: 50
     Month: 50
     
-# Reward given when vote cooldown ended
-# Using this is a little memory intensive
+# Reward given when all votesites are available to vote on
+# Don't use this unless you really need it
+# Little performance intensive
+# Recommend add RewardType: ONLINE for it to only work online
 VoteCoolDownEndedReward: []
 
 # ONLY USE THIS FOR TITLES/SOUNDS AND OTHER EFFECTS

VotingPlugin/Resources/bungeeconfig.yml

@@ -25,13 +25,13 @@ Debug: false
 # If false, will send to online server only
 SendVotesToAllServers: true
 # List of servers the plugin won't send the vote to
-# Uses names from bungeecoord config if not using SOCKETS method
+# Uses names from bungeecoord config, only needed for non SOCKETS setup
 BlockedServers:
 - hub
 
 # What type of bungee setup
 # Requires restart and set on all servers
-# https://github.com/Ben12345rocks/VotingPlugin/wiki/Bungeecoord-Setups
+# https://github.com/BenCodez/VotingPlugin/wiki/Bungeecoord-Setups
 # Available:
 # SOCKETS 
 # PLUGINMESSAGING 
@@ -43,6 +43,7 @@ BungeeMethod: PLUGINMESSAGING
 # This requires spigot servers AllowUnJoined to be set to true in Config.yml
 AllowUnJoined: false
 
+# Points to give on vote
 PointsOnVote: 1
 
 # If true, bungee will handle adding totals
@@ -51,22 +52,23 @@ PointsOnVote: 1
 # Recommened to leave true, setting to false setups are currently unsupported
 BungeeManageTotals: true
 
+# Tell servers to broadcast
+# Set DisableBroadcast to true on spigot servers (BungeeSettings.yml) as well
+Broadcast: true
+
 # ----------------------------
 # PLUGINMESSAGING Settings
 # ----------------------------
 
-# Applies to PLUGINMESSAGING & when SendVotesToAllServers is true
+# Applies to PLUGINMESSAGING only
 # Votes will be forwarded when specific player is online
 WaitForUserOnline: false
 
 # ----------------------------
-# SOCKET Settings, do not touch otherwise
+# SOCKET Settings
+# ONLY for SOCKET method
 # ----------------------------
 
-# Tell servers to broadcast
-# For socket method
-Broadcast: true
-
 # Server to send vote to if player is offline
 FallBackServer: factions
 

VotingPlugin/Resources/votingpluginversion.yml

@@ -1,2 +1,4 @@
 time: '${timestamp}'
-profile: ${build.profile.id}
+profile: '${build.profile.id}'
+version: '${project.version}'
+buildnumber: '${build.number}'

VotingPlugin/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>votingplugin</artifactId>
-	<version>6.5</version>
+	<version>6.6.3</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -12,6 +12,7 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<github.global.server>github</github.global.server>
 		<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
+		<build.number>NOTSET</build.number>
 	</properties>
 	<build>
 		<resources>
@@ -210,7 +211,7 @@
 		</repository>
 		<repository>
 			<id>bencodez repo</id>
-			<url>http://51.161.110.19:8081/repository/maven-releases/</url>
+			<url>https://nexus.bencodez.com/repository/maven-public/</url>
 		</repository>
 	</repositories>
 	<dependencies>
@@ -236,15 +237,13 @@
 			<groupId>com.vexsoftware</groupId>
 			<artifactId>nuvotifier-universal</artifactId>
 			<version>2.7.2</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/Jars/nuvotifier.jar</systemPath>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>be.maximvdw</groupId>
-			<artifactId>MVdWPlaceholderAPI</artifactId>
-			<version>LATEST</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/Jars/MVdWPlaceholderAPI.jar</systemPath>
+			<artifactId>mvdwplaceholderapi</artifactId>
+			<version>3.1.1</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.velocitypowered</groupId>
@@ -286,7 +285,7 @@
 		<profile>
 			<id>prod2</id>
 			<properties>
-				<build.profile.id>prod</build.profile.id>
+				<build.profile.id>prod2</build.profile.id>
 			</properties>
 			<distributionManagement>
 				<repository>
@@ -295,20 +294,11 @@
 					<url>file://${project.build.directory}/mvn-repo</url>
 				</repository>
 			</distributionManagement>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<repositories>
-				<repository>
-					<id>jitpack.io</id>
-					<url>https://jitpack.io</url>
-				</repository>
-			</repositories>
 			<dependencies>
 				<dependency>
-					<groupId>com.github.bencodez</groupId>
+					<groupId>com.bencodez</groupId>
 					<artifactId>advancedcore</artifactId>
-					<version>master-SNAPSHOT</version>
+					<version>LATEST</version>
 					<scope>compile</scope>
 				</dependency>
 			</dependencies>
@@ -343,11 +333,11 @@
 			<distributionManagement>
 				<snapshotRepository>
 					<id>nexus</id>
-					<url>http://51.161.110.19:8081/repository/maven-snapshots/</url>
+					<url>https://nexus.bencodez.com/repository/maven-snapshots/</url>
 				</snapshotRepository>
 				<repository>
 					<id>nexus</id>
-					<url>http://51.161.110.19:8081/repository/maven-releases</url>
+					<url>https://nexus.bencodez.com/repository/maven-releases/</url>
 				</repository>
 			</distributionManagement>
 			<build>
@@ -392,7 +382,7 @@
 						</executions>
 						<configuration>
 							<serverId>nexus</serverId>
-							<nexusUrl>http://51.161.110.19:8081/nexus/</nexusUrl>
+							<nexusUrl>https://nexus.bencodez.com/nexus/</nexusUrl>
 							<skipStaging>true</skipStaging>
 						</configuration>
 					</plugin>

VotingPlugin/src/com/bencodez/votingplugin/BungeeHandler.java

@@ -53,6 +53,8 @@ public class BungeeHandler {
 		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
 			plugin.registerBungeeChannels("vp:vp");
 
+			plugin.getPluginMessaging().setDebug(true);
+
 			plugin.getPluginMessaging().add(new PluginMessageHandler("Vote") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
@@ -79,20 +81,33 @@ public class BungeeHandler {
 
 						user.clearCache();
 
-						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline);
-						if (plugin.getBungeeSettings().isPerServerPoints()) {
-							user.addPoints(plugin.getConfigFile().getPointsOnVote());
+						boolean broadcast = true;
+						boolean bungeeBroadcast = false;
+
+						if (args.size() > 9) {
+							bungeeBroadcast = Boolean.valueOf(args.get(9));
 						}
 
-						if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
-							if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-								VoteSite site = plugin.getVoteSite(service);
-								if (site != null) {
-									site.broadcastVote(user, false);
-								} else {
-									plugin.getLogger().warning("No votesite for " + service);
+						if (!bungeeBroadcast) {
+							if (!plugin.getBungeeSettings().isBungeeBroadcast()
+									&& !plugin.getBungeeSettings().isDisableBroadcast()) {
+								if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
+									VoteSite site = plugin.getVoteSite(service, true);
+									if (site != null) {
+										site.broadcastVote(user, false);
+										broadcast = false;
+									} else {
+										plugin.getLogger().warning("No votesite for " + service);
+									}
 								}
 							}
+						} else {
+							broadcast = false;
+						}
+
+						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline, broadcast);
+						if (plugin.getBungeeSettings().isPerServerPoints()) {
+							user.addPoints(plugin.getConfigFile().getPointsOnVote());
 						}
 
 						if (Boolean.valueOf(args.get(5))) {
@@ -133,17 +148,34 @@ public class BungeeHandler {
 
 						boolean wasOnline = Boolean.valueOf(args.get(4));
 
-						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline);
+						boolean broadcast = true;
+						boolean bungeeBroadcast = false;
 
-						if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
-							if (Boolean.valueOf(args.get(4)) || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-								VoteSite site = plugin.getVoteSite(service);
-								if (site != null) {
-									site.broadcastVote(user, false);
-								} else {
-									plugin.getLogger().warning("No votesite for " + service);
+						if (args.size() > 9) {
+							bungeeBroadcast = Boolean.valueOf(args.get(9));
+						}
+
+						if (!bungeeBroadcast) {
+							if (!plugin.getBungeeSettings().isBungeeBroadcast()
+									&& !plugin.getBungeeSettings().isDisableBroadcast()) {
+								if (Boolean.valueOf(args.get(4))
+										|| plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
+									VoteSite site = plugin.getVoteSite(service, true);
+									if (site != null) {
+										site.broadcastVote(user, false);
+										broadcast = false;
+									} else {
+										plugin.getLogger().warning("No votesite for " + service);
+									}
 								}
 							}
+						} else {
+							broadcast = false;
+						}
+
+						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline, broadcast);
+						if (plugin.getBungeeSettings().isPerServerPoints()) {
+							user.addPoints(plugin.getConfigFile().getPointsOnVote());
 						}
 
 						if (Boolean.valueOf(args.get(5))) {
@@ -172,14 +204,17 @@ public class BungeeHandler {
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteBroadcast") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					String uuid = args.get(0);
-					String service = args.get(1);
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-					VoteSite site = plugin.getVoteSite(service);
-					if (site != null) {
-						site.broadcastVote(user, false);
-					} else {
-						plugin.getLogger().warning("No votesite for " + service);
+					if (args.size() > 2) {
+						String uuid = args.get(0);
+						String service = args.get(2);
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
+								args.get(1));
+						VoteSite site = plugin.getVoteSite(service, true);
+						if (site != null) {
+							site.broadcastVote(user, false);
+						} else {
+							plugin.getLogger().warning("No votesite for " + service);
+						}
 					}
 				}
 			});
@@ -259,7 +294,7 @@ public class BungeeHandler {
 				@Override
 				public void onReceive(String[] data) {
 					if (data.length > 2) {
-						VoteSite site = plugin.getVoteSite(data[1]);
+						VoteSite site = plugin.getVoteSite(data[1], true);
 						String p = data[3];
 						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(p);
 						if (site != null) {

VotingPlugin/src/com/bencodez/votingplugin/VotingPluginMain.java

@@ -14,8 +14,10 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TimerTask;
+import java.util.UUID;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -48,9 +50,8 @@ import com.bencodez.advancedcore.api.rewards.injected.RewardInject;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInjectConfigurationSection;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInjectInt;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInjectValidator;
+import com.bencodez.advancedcore.api.skull.SkullHandler;
 import com.bencodez.advancedcore.api.updater.Updater;
-import com.bencodez.advancedcore.api.user.UUID;
-import com.bencodez.advancedcore.api.user.UserStorage;
 import com.bencodez.advancedcore.logger.Logger;
 import com.bencodez.advancedcore.nms.NMSManager;
 import com.bencodez.votingplugin.broadcast.BroadcastHandler;
@@ -81,6 +82,7 @@ import com.bencodez.votingplugin.signs.Signs;
 import com.bencodez.votingplugin.specialrewards.SpecialRewards;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.topvoter.TopVoterHandler;
+import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
 import com.bencodez.votingplugin.updater.CheckUpdate;
 import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -133,7 +135,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	private GUI gui;
 
 	@Getter
-	private LinkedHashMap<VotingPluginUser, Integer> lastMonthTopVoter;
+	private LinkedHashMap<TopVoterPlayer, Integer> lastMonthTopVoter;
 
 	@Getter
 	private MVdWPlaceholders mvdwPlaceholders;
@@ -144,6 +146,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	@Getter
 	private String profile = "";
 
+	@Getter
+	private String buildNumber = "NOTSET";
+
 	@Getter
 	private ServerData serverData;
 
@@ -161,7 +166,8 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	private String time = "";
 
 	@Getter
-	private LinkedHashMap<TopVoter, LinkedHashMap<VotingPluginUser, Integer>> topVoter;
+	@Setter
+	private LinkedHashMap<TopVoter, LinkedHashMap<TopVoterPlayer, Integer>> topVoter;
 
 	@Getter
 	private TopVoterHandler topVoterHandler;
@@ -194,13 +200,17 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	private List<VoteSite> voteSites;
 
 	@Getter
-	private LinkedHashMap<VotingPluginUser, HashMap<VoteSite, LocalDateTime>> voteToday;
+	@Setter
+	private LinkedHashMap<TopVoterPlayer, HashMap<VoteSite, LocalDateTime>> voteToday;
 
 	private boolean votifierLoaded = true;
 
 	@Getter
 	private boolean ymlError = false;
 
+	@Getter
+	private UserManager votingPluginUserManager;
+
 	private void addDirectlyDefinedRewards(DirectlyDefinedReward directlyDefinedReward) {
 		RewardHandler.getInstance().addDirectlyDefined(directlyDefinedReward);
 	}
@@ -250,8 +260,8 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 	}
 
-	public ArrayList<VotingPluginUser> convertSet(Set<VotingPluginUser> set) {
-		return new ArrayList<VotingPluginUser>(set);
+	public ArrayList<TopVoterPlayer> convertSet(Set<TopVoterPlayer> set) {
+		return new ArrayList<TopVoterPlayer>(set);
 	}
 
 	@Override
@@ -259,7 +269,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		return configFile.getData();
 	}
 
-	public LinkedHashMap<VotingPluginUser, Integer> getTopVoter(TopVoter top) {
+	public LinkedHashMap<TopVoterPlayer, Integer> getTopVoter(TopVoter top) {
 		return topVoter.get(top);
 	}
 
@@ -301,14 +311,8 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		return null;
 	}
 
-	/**
-	 * Gets the vote site.
-	 *
-	 * @param site the site name
-	 * @return the vote site
-	 */
-	public VoteSite getVoteSite(String site) {
-		String siteName = getVoteSiteName(site);
+	public VoteSite getVoteSite(String site, boolean checkEnabled) {
+		String siteName = getVoteSiteName(checkEnabled, site);
 		for (VoteSite voteSite : getVoteSites()) {
 			if (voteSite.getKey().equalsIgnoreCase(siteName) || voteSite.getDisplayName().equals(siteName)) {
 				return voteSite;
@@ -322,14 +326,8 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	}
 
-	/**
-	 * Gets the vote site name.
-	 *
-	 * @param urls the url
-	 * @return the vote site name
-	 */
-	public String getVoteSiteName(String... urls) {
-		ArrayList<String> sites = getConfigVoteSites().getVoteSitesNames(false);
+	public String getVoteSiteName(boolean checkEnabled, String... urls) {
+		ArrayList<String> sites = getConfigVoteSites().getVoteSitesNames(checkEnabled);
 		for (String url : urls) {
 			if (url == null) {
 				return null;
@@ -380,12 +378,8 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	}
 
-	public UserManager getVotingPluginUserManager() {
-		return UserManager.getInstance();
-	}
-
 	public boolean hasVoteSite(String site) {
-		String siteName = getVoteSiteName(site);
+		String siteName = getVoteSiteName(false, site);
 		for (VoteSite voteSite : getVoteSites()) {
 			if (voteSite.getKey().equalsIgnoreCase(siteName) || voteSite.getDisplayName().equals(siteName)) {
 				return true;
@@ -871,8 +865,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					}
 				}, 1000, 1000 * 60 * configFile.getDelayBetweenUpdates());
 
-				coolDownCheck.load();
-
 				getTimer().schedule(new TimerTask() {
 
 					@Override
@@ -895,6 +887,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		if (conf != null) {
 			time = conf.getString("time", "");
 			profile = conf.getString("profile", "");
+			buildNumber = conf.getString("buildnumber", "NOTSET");
 		}
 	}
 
@@ -962,6 +955,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		specialRewards = new SpecialRewards(this);
 		signs = new Signs(this);
 
+		coolDownCheck.checkEnabled();
+		coolDownCheck.load();
+
 		Bukkit.getScheduler().runTask(plugin, new Runnable() {
 
 			@Override
@@ -971,7 +967,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		});
 
 		topVoterHandler = new TopVoterHandler(this);
-		lastMonthTopVoter = new LinkedHashMap<VotingPluginUser, Integer>();
+		lastMonthTopVoter = new LinkedHashMap<TopVoterPlayer, Integer>();
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 			@Override
@@ -980,11 +976,11 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 				debug("Loaded last month top voters");
 			}
 		});
-		topVoter = new LinkedHashMap<TopVoter, LinkedHashMap<VotingPluginUser, Integer>>();
+		topVoter = new LinkedHashMap<TopVoter, LinkedHashMap<TopVoterPlayer, Integer>>();
 		for (TopVoter top : TopVoter.values()) {
-			topVoter.put(top, new LinkedHashMap<VotingPluginUser, Integer>());
+			topVoter.put(top, new LinkedHashMap<TopVoterPlayer, Integer>());
 		}
-		voteToday = new LinkedHashMap<VotingPluginUser, HashMap<VoteSite, LocalDateTime>>();
+		voteToday = new LinkedHashMap<TopVoterPlayer, HashMap<VoteSite, LocalDateTime>>();
 		voteLog = new Logger(plugin, new File(plugin.getDataFolder() + File.separator + "Log", "votelog.txt"));
 
 		new AdminGUI(this).loadHook();
@@ -1018,36 +1014,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			mvdwPlaceholders.loadMVdWPlaceholders();
 		}
 
-		// set columns
-		if (getStorageType().equals(UserStorage.MYSQL) && configFile.isAlterColumns()) {
-			getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
-			getMysql().alterColumnType("CheckWorld", "VARCHAR(5)");
-			getMysql().alterColumnType("Reminded", "VARCHAR(5)");
-			getMysql().alterColumnType("DisableBroadcast", "VARCHAR(5)");
-			getMysql().alterColumnType("LastOnline", "VARCHAR(20)");
-			getMysql().alterColumnType("PlayerName", "VARCHAR(30)");
-			getMysql().alterColumnType("DailyTotal", "INT DEFAULT '0'");
-			getMysql().alterColumnType("WeeklyTotal", "INT DEFAULT '0'");
-			getMysql().alterColumnType("DayVoteStreak", "INT DEFAULT '0'");
-			getMysql().alterColumnType("BestDayVoteStreak", "INT DEFAULT '0'");
-			getMysql().alterColumnType("WeekVoteStreak", "INT DEFAULT '0'");
-			getMysql().alterColumnType("BestWeekVoteStreak", "INT DEFAULT '0'");
-			getMysql().alterColumnType("VotePartyVotes", "INT DEFAULT '0'");
-			getMysql().alterColumnType("MonthVoteStreak", "INT DEFAULT '0'");
-			getMysql().alterColumnType("Points", "INT DEFAULT '0'");
-			getMysql().alterColumnType("HighestDailyTotal", "INT DEFAULT '0'");
-			getMysql().alterColumnType("AllTimeTotal", "INT DEFAULT '0'");
-			getMysql().alterColumnType("HighestMonthlyTotal", "INT DEFAULT '0'");
-			getMysql().alterColumnType("MilestoneCount", "INT DEFAULT '0'");
-			getMysql().alterColumnType("MonthTotal", "INT DEFAULT '0'");
-			getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
-			getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
-			getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
-			getMysql().alterColumnType("DayVoteStreakLastUpdate", "MEDIUMTEXT");
-			if (getOptions().isPerServerRewards()) {
-				getMysql().alterColumnType("OfflineRewards" + getOptions().getServer(), "MEDIUMTEXT");
-			}
-		}
 		// Add rewards
 		RewardHandler.getInstance().addInjectedReward(new RewardInjectInt("Points", 0) {
 
@@ -1111,7 +1077,8 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		plugin.getLogger().info("Enabled VotingPlugin " + plugin.getDescription().getVersion());
 		if (getProfile().contains("dev")) {
-			plugin.getLogger().warning("Using dev build, this is not a stable build, use at your own risk");
+			plugin.getLogger().warning(
+					"Using dev build, this is not a stable build, use at your own risk. Build number: " + buildNumber);
 		}
 
 		boolean hasRewards = RewardHandler.getInstance().hasRewards(getConfigVoteSites().getData(),
@@ -1178,6 +1145,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		loadVoteSites();
 
+		votingPluginUserManager = UserManager.getInstance();
+		votingPluginUserManager.addCachingKeys();
+
 		setJenkinsSite("bencodez.com");
 		updateAdvancedCoreHook();
 
@@ -1304,6 +1274,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		placeholders.load();
 
 		voteReminding.loadRemindChecking();
+		coolDownCheck.checkEnabled();
 
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
@@ -1335,12 +1306,8 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		checkYMLError();
 
 		plugin.debug("Loaded Files");
-
 	}
 
-	/**
-	 * Update.
-	 */
 	public void update() {
 		if (update || configFile.isAlwaysUpdate()) {
 			if (!updateStarted && plugin != null) {
@@ -1349,48 +1316,95 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					update = false;
 
 					synchronized (plugin) {
-						if (getStorageType().equals(UserStorage.MYSQL)) {
-							if (getMysql() == null) {
-								plugin.debug("MySQL not loaded yet");
-								return;
-							} else if (configFile.isClearCacheOnUpdate() || bungeeSettings.isUseBungeecoord()) {
-								getMysql().clearCache();
-							} else {
-								getMysql().clearCacheBasic();
-							}
-						}
+						getUserManager().getDataManager().clearCacheBasic();
 
-						plugin.debug("Starting background task");
-						long time = System.currentTimeMillis();
+						plugin.debug("Starting background task, current cached users: "
+								+ plugin.getUserManager().getDataManager().getUserDataCache().keySet().size());
 						try {
+							boolean extraBackgroundUpdate = configFile.isExtraBackgroundUpdate();
+							long startTime = System.currentTimeMillis();
+
+							LinkedHashMap<TopVoterPlayer, HashMap<VoteSite, LocalDateTime>> voteToday = new LinkedHashMap<TopVoterPlayer, HashMap<VoteSite, LocalDateTime>>();
+							LinkedHashMap<TopVoter, LinkedHashMap<TopVoterPlayer, Integer>> tempTopVoter = new LinkedHashMap<TopVoter, LinkedHashMap<TopVoterPlayer, Integer>>();
+
+							ArrayList<TopVoter> topVotersToCheck = new ArrayList<TopVoter>();
+							for (TopVoter top : TopVoter.values()) {
+								if (plugin.getConfigFile().getLoadTopVoter(top)) {
+									topVotersToCheck.add(top);
+									tempTopVoter.put(top, new LinkedHashMap<TopVoterPlayer, Integer>());
+								}
+							}
+							boolean topVoterIgnorePermissionUse = plugin.getConfigFile().getTopVoterIgnorePermission();
+							ArrayList<String> blackList = plugin.getConfigFile().getBlackList();
+
 							ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
-							ArrayList<VotingPluginUser> users = new ArrayList<VotingPluginUser>();
+							int currentDay = LocalDateTime.now().getDayOfMonth();
 							for (String uuid : uuids) {
 								if (uuid != null && !uuid.isEmpty()) {
 									VotingPluginUser user = UserManager.getInstance()
-											.getVotingPluginUser(new UUID(uuid));
-									users.add(user);
-									// extraDebug("Loading " + uuid);
-									// java.lang.Thread.sleep(5000);
+											.getVotingPluginUser(UUID.fromString(uuid), false);
+									user.dontCache();
+									user.tempCache();
+									user.getUserData().updateCacheWithTemp();
+									if (!user.isBanned() && !blackList.contains(user.getPlayerName())) {
+
+										if (!topVoterIgnorePermissionUse || !user.isTopVoterIgnore()) {
+											for (TopVoter top : topVotersToCheck) {
+												int total = user.getTotal(top);
+												if (total > 0) {
+													tempTopVoter.get(top).put(user.getTopVoterPlayer(), total);
+												}
+											}
+										}
+
+										HashMap<VoteSite, LocalDateTime> times = new HashMap<VoteSite, LocalDateTime>();
+										for (Entry<VoteSite, Long> entry : user.getLastVotes().entrySet()) {
+											if (entry.getKey().isEnabled() && !entry.getKey().isHidden()) {
+												long time = entry.getValue();
+												if ((currentDay == MiscUtils.getInstance().getDayFromMili(time))
+														&& (LocalDateTime.now().getMonthValue() == MiscUtils
+																.getInstance().getMonthFromMili(time))
+														&& (LocalDateTime.now().getYear() == MiscUtils.getInstance()
+																.getYearFromMili(time))) {
+
+													times.put(entry.getKey(), LocalDateTime.ofInstant(
+															Instant.ofEpochMilli(time), ZoneId.systemDefault()));
+												}
+											}
+										}
+										if (times.keySet().size() > 0) {
+											voteToday.put(user.getTopVoterPlayer(), times);
+										}
+									}
+									if (!extraBackgroundUpdate) {
+										if (user.isOnline()) {
+											user.offVote();
+										}
+									}
+									user.clearTempCache();
+									user = null;
 								}
 							}
 							update = false;
-							long time1 = ((System.currentTimeMillis() - time) / 1000);
-							plugin.debug("Finished loading player data in " + time1 + " seconds, " + users.size()
-									+ " users");
-							topVoterHandler.updateTopVoters(users);
-							updateVoteToday(users);
+							long time1 = ((System.currentTimeMillis() - startTime) / 1000);
+							plugin.debug("Finished loading player data in " + time1 + " seconds, " + uuids.size()
+									+ " users, " + plugin.getStorageType().toString());
+							time1 = System.currentTimeMillis();
+
+							topVoterHandler.updateTopVoters(tempTopVoter);
+							setVoteToday(voteToday);
 							serverData.updateValues();
 							getSigns().updateSigns();
 
-							if (!configFile.isExtraBackgroundUpdate()) {
-								for (Player player : Bukkit.getOnlinePlayers()) {
-									VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-									user.offVote();
-								}
-							}
-							time1 = ((System.currentTimeMillis() - time) / 1000);
-							plugin.debug("Background task finished in " + time1 + " seconds");
+							tempTopVoter = null;
+
+							time1 = ((System.currentTimeMillis() - time1) / 1000);
+							long totalTime = ((System.currentTimeMillis() - startTime) / 1000);
+							plugin.debug("Background task finished. Final processing took " + time1
+									+ " seconds. Total time: " + totalTime + " seconds");
+							plugin.extraDebug("Current cached users: "
+									+ plugin.getUserManager().getDataManager().getUserDataCache().keySet().size());
+							checkFirstTimeLoaded();
 						} catch (Exception ex) {
 							plugin.getLogger().info("Looks like something went wrong");
 							ex.printStackTrace();
@@ -1403,39 +1417,34 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 	}
 
+	private boolean firstTimeLoaded = false;
+
+	public void checkFirstTimeLoaded() {
+		if (!firstTimeLoaded) {
+			if (getGui().isChestVoteTopUseSkull()) {
+				int maxToLoad = 200;
+				for (TopVoter top : topVoter.keySet()) {
+					int num = 1;
+					Set<TopVoterPlayer> players = topVoter.get(top).keySet();
+					for (TopVoterPlayer p : players) {
+						if (num <= maxToLoad) {
+							SkullHandler.getInstance().loadSkull(p.getPlayerName());
+						}
+						num++;
+					}
+				}
+			}
+		}
+		firstTimeLoaded = true;
+	}
+
 	public void updateAdvancedCoreHook() {
 		getJavascriptEngine().put("VotingPlugin", this);
 		allowDownloadingFromSpigot(15358);
 		setConfigData(configFile.getData());
 		if (bungeeSettings.isUseBungeecoord()) {
-			getOptions().setClearCacheOnJoin(true);
 			getOptions().setPerServerRewards(getBungeeSettings().isPerServerRewards());
 		}
 	}
 
-	public void updateVoteToday(ArrayList<VotingPluginUser> users) {
-		plugin.getVoteToday().clear();
-
-		for (VotingPluginUser user : users) {
-			HashMap<VoteSite, LocalDateTime> times = new HashMap<VoteSite, LocalDateTime>();
-			for (VoteSite voteSite : plugin.getVoteSites()) {
-				if (!voteSite.isHidden()) {
-					long time = user.getTime(voteSite);
-					if ((LocalDateTime.now().getDayOfMonth() == MiscUtils.getInstance().getDayFromMili(time))
-							&& (LocalDateTime.now().getMonthValue() == MiscUtils.getInstance().getMonthFromMili(time))
-							&& (LocalDateTime.now().getYear() == MiscUtils.getInstance().getYearFromMili(time))) {
-
-						times.put(voteSite,
-								LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault()));
-					}
-				}
-			}
-			if (times.keySet().size() > 0) {
-				plugin.getVoteToday().put(user, times);
-			}
-
-		}
-		plugin.debug("Updated VoteToday");
-	}
-
 }

VotingPlugin/src/com/bencodez/votingplugin/VotingPluginMetrics.java

@@ -188,6 +188,28 @@ public class VotingPluginMetrics {
 				}
 			}
 		}));
+
+		int users = UserManager.getInstance().getAllUUIDs().size();
+		if (users > 1000) {
+			metrics.addCustomChart(new BStatsMetrics.SimplePie("number_of_users_in_thousands", new Callable<String>() {
+
+				@Override
+				public String call() throws Exception {
+					int total = UserManager.getInstance().getAllUUIDs().size() / 1000;
+					return "" + total;
+				}
+			}));
+		}
+		if (users > 10000) {
+			metrics.addCustomChart(new BStatsMetrics.SimplePie("number_of_users_in_thousands_plus_10", new Callable<String>() {
+
+				@Override
+				public String call() throws Exception {
+					int total = UserManager.getInstance().getAllUUIDs().size() / 1000;
+					return "" + total;
+				}
+			}));
+		}
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("data_storage", new Callable<String>() {
 
 			@Override
@@ -295,5 +317,32 @@ public class VotingPluginMetrics {
 				return "" + plugin.getProfile().contains("dev");
 			}
 		}));
+
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("votepointtransfering", new Callable<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return "" + plugin.getConfigFile().isAllowVotePointTransfers();
+			}
+		}));
+
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("votecooldown_check_enabled", new Callable<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return "" + (!plugin.getConfigFile().isDisableCoolDownCheck() && RewardHandler.getInstance()
+						.hasRewards(plugin.getSpecialRewardsConfig().getData(), "VoteCoolDownEndedReward"));
+			}
+		}));
+
+		if (!plugin.getBuildNumber().equals("NOTSET")) {
+			metrics.addCustomChart(new BStatsMetrics.SimplePie("dev_build_number", new Callable<String>() {
+
+				@Override
+				public String call() throws Exception {
+					return "" + plugin.getBuildNumber();
+				}
+			}));
+		}
 	}
 }

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

@@ -1,485 +0,0 @@
-package com.bencodez.votingplugin.bungee;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.bencodez.advancedcore.api.user.userstorage.mysql.api.queries.Query;
-import com.bencodez.advancedcore.api.user.userstorage.sql.Column;
-import com.bencodez.advancedcore.api.user.userstorage.sql.DataType;
-
-import net.md_5.bungee.config.Configuration;
-
-public class BungeeMySQL {
-	private List<String> columns = Collections.synchronizedList(new ArrayList<String>());
-
-	private List<String> intColumns = new ArrayList<String>();
-
-	// private HashMap<String, ArrayList<Column>> table;
-
-	// ConcurrentMap<String, ArrayList<Column>> table = new
-	// ConcurrentHashMap<String, ArrayList<Column>>();
-
-	private com.bencodez.advancedcore.api.user.userstorage.mysql.api.MySQL mysql;
-
-	private String name;
-
-	private Object object2 = new Object();
-
-	private Object object3 = new Object();
-
-	private Object object4 = new Object();
-
-	private Set<String> uuids = Collections.synchronizedSet(new HashSet<String>());
-
-	public BungeeMySQL(VotingPluginBungee bungee, String tableName, Configuration section) {
-		String tablePrefix = section.getString("Prefix");
-		String hostName = section.getString("Host");
-		int port = section.getInt("Port");
-		String user = section.getString("Username");
-		String pass = section.getString("Password");
-		String database = section.getString("Database");
-		long lifeTime = section.getLong("MaxLifeTime", -1);
-		int maxThreads = section.getInt("MaxConnections", 1);
-		String str = section.getString("Line", "");
-		if (maxThreads < 1) {
-			maxThreads = 1;
-		}
-		boolean useSSL = section.getBoolean("UseSSL", false);
-		boolean publicKeyRetrieval = section.getBoolean("PublicKeyRetrieval", false);
-		if (!section.getString("Name", "").isEmpty()) {
-			tableName = section.getString("Name", "");
-		}
-
-		name = tableName;
-		if (tablePrefix != null) {
-			name = tablePrefix + tableName;
-		}
-		mysql = new com.bencodez.advancedcore.api.user.userstorage.mysql.api.MySQL(maxThreads) {
-
-			@Override
-			public void debug(SQLException e) {
-				if (bungee.getConfig().getDebug()) {
-					e.printStackTrace();
-				}
-			}
-
-			@Override
-			public void severe(String string) {
-				bungee.getLogger().severe(string);
-			}
-		};
-		if (!mysql.connect(hostName, "" + port, user, pass, database, useSSL, lifeTime, str, publicKeyRetrieval)) {
-
-		}
-		try {
-			Query q = new Query(mysql, "USE " + database + ";");
-			q.executeUpdateAsync();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-		String sql = "CREATE TABLE IF NOT EXISTS " + getName() + " (";
-		sql += "uuid VARCHAR(37),";
-		sql += "PRIMARY KEY ( uuid )";
-		sql += ");";
-		Query query;
-		try {
-			query = new Query(mysql, sql);
-
-			query.executeUpdateAsync();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-
-		loadData();
-
-		// tempoary to improve performance from old tables
-		// addToQue("ALTER TABLE " + getName() + " MODIFY uuid VARCHAR(37);");
-		alterColumnType("uuid", "VARCHAR(37)");
-	}
-
-	public void addColumn(String column, DataType dataType) {
-		synchronized (object3) {
-			String sql = "ALTER TABLE " + getName() + " ADD COLUMN " + column + " text" + ";";
-			try {
-				Query query = new Query(mysql, sql);
-				query.executeUpdate();
-
-				getColumns().add(column);
-			} catch (SQLException e) {
-				e.printStackTrace();
-			}
-
-		}
-	}
-
-	public void alterColumnType(String column, String newType) {
-		checkColumn(column, DataType.STRING);
-		if (newType.contains("INT")) {
-			try {
-				new Query(mysql, "UPDATE " + getName() + " SET " + column + " = '0' where trim(coalesce(" + column
-						+ ", '')) = '';").executeUpdateAsync();
-			} catch (SQLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			;
-			if (!intColumns.contains(column)) {
-				intColumns.add(column);
-			}
-		}
-		try {
-			new Query(mysql, "ALTER TABLE " + getName() + " MODIFY " + column + " " + newType + ";")
-					.executeUpdateAsync();
-		} catch (SQLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void checkColumn(String column, DataType dataType) {
-		synchronized (object4) {
-			if (!getColumns().contains(column)) {
-				if (!getColumnsQueury().contains(column)) {
-					addColumn(column, dataType);
-				}
-			}
-		}
-	}
-
-	public void clearCache() {
-		clearCacheBasic();
-	}
-
-	public void clearCacheBasic() {
-		columns.clear();
-		columns.addAll(getColumnsQueury());
-		uuids.clear();
-		uuids.addAll(getUuidsQuery());
-	}
-
-	public void close() {
-		mysql.disconnect();
-	}
-
-	public boolean containsKeyQuery(String index) {
-		String sqlStr = "SELECT uuid FROM " + getName() + ";";
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(sqlStr)) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query query = new Query(mysql, sql); ResultSet rs = query.executeQuery();
-			 */
-			while (rs.next()) {
-				if (rs.getString("uuid").equals(index)) {
-					rs.close();
-					return true;
-				}
-			}
-			rs.close();
-		} catch (SQLException ex) {
-			ex.printStackTrace();
-		}
-		return false;
-	}
-
-	public List<String> getColumns() {
-		if (columns == null || columns.size() == 0) {
-			loadData();
-		}
-		return columns;
-	}
-
-	public ArrayList<String> getColumnsQueury() {
-		ArrayList<String> columns = new ArrayList<String>();
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement("SELECT * FROM " + getName() + ";")) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query query = new Query(mysql, "SELECT * FROM " + getName() + ";"); ResultSet
-			 * rs = query.executeQuery();
-			 */
-
-			ResultSetMetaData metadata = rs.getMetaData();
-			int columnCount = 0;
-			if (metadata != null) {
-				columnCount = metadata.getColumnCount();
-
-				for (int i = 1; i <= columnCount; i++) {
-					String columnName = metadata.getColumnName(i);
-					columns.add(columnName);
-				}
-				rs.close();
-				return columns;
-			}
-			rs.close();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return columns;
-
-	}
-
-	public ArrayList<Column> getExactQuery(Column column) {
-		ArrayList<Column> result = new ArrayList<>();
-		String query = "SELECT * FROM " + getName() + " WHERE `" + column.getName() + "`='"
-				+ column.getValue().toString() + "';";
-
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(query)) {
-			ResultSet rs = sql.executeQuery();
-
-			/*
-			 * Query sql = new Query(mysql, query); sql.setParameter(1,
-			 * column.getValue().toString()); ResultSet rs = sql.executeQuery();
-			 */
-			if (rs.next()) {
-				for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
-					String columnName = rs.getMetaData().getColumnLabel(i);
-					Column rCol = null;
-					if (intColumns.contains(columnName)) {
-						rCol = new Column(columnName, DataType.INTEGER);
-					} else {
-						rCol = new Column(columnName, DataType.STRING);
-					}
-					// System.out.println(i + " " +
-					// rs.getMetaData().getColumnLabel(i));
-					rCol.setValue(rs.getString(i));
-					// System.out.println(rCol.getValue());
-					result.add(rCol);
-				}
-			}
-			rs.close();
-			return result;
-		} catch (SQLException e) {
-			e.printStackTrace();
-		} catch (ArrayIndexOutOfBoundsException e) {
-		}
-
-		for (String col : getColumns()) {
-			result.add(new Column(col, DataType.STRING));
-		}
-		return result;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public ArrayList<String> getNamesQuery() {
-		ArrayList<String> uuids = new ArrayList<String>();
-
-		checkColumn("PlayerName", DataType.STRING);
-		ArrayList<Column> rows = getRowsNameQuery();
-		if (rows != null) {
-			for (Column c : rows) {
-				uuids.add((String) c.getValue());
-			}
-		}
-
-		return uuids;
-	}
-
-	public ArrayList<Column> getRowsNameQuery() {
-		ArrayList<Column> result = new ArrayList<Column>();
-		String sqlStr = "SELECT PlayerName FROM " + getName() + ";";
-
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(sqlStr)) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query query = new Query(mysql, sql); ResultSet rs = query.executeQuery();
-			 */
-
-			while (rs.next()) {
-				Column rCol = new Column("PlayerName", rs.getString("PlayerName"), DataType.STRING);
-				result.add(rCol);
-			}
-			sql.close();
-			conn.close();
-		} catch (SQLException e) {
-		}
-
-		return result;
-	}
-
-	public ArrayList<Column> getRowsQuery() {
-		ArrayList<Column> result = new ArrayList<Column>();
-		String sqlStr = "SELECT uuid FROM " + getName() + ";";
-
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(sqlStr)) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query query = new Query(mysql, sql); ResultSet rs = query.executeQuery();
-			 */
-
-			while (rs.next()) {
-				Column rCol = new Column("uuid", rs.getString("uuid"), DataType.STRING);
-				result.add(rCol);
-			}
-			rs.close();
-		} catch (SQLException e) {
-			return null;
-		}
-
-		return result;
-	}
-
-	public String getUUID(String playerName) {
-		String query = "SELECT uuid FROM " + getName() + " WHERE " + "PlayerName" + "='" + playerName + "';";
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(query)) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query sql = new Query(mysql, query); ResultSet rs = sql.executeQuery();
-			 */
-			if (rs.next()) {
-				String uuid = rs.getString("uuid");
-				if (uuid != null && !uuid.isEmpty()) {
-					rs.close();
-					return uuid;
-				}
-			}
-			rs.close();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		} catch (ArrayIndexOutOfBoundsException e) {
-		}
-		return null;
-	}
-
-	public Set<String> getUuids() {
-		if (uuids == null || uuids.size() == 0) {
-			uuids.clear();
-			uuids.addAll(getUuidsQuery());
-			return uuids;
-		}
-		return uuids;
-	}
-
-	public ArrayList<String> getUuidsQuery() {
-		ArrayList<String> uuids = new ArrayList<String>();
-
-		ArrayList<Column> rows = getRowsQuery();
-		for (Column c : rows) {
-			uuids.add((String) c.getValue());
-		}
-
-		return uuids;
-	}
-
-	public void insert(String index, String column, Object value, DataType dataType) {
-		insertQuery(index, Arrays.asList(new Column(column, value, dataType)));
-	}
-
-	public void insertQuery(String index, List<Column> cols) {
-		String query = "INSERT IGNORE " + getName() + " ";
-
-		query += "set uuid='" + index + "', ";
-
-		for (int i = 0; i < cols.size(); i++) {
-			Column col = cols.get(i);
-			if (i == cols.size() - 1) {
-				query += col.getName() + "='" + col.getValue().toString() + "';";
-			} else {
-				query += col.getName() + "='" + col.getValue().toString() + "', ";
-			}
-
-		}
-
-		try {
-			uuids.add(index);
-			new Query(mysql, query).executeUpdateAsync();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	public boolean isIntColumn(String key) {
-		return intColumns.contains(key);
-	}
-
-	public void loadData() {
-		columns = getColumnsQueury();
-	}
-
-	public void update(String index, List<Column> cols, boolean queue) {
-		for (Column col : cols) {
-			checkColumn(col.getName(), col.getDataType());
-		}
-		if (getUuids().contains(index)) {
-			synchronized (object2) {
-
-				String query = "UPDATE " + getName() + " SET ";
-
-				for (int i = 0; i < cols.size(); i++) {
-					Column col = cols.get(i);
-					if (i == cols.size() - 1) {
-						if (col.getDataType().equals(DataType.STRING)) {
-							query += col.getName() + "='" + col.getValue().toString() + "';";
-						} else {
-							query += col.getName() + "=" + col.getValue().toString() + ";";
-						}
-					} else {
-						if (col.getDataType().equals(DataType.STRING)) {
-							query += col.getName() + "='" + col.getValue().toString() + "', ";
-						} else {
-							query += col.getName() + "=" + col.getValue().toString() + ", ";
-						}
-
-					}
-				}
-				query += " WHERE `uuid`=";
-				query += "'" + index + "';";
-
-				try {
-					Query q = new Query(mysql, query);
-					q.executeUpdateAsync();
-				} catch (SQLException e) {
-					e.printStackTrace();
-				}
-			}
-		} else {
-			insertQuery(index, cols);
-		}
-	}
-
-	public void update(String index, String column, Object value, DataType dataType) {
-		checkColumn(column, dataType);
-		if (getUuids().contains(index)) {
-			synchronized (object2) {
-				String query = "UPDATE " + getName() + " SET ";
-
-				if (dataType == DataType.STRING) {
-					query += column + "='" + value.toString() + "'";
-				} else {
-					query += column + "=" + value;
-
-				}
-				query += " WHERE `uuid`=";
-				query += "'" + index + "';";
-
-				try {
-					Query q = new Query(mysql, query);
-					q.executeUpdate();
-				} catch (SQLException e) {
-					e.printStackTrace();
-				}
-			}
-
-		} else {
-			insert(index, column, value, dataType);
-		}
-
-	}
-}

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

@@ -26,7 +26,6 @@ public class VoteCache {
 		section.set("Time", voteData.getTime());
 		section.set("Real", voteData.isRealVote());
 		section.set("Text", voteData.getText());
-		save();
 	}
 
 	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
@@ -37,7 +36,6 @@ public class VoteCache {
 		section.set("Time", voteData.getTime());
 		section.set("Real", voteData.isRealVote());
 		section.set("Text", voteData.getText());
-		save();
 	}
 
 	public void clearData() {

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

@@ -14,10 +14,21 @@ public class VoteEventBungee implements net.md_5.bungee.api.plugin.Listener {
 
 	@EventHandler
 	public void onVote(VotifierEvent event) {
-		Vote vote = event.getVote();
-		plugin.getLogger().info("Vote received " + vote.getUsername() + " from service site " + vote.getServiceName());
+		plugin.getProxy().getScheduler().runAsync(plugin, new Runnable() {
 
-		plugin.vote(vote.getUsername(), vote.getServiceName(), true);
+			@Override
+			public void run() {
+				Vote vote = event.getVote();
+				String serviceSite = vote.getServiceName();
+				plugin.getLogger().info("Vote received " + vote.getUsername() + " from service site " + serviceSite);
+
+				if (serviceSite.isEmpty()) {
+					serviceSite = "Empty";
+				}
+
+				plugin.vote(vote.getUsername(), serviceSite, true);
+			}
+		});
 
 	}
 }

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

@@ -8,8 +8,11 @@ import java.io.DataOutputStream;
 import java.io.File;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.Reader;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.security.CodeSource;
+import java.sql.SQLException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
@@ -18,11 +21,16 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.encryption.EncryptionHandler;
-import com.bencodez.advancedcore.api.user.userstorage.sql.Column;
-import com.bencodez.advancedcore.api.user.userstorage.sql.DataType;
+import com.bencodez.advancedcore.api.user.usercache.value.DataValue;
+import com.bencodez.advancedcore.api.user.usercache.value.DataValueInt;
+import com.bencodez.advancedcore.api.user.usercache.value.DataValueString;
+import com.bencodez.advancedcore.api.user.userstorage.Column;
+import com.bencodez.advancedcore.bungeeapi.mysql.BungeeMySQL;
 import com.bencodez.advancedcore.bungeeapi.sockets.ClientHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
@@ -37,12 +45,13 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.connection.Server;
 import net.md_5.bungee.api.event.PluginMessageEvent;
 import net.md_5.bungee.api.event.PostLoginEvent;
-import net.md_5.bungee.api.event.ServerConnectedEvent;
+import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.config.Configuration;
+import net.md_5.bungee.config.ConfigurationProvider;
 import net.md_5.bungee.event.EventHandler;
 
-public class VotingPluginBungee extends Plugin {
+public class VotingPluginBungee extends Plugin implements Listener {
 
 	private HashMap<String, ArrayList<OfflineBungeeVote>> cachedOnlineVotes = new HashMap<String, ArrayList<OfflineBungeeVote>>();
 
@@ -69,7 +78,7 @@ public class VotingPluginBungee extends Plugin {
 
 	private boolean votifierEnabled = true;
 
-	public void checkCachedVotes(String server) {
+	public synchronized void checkCachedVotes(String server) {
 		if (getProxy().getServerInfo(server) != null) {
 			if (!getProxy().getServerInfo(server).getPlayers().isEmpty()) {
 				if (cachedVotes.containsKey(server) && !config.getBlockedServers().contains(server)) {
@@ -93,7 +102,7 @@ public class VotingPluginBungee extends Plugin {
 										cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
 										"" + cache.isRealVote(), cache.getText(),
 										"" + getConfig().getBungeeManageTotals(),
-										"" + BungeeVersion.getPluginMessageVersion());
+										"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast());
 							} else {
 								debug("Not sending vote because user isn't on server " + server + ": "
 										+ cache.toString());
@@ -108,7 +117,7 @@ public class VotingPluginBungee extends Plugin {
 
 	}
 
-	public void checkOnlineVotes(ProxiedPlayer player, String uuid, String server) {
+	public synchronized void checkOnlineVotes(ProxiedPlayer player, String uuid, String server) {
 		if (player != null && player.isConnected() && cachedOnlineVotes.containsKey(uuid)) {
 			ArrayList<OfflineBungeeVote> c = cachedOnlineVotes.get(uuid);
 			if (!c.isEmpty()) {
@@ -120,7 +129,7 @@ public class VotingPluginBungee extends Plugin {
 						sendPluginMessageServer(server, "VoteOnline", cache.getPlayerName(), cache.getUuid(),
 								cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
 								"" + cache.isRealVote(), cache.getText(), "" + getConfig().getBungeeManageTotals(),
-								"" + BungeeVersion.getPluginMessageVersion());
+								"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast());
 					}
 					cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
 				}
@@ -182,31 +191,36 @@ public class VotingPluginBungee extends Plugin {
 		return "";
 	}
 
-	private int getValue(ArrayList<Column> cols, String column) {
+	private int getValue(ArrayList<Column> cols, String column, int toAdd) {
 		for (Column d : cols) {
 			if (d.getName().equalsIgnoreCase(column)) {
 
-				Object value = d.getValue();
+				DataValue value = d.getValue();
 				int num = 0;
-				if (value instanceof Integer) {
+				if (value.isInt()) {
+					num = value.getInt();
+				} else if (value.isString()) {
 					try {
-						num = (int) value;
-					} catch (ClassCastException | NullPointerException ex) {
-					}
-				} else if (value instanceof String) {
-					try {
-						num = Integer.parseInt((String) value);
+						num = Integer.parseInt(value.getString());
 					} catch (Exception e) {
 					}
 				}
-				return num;
+				return num + toAdd;
 			}
 		}
-		return 0;
+		return toAdd;
 	}
 
 	private void loadMysql() {
-		mysql = new BungeeMySQL(this, "VotingPlugin_Users", config.getData());
+		mysql = new BungeeMySQL(this, "VotingPlugin_Users", config.getData()) {
+
+			@Override
+			public void debug(SQLException e) {
+				if (config.getDebug()) {
+					e.printStackTrace();
+				}
+			}
+		};
 
 		// column types
 		getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
@@ -235,16 +249,50 @@ public class VotingPluginBungee extends Plugin {
 		getMysql().alterColumnType("DayVoteStreakLastUpdate", "MEDIUMTEXT");
 	}
 
-	private int mysqlUpdate(ArrayList<Column> cols, String uuid, String column, int toAdd) {
-		int num = getValue(cols, column) + toAdd;
-		debug("Setting " + column + " to " + num + " for " + uuid);
-		mysql.update(uuid, column, num, DataType.INTEGER);
-		return num;
+	private String buildNumber = "NOTSET";
+
+	public void loadVersionFile() {
+		Configuration conf = getVersionFile();
+		if (conf != null) {
+			buildNumber = conf.get("buildnumber", "NOTSET");
+		}
+	}
+
+	private Configuration getVersionFile() {
+		try {
+			CodeSource src = this.getClass().getProtectionDomain().getCodeSource();
+			if (src != null) {
+				URL jar = src.getLocation();
+				ZipInputStream zip = null;
+				zip = new ZipInputStream(jar.openStream());
+				while (true) {
+					ZipEntry e = zip.getNextEntry();
+					if (e != null) {
+						String name = e.getName();
+						if (name.equals("votingpluginversion.yml")) {
+							Reader defConfigStream = new InputStreamReader(zip);
+							if (defConfigStream != null) {
+								Configuration conf = ConfigurationProvider
+										.getProvider(net.md_5.bungee.config.YamlConfiguration.class)
+										.load(defConfigStream);
+
+								defConfigStream.close();
+								return conf;
+							}
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
 	}
 
 	@Override
 	public void onDisable() {
 		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			getLogger().info("VotingPlugin saving vote cache: " + cachedVotes.size() + "/" + cachedOnlineVotes.size());
 			for (Entry<String, ArrayList<OfflineBungeeVote>> entry : cachedVotes.entrySet()) {
 				String server = entry.getKey();
 				int num = 0;
@@ -261,8 +309,13 @@ public class VotingPluginBungee extends Plugin {
 					num++;
 				}
 			}
-			nonVotedPlayersCache.save();
+			voteCacheFile.save();
 		}
+		nonVotedPlayersCache.save();
+		if (mysql != null) {
+			mysql.shutdown();
+		}
+		getLogger().info("VotingPlugin disabled");
 	}
 
 	@Override
@@ -276,6 +329,7 @@ public class VotingPluginBungee extends Plugin {
 		if (votifierEnabled) {
 			try {
 				getProxy().getPluginManager().registerListener(this, new VoteEventBungee(this));
+				getProxy().getPluginManager().registerListener(this, this);
 			} catch (Exception e) {
 			}
 		}
@@ -438,8 +492,17 @@ public class VotingPluginBungee extends Plugin {
 		metrics.addCustomChart(
 				new BStatsMetricsBungee.SimplePie("waitforuseronline", () -> "" + getConfig().getWaitForUserOnline()));
 
+		if (!buildNumber.equals("NOTSET")) {
+			metrics.addCustomChart(new BStatsMetricsBungee.SimplePie("dev_build_number", () -> "" + buildNumber));
+		}
+
+		loadVersionFile();
+
 		getLogger().info("VotingPlugin loaded, using method: " + method.toString() + ", PluginMessagingVersion: "
 				+ BungeeVersion.getPluginMessageVersion());
+		if (!buildNumber.equals("NOTSET")) {
+			getLogger().info("Detected using dev build number: " + buildNumber);
+		}
 	}
 
 	@EventHandler
@@ -458,6 +521,7 @@ public class VotingPluginBungee extends Plugin {
 		ev.setCancelled(true);
 
 		if (!(ev.getSender() instanceof Server)) {
+			debug("Ignore plugin message");
 			return;
 		}
 
@@ -469,6 +533,8 @@ public class VotingPluginBungee extends Plugin {
 			String subchannel = in.readUTF();
 			int size = in.readInt();
 
+			debug("Received plugin message, processing...");
+
 			// check for status message returns
 			if (subchannel.equalsIgnoreCase("statusokay")) {
 				String server = in.readUTF();
@@ -476,10 +542,22 @@ public class VotingPluginBungee extends Plugin {
 				return;
 			} else if (subchannel.equalsIgnoreCase("login")) {
 				String player = in.readUTF();
+				debug("Login: " + player);
 				ProxiedPlayer p = getProxy().getPlayer(player);
-				String server = p.getServer().getInfo().getName();
-				checkCachedVotes(server);
-				checkOnlineVotes(p, p.getUniqueId().toString(), server);
+				if (p != null && p.isConnected()) {
+					if (p.getServer() != null && p.getServer().getInfo() != null) {
+						final String server = p.getServer().getInfo().getName();
+						final ProxiedPlayer proixedPlayer = p;
+						getProxy().getScheduler().runAsync(this, new Runnable() {
+
+							@Override
+							public void run() {
+								checkCachedVotes(server);
+								checkOnlineVotes(proixedPlayer, proixedPlayer.getUniqueId().toString(), server);
+							}
+						});
+					}
+				}
 				return;
 			} else {
 
@@ -500,21 +578,6 @@ public class VotingPluginBungee extends Plugin {
 		}
 	}
 
-	@EventHandler
-	public void onServerConnected(ServerConnectedEvent event) {
-		final String server = event.getServer().getInfo().getName();
-		final String uuid = event.getPlayer().getUniqueId().toString();
-		getProxy().getScheduler().schedule(this, new Runnable() {
-
-			@Override
-			public void run() {
-				checkCachedVotes(server);
-				checkOnlineVotes(event.getPlayer(), uuid, server);
-			}
-
-		}, 3, TimeUnit.SECONDS);
-	}
-
 	private UUID parseUUIDFromString(String uuidAsString) {
 		String[] parts = { "0x" + uuidAsString.substring(0, 8), "0x" + uuidAsString.substring(8, 12),
 				"0x" + uuidAsString.substring(12, 16), "0x" + uuidAsString.substring(16, 20),
@@ -635,7 +698,7 @@ public class VotingPluginBungee extends Plugin {
 		}
 	}
 
-	public void vote(String player, String service, boolean realVote) {
+	public synchronized void vote(String player, String service, boolean realVote) {
 		try {
 			if (player == null || player.isEmpty()) {
 				getLogger().info("No name from vote on " + service);
@@ -676,16 +739,27 @@ public class VotingPluginBungee extends Plugin {
 				}
 
 				if (!mysql.getUuids().contains(uuid)) {
-					mysql.update(uuid, "PlayerName", player, DataType.STRING);
+					mysql.update(uuid, "PlayerName", new DataValueString(player));
 				}
 
-				ArrayList<Column> data = mysql.getExactQuery(new Column("uuid", uuid, DataType.STRING));
+				ArrayList<Column> data = mysql.getExactQuery(new Column("uuid", new DataValueString(uuid)));
 
-				text = new BungeeMessageData(mysqlUpdate(data, uuid, "AllTimeTotal", 1),
-						mysqlUpdate(data, uuid, "MonthTotal", 1), mysqlUpdate(data, uuid, "WeeklyTotal", 1),
-						mysqlUpdate(data, uuid, "DailyTotal", 1),
-						mysqlUpdate(data, uuid, "Points", getConfig().getPointsOnVote()),
-						mysqlUpdate(data, uuid, "MilestoneCount", 1));
+				int allTimeTotal = getValue(data, "AllTimeTotal", 1);
+				int monthTotal = getValue(data, "MonthTotal", 1);
+				int weeklyTotal = getValue(data, "WeeklyTotal", 1);
+				int dailyTotal = getValue(data, "DailyTotal", 1);
+				int points = getValue(data, "Points", getConfig().getPointsOnVote());
+				int milestoneCount = getValue(data, "MilestoneCount", 1);
+				text = new BungeeMessageData(allTimeTotal, monthTotal, weeklyTotal, dailyTotal, points, milestoneCount);
+				ArrayList<Column> update = new ArrayList<Column>();
+				update.add(new Column("AllTimeTotal", new DataValueInt(allTimeTotal)));
+				update.add(new Column("MonthTotal", new DataValueInt(monthTotal)));
+				update.add(new Column("WeeklyTotal", new DataValueInt(weeklyTotal)));
+				update.add(new Column("DailyTotal", new DataValueInt(dailyTotal)));
+				update.add(new Column("Points", new DataValueInt(points)));
+				update.add(new Column("MilestoneCount", new DataValueInt(milestoneCount)));
+				debug("Setting totals " + text.toString());
+				mysql.update(uuid, update);
 			} else {
 				text = new BungeeMessageData(0, 0, 0, 0, 0, 0);
 			}
@@ -728,7 +802,10 @@ public class VotingPluginBungee extends Plugin {
 								sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
 										Boolean.TRUE.toString(), "" + realVote, text.toString(),
 										"" + getConfig().getBungeeManageTotals(),
-										"" + BungeeVersion.getPluginMessageVersion());
+										"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast());
+							}
+							if (config.getBroadcast()) {
+								sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
 							}
 						}
 					}
@@ -738,7 +815,8 @@ public class VotingPluginBungee extends Plugin {
 							&& !config.getBlockedServers().contains(p.getServer().getInfo().getName())) {
 						sendPluginMessageServer(p.getServer().getInfo().getName(), "VoteOnline", player, uuid, service,
 								"" + time, Boolean.TRUE.toString(), "" + realVote, text.toString(),
-								"" + getConfig().getBungeeManageTotals(), "" + BungeeVersion.getPluginMessageVersion());
+								"" + getConfig().getBungeeManageTotals(), "" + BungeeVersion.getPluginMessageVersion(),
+								"" + config.getBroadcast());
 					} else {
 						if (!cachedOnlineVotes.containsKey(uuid)) {
 							cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
@@ -753,6 +831,9 @@ public class VotingPluginBungee extends Plugin {
 					}
 					for (String s : getProxy().getServers().keySet()) {
 						sendPluginMessageServer(s, "VoteUpdate", uuid);
+						if (config.getBroadcast()) {
+							sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
+						}
 					}
 				}
 			} else if (method.equals(BungeeMethod.SOCKETS)) {

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

@@ -29,7 +29,7 @@ public class VotingPluginBungeeCommand extends Command {
 						String user = args[1];
 						String site = args[2];
 						bungee.vote(user, site, false);
-						sender.sendMessage(new TextComponent("&aSending vote"));
+						sender.sendMessage(new TextComponent("Sending vote"));
 					}
 				}
 				if (args[0].equalsIgnoreCase("status")) {

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

@@ -1,483 +0,0 @@
-package com.bencodez.votingplugin.bungee.velocity;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.bencodez.advancedcore.api.user.userstorage.mysql.api.queries.Query;
-import com.bencodez.advancedcore.api.user.userstorage.sql.Column;
-import com.bencodez.advancedcore.api.user.userstorage.sql.DataType;
-
-public class BungeeMySQL {
-	private List<String> columns = Collections.synchronizedList(new ArrayList<String>());
-
-	private List<String> intColumns = new ArrayList<String>();
-
-	// private HashMap<String, ArrayList<Column>> table;
-
-	// ConcurrentMap<String, ArrayList<Column>> table = new
-	// ConcurrentHashMap<String, ArrayList<Column>>();
-
-	private com.bencodez.advancedcore.api.user.userstorage.mysql.api.MySQL mysql;
-
-	private String name;
-
-	private Object object2 = new Object();
-
-	private Object object3 = new Object();
-
-	private Object object4 = new Object();
-
-	private Set<String> uuids = Collections.synchronizedSet(new HashSet<String>());
-
-	public BungeeMySQL(VotingPluginVelocity plugin, String tableName, Config config) {
-		String tablePrefix = config.getString(config.getNode("Prefix"), "");
-		String hostName = config.getString(config.getNode("Host"), "");
-		int port = config.getInt(config.getNode("Port"), 0);
-		String user = config.getString(config.getNode("Username"), "");
-		String pass = config.getString(config.getNode("Password"), "");
-		String database = config.getString(config.getNode("Database"), "");
-		long lifeTime = config.getLong(config.getNode("MaxLifeTime"), -1);
-		int maxThreads = config.getInt(config.getNode("MaxConnections"), 1);
-		String str = config.getString(config.getNode("Line"), "");
-		if (maxThreads < 1) {
-			maxThreads = 1;
-		}
-		boolean useSSL = config.getBoolean(config.getNode("UseSSL"), false);
-		boolean publicKeyRetrieval = config.getBoolean(config.getNode("PublicKeyRetrieval"), false);
-		name = config.getString(config.getNode("Name"), "");
-		if (!name.isEmpty()) {
-			name = tableName;
-		}
-
-		if (tablePrefix != null) {
-			name = tablePrefix + tableName;
-		}
-		mysql = new com.bencodez.advancedcore.api.user.userstorage.mysql.api.MySQL(maxThreads) {
-
-			@Override
-			public void debug(SQLException e) {
-				if (plugin.getConfig().getDebug()) {
-					e.printStackTrace();
-				}
-			}
-
-			@Override
-			public void severe(String string) {
-				plugin.getLogger().error(string);
-			}
-		};
-		if (!mysql.connect(hostName, "" + port, user, pass, database, useSSL, lifeTime, str, publicKeyRetrieval)) {
-
-		}
-		try {
-			Query q = new Query(mysql, "USE " + database + ";");
-			q.executeUpdateAsync();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-		String sql = "CREATE TABLE IF NOT EXISTS " + getName() + " (";
-		sql += "uuid VARCHAR(37),";
-		sql += "PRIMARY KEY ( uuid )";
-		sql += ");";
-		Query query;
-		try {
-			query = new Query(mysql, sql);
-
-			query.executeUpdateAsync();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-
-		loadData();
-
-		// tempoary to improve performance from old tables
-		// addToQue("ALTER TABLE " + getName() + " MODIFY uuid VARCHAR(37);");
-		alterColumnType("uuid", "VARCHAR(37)");
-	}
-
-	public void addColumn(String column, DataType dataType) {
-		synchronized (object3) {
-			String sql = "ALTER TABLE " + getName() + " ADD COLUMN " + column + " text" + ";";
-			try {
-				Query query = new Query(mysql, sql);
-				query.executeUpdate();
-
-				getColumns().add(column);
-			} catch (SQLException e) {
-				e.printStackTrace();
-			}
-
-		}
-	}
-
-	public void alterColumnType(String column, String newType) {
-		checkColumn(column, DataType.STRING);
-		if (newType.contains("INT")) {
-			try {
-				new Query(mysql, "UPDATE " + getName() + " SET " + column + " = '0' where trim(coalesce(" + column
-						+ ", '')) = '';").executeUpdateAsync();
-			} catch (SQLException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			;
-			if (!intColumns.contains(column)) {
-				intColumns.add(column);
-			}
-		}
-		try {
-			new Query(mysql, "ALTER TABLE " + getName() + " MODIFY " + column + " " + newType + ";")
-					.executeUpdateAsync();
-		} catch (SQLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void checkColumn(String column, DataType dataType) {
-		synchronized (object4) {
-			if (!getColumns().contains(column)) {
-				if (!getColumnsQueury().contains(column)) {
-					addColumn(column, dataType);
-				}
-			}
-		}
-	}
-
-	public void clearCache() {
-		clearCacheBasic();
-	}
-
-	public void clearCacheBasic() {
-		columns.clear();
-		columns.addAll(getColumnsQueury());
-		uuids.clear();
-		uuids.addAll(getUuidsQuery());
-	}
-
-	public void close() {
-		mysql.disconnect();
-	}
-
-	public boolean containsKeyQuery(String index) {
-		String sqlStr = "SELECT uuid FROM " + getName() + ";";
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(sqlStr)) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query query = new Query(mysql, sql); ResultSet rs = query.executeQuery();
-			 */
-			while (rs.next()) {
-				if (rs.getString("uuid").equals(index)) {
-					rs.close();
-					return true;
-				}
-			}
-			rs.close();
-		} catch (SQLException ex) {
-			ex.printStackTrace();
-		}
-		return false;
-	}
-
-	public List<String> getColumns() {
-		if (columns == null || columns.size() == 0) {
-			loadData();
-		}
-		return columns;
-	}
-
-	public ArrayList<String> getColumnsQueury() {
-		ArrayList<String> columns = new ArrayList<String>();
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement("SELECT * FROM " + getName() + ";")) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query query = new Query(mysql, "SELECT * FROM " + getName() + ";"); ResultSet
-			 * rs = query.executeQuery();
-			 */
-
-			ResultSetMetaData metadata = rs.getMetaData();
-			int columnCount = 0;
-			if (metadata != null) {
-				columnCount = metadata.getColumnCount();
-
-				for (int i = 1; i <= columnCount; i++) {
-					String columnName = metadata.getColumnName(i);
-					columns.add(columnName);
-				}
-				rs.close();
-				return columns;
-			}
-			rs.close();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return columns;
-
-	}
-
-	public ArrayList<Column> getExactQuery(Column column) {
-		ArrayList<Column> result = new ArrayList<>();
-		String query = "SELECT * FROM " + getName() + " WHERE `" + column.getName() + "`='"
-				+ column.getValue().toString() + "';";
-
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(query)) {
-			ResultSet rs = sql.executeQuery();
-
-			/*
-			 * Query sql = new Query(mysql, query); sql.setParameter(1,
-			 * column.getValue().toString()); ResultSet rs = sql.executeQuery();
-			 */
-			if (rs.next()) {
-				for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
-					String columnName = rs.getMetaData().getColumnLabel(i);
-					Column rCol = null;
-					if (intColumns.contains(columnName)) {
-						rCol = new Column(columnName, DataType.INTEGER);
-					} else {
-						rCol = new Column(columnName, DataType.STRING);
-					}
-					// System.out.println(i + " " +
-					// rs.getMetaData().getColumnLabel(i));
-					rCol.setValue(rs.getString(i));
-					// System.out.println(rCol.getValue());
-					result.add(rCol);
-				}
-			}
-			rs.close();
-			return result;
-		} catch (SQLException e) {
-			e.printStackTrace();
-		} catch (ArrayIndexOutOfBoundsException e) {
-		}
-
-		for (String col : getColumns()) {
-			result.add(new Column(col, DataType.STRING));
-		}
-		return result;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public ArrayList<String> getNamesQuery() {
-		ArrayList<String> uuids = new ArrayList<String>();
-
-		checkColumn("PlayerName", DataType.STRING);
-		ArrayList<Column> rows = getRowsNameQuery();
-		if (rows != null) {
-			for (Column c : rows) {
-				uuids.add((String) c.getValue());
-			}
-		}
-
-		return uuids;
-	}
-
-	public ArrayList<Column> getRowsNameQuery() {
-		ArrayList<Column> result = new ArrayList<Column>();
-		String sqlStr = "SELECT PlayerName FROM " + getName() + ";";
-
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(sqlStr)) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query query = new Query(mysql, sql); ResultSet rs = query.executeQuery();
-			 */
-
-			while (rs.next()) {
-				Column rCol = new Column("PlayerName", rs.getString("PlayerName"), DataType.STRING);
-				result.add(rCol);
-			}
-			sql.close();
-			conn.close();
-		} catch (SQLException e) {
-		}
-
-		return result;
-	}
-
-	public ArrayList<Column> getRowsQuery() {
-		ArrayList<Column> result = new ArrayList<Column>();
-		String sqlStr = "SELECT uuid FROM " + getName() + ";";
-
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(sqlStr)) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query query = new Query(mysql, sql); ResultSet rs = query.executeQuery();
-			 */
-
-			while (rs.next()) {
-				Column rCol = new Column("uuid", rs.getString("uuid"), DataType.STRING);
-				result.add(rCol);
-			}
-			rs.close();
-		} catch (SQLException e) {
-			return null;
-		}
-
-		return result;
-	}
-
-	public String getUUID(String playerName) {
-		String query = "SELECT uuid FROM " + getName() + " WHERE " + "PlayerName" + "='" + playerName + "';";
-		try (Connection conn = mysql.getConnectionManager().getConnection();
-				PreparedStatement sql = conn.prepareStatement(query)) {
-			ResultSet rs = sql.executeQuery();
-			/*
-			 * Query sql = new Query(mysql, query); ResultSet rs = sql.executeQuery();
-			 */
-			if (rs.next()) {
-				String uuid = rs.getString("uuid");
-				if (uuid != null && !uuid.isEmpty()) {
-					rs.close();
-					return uuid;
-				}
-			}
-			rs.close();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		} catch (ArrayIndexOutOfBoundsException e) {
-		}
-		return null;
-	}
-
-	public Set<String> getUuids() {
-		if (uuids == null || uuids.size() == 0) {
-			uuids.clear();
-			uuids.addAll(getUuidsQuery());
-			return uuids;
-		}
-		return uuids;
-	}
-
-	public ArrayList<String> getUuidsQuery() {
-		ArrayList<String> uuids = new ArrayList<String>();
-
-		ArrayList<Column> rows = getRowsQuery();
-		for (Column c : rows) {
-			uuids.add((String) c.getValue());
-		}
-
-		return uuids;
-	}
-
-	public void insert(String index, String column, Object value, DataType dataType) {
-		insertQuery(index, Arrays.asList(new Column(column, value, dataType)));
-	}
-
-	public void insertQuery(String index, List<Column> cols) {
-		String query = "INSERT IGNORE " + getName() + " ";
-
-		query += "set uuid='" + index + "', ";
-
-		for (int i = 0; i < cols.size(); i++) {
-			Column col = cols.get(i);
-			if (i == cols.size() - 1) {
-				query += col.getName() + "='" + col.getValue().toString() + "';";
-			} else {
-				query += col.getName() + "='" + col.getValue().toString() + "', ";
-			}
-
-		}
-
-		try {
-			uuids.add(index);
-			new Query(mysql, query).executeUpdateAsync();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	public boolean isIntColumn(String key) {
-		return intColumns.contains(key);
-	}
-
-	public void loadData() {
-		columns = getColumnsQueury();
-	}
-
-	public void update(String index, List<Column> cols, boolean queue) {
-		for (Column col : cols) {
-			checkColumn(col.getName(), col.getDataType());
-		}
-		if (getUuids().contains(index)) {
-			synchronized (object2) {
-
-				String query = "UPDATE " + getName() + " SET ";
-
-				for (int i = 0; i < cols.size(); i++) {
-					Column col = cols.get(i);
-					if (i == cols.size() - 1) {
-						if (col.getDataType().equals(DataType.STRING)) {
-							query += col.getName() + "='" + col.getValue().toString() + "';";
-						} else {
-							query += col.getName() + "=" + col.getValue().toString() + ";";
-						}
-					} else {
-						if (col.getDataType().equals(DataType.STRING)) {
-							query += col.getName() + "='" + col.getValue().toString() + "', ";
-						} else {
-							query += col.getName() + "=" + col.getValue().toString() + ", ";
-						}
-
-					}
-				}
-				query += " WHERE `uuid`=";
-				query += "'" + index + "';";
-
-				try {
-					Query q = new Query(mysql, query);
-					q.executeUpdateAsync();
-				} catch (SQLException e) {
-					e.printStackTrace();
-				}
-			}
-		} else {
-			insertQuery(index, cols);
-		}
-	}
-
-	public void update(String index, String column, Object value, DataType dataType) {
-		checkColumn(column, dataType);
-		if (getUuids().contains(index)) {
-			synchronized (object2) {
-				String query = "UPDATE " + getName() + " SET ";
-
-				if (dataType == DataType.STRING) {
-					query += column + "='" + value.toString() + "'";
-				} else {
-					query += column + "=" + value;
-
-				}
-				query += " WHERE `uuid`=";
-				query += "'" + index + "';";
-
-				try {
-					Query q = new Query(mysql, query);
-					q.executeUpdate();
-				} catch (SQLException e) {
-					e.printStackTrace();
-				}
-			}
-
-		} else {
-			insert(index, column, value, dataType);
-		}
-
-	}
-}

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

@@ -5,6 +5,8 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import com.bencodez.advancedcore.bungeeapi.velocity.VelocityYMLFile;
+
 import ninja.leaping.configurate.ConfigurationNode;
 
 public class Config extends VelocityYMLFile {
@@ -49,10 +51,6 @@ public class Config extends VelocityYMLFile {
 		return getString(getNode("FallBackServer"), "");
 	}
 
-	public long getLong(ConfigurationNode node, long def) {
-		return node.getLong(def);
-	}
-
 	public ConfigurationNode getMysqlNode() {
 		return getNode("MySQL");
 	}

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

@@ -2,6 +2,7 @@ package com.bencodez.votingplugin.bungee.velocity;
 
 import java.io.File;
 
+import com.bencodez.advancedcore.bungeeapi.velocity.VelocityYMLFile;
 import com.velocitypowered.api.proxy.Player;
 
 public class NonVotedPlayersCache extends VelocityYMLFile {

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

@@ -1,98 +0,0 @@
-package com.bencodez.votingplugin.bungee.velocity;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.google.common.reflect.TypeToken;
-
-import lombok.Getter;
-import ninja.leaping.configurate.ConfigurationNode;
-import ninja.leaping.configurate.objectmapping.ObjectMappingException;
-import ninja.leaping.configurate.yaml.YAMLConfigurationLoader;
-
-public class VelocityYMLFile {
-	@Getter
-	private ConfigurationNode conf;
-	@Getter
-	private File file;
-	private YAMLConfigurationLoader loader;
-
-	public VelocityYMLFile(File file) {
-
-		this.file = file;
-		if (!file.exists()) {
-			try {
-				file.getParentFile().mkdirs();
-				file.createNewFile();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		loader = YAMLConfigurationLoader.builder().setPath(file.toPath()).build();
-
-		try {
-			conf = loader.load();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	public boolean getBoolean(ConfigurationNode node, boolean def) {
-		return node.getBoolean(def);
-	}
-
-	public ConfigurationNode getData() {
-		return conf;
-	}
-
-	public int getInt(ConfigurationNode node, int def) {
-		return node.getInt(def);
-	}
-
-	public ArrayList<String> getKeys(ConfigurationNode node) {
-		ArrayList<String> keys = new ArrayList<String>();
-		for (ConfigurationNode key : node.getChildrenList()) {
-			keys.add(key.getKey().toString());
-		}
-		return keys;
-	}
-
-	public ConfigurationNode getNode(Object... path) {
-		return getData().getNode(path);
-	}
-
-	public String getString(ConfigurationNode node, String def) {
-		return node.getString(def);
-	}
-
-	public List<String> getStringList(ConfigurationNode node, ArrayList<String> def) {
-		try {
-			return node.getList(TypeToken.of(String.class), def);
-		} catch (ObjectMappingException e) {
-			e.printStackTrace();
-			return def;
-		}
-	}
-
-	public void reload() {
-		loader = YAMLConfigurationLoader.builder().setPath(file.toPath()).build();
-
-		try {
-			conf = loader.load();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void save() {
-		try {
-			loader.save(conf);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-}

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

@@ -3,6 +3,7 @@ package com.bencodez.votingplugin.bungee.velocity;
 import java.io.File;
 import java.util.Collection;
 
+import com.bencodez.advancedcore.bungeeapi.velocity.VelocityYMLFile;
 import com.bencodez.votingplugin.bungee.OfflineBungeeVote;
 
 import ninja.leaping.configurate.ConfigurationNode;
@@ -22,8 +23,6 @@ public class VoteCache extends VelocityYMLFile {
 		getNode(path, "Time").setValue(voteData.getTime());
 		getNode(path, "Real").setValue(voteData.isRealVote());
 		getNode(path, "Text").setValue(voteData.getText());
-
-		save();
 	}
 
 	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
@@ -35,8 +34,6 @@ public class VoteCache extends VelocityYMLFile {
 		getNode(path, "Time").setValue(voteData.getTime());
 		getNode(path, "Real").setValue(voteData.isRealVote());
 		getNode(path, "Text").setValue(voteData.getText());
-
-		save();
 	}
 
 	public void clearData() {

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

@@ -7,20 +7,28 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.Reader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.file.Path;
+import java.security.CodeSource;
+import java.sql.SQLException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
 import org.bstats.charts.SimplePie;
 import org.bstats.velocity.Metrics;
@@ -28,8 +36,11 @@ import org.slf4j.Logger;
 
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.encryption.EncryptionHandler;
-import com.bencodez.advancedcore.api.user.userstorage.sql.Column;
-import com.bencodez.advancedcore.api.user.userstorage.sql.DataType;
+import com.bencodez.advancedcore.api.user.usercache.value.DataValue;
+import com.bencodez.advancedcore.api.user.usercache.value.DataValueInt;
+import com.bencodez.advancedcore.api.user.usercache.value.DataValueString;
+import com.bencodez.advancedcore.api.user.userstorage.Column;
+import com.bencodez.advancedcore.bungeeapi.mysql.VelocityMySQL;
 import com.bencodez.advancedcore.bungeeapi.sockets.ClientHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
@@ -55,11 +66,11 @@ import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.proxy.messages.ChannelIdentifier;
 import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
-import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.velocity.event.VotifierEvent;
 
 import lombok.Getter;
 import ninja.leaping.configurate.ConfigurationNode;
+import ninja.leaping.configurate.yaml.YAMLConfigurationLoader;
 
 @Plugin(id = "votingplugin", name = "VotingPlugin", version = "1.0", url = "https://www.spigotmc.org/resources/votingplugin.15358/", description = "VotingPlugin Velocity Version", authors = {
 		"BenCodez" }, dependencies = { @Dependency(id = "nuvotifier", optional = true) })
@@ -84,7 +95,7 @@ public class VotingPluginVelocity {
 	private final Metrics.Factory metricsFactory;
 
 	@Getter
-	private BungeeMySQL mysql;
+	private VelocityMySQL mysql;
 
 	private NonVotedPlayersCache nonVotedPlayersCache;
 
@@ -94,6 +105,8 @@ public class VotingPluginVelocity {
 
 	private VoteCache voteCacheFile;
 
+	private Timer timer;
+
 	@Inject
 	public VotingPluginVelocity(ProxyServer server, Logger logger, Metrics.Factory metricsFactory,
 			@DataDirectory Path dataDirectory) {
@@ -101,9 +114,10 @@ public class VotingPluginVelocity {
 		this.logger = logger;
 		this.dataDirectory = dataDirectory;
 		this.metricsFactory = metricsFactory;
+		timer = new Timer();
 	}
 
-	public void checkCachedVotes(RegisteredServer serverToCheck) {
+	public synchronized void checkCachedVotes(RegisteredServer serverToCheck) {
 		if (!serverToCheck.getPlayersConnected().isEmpty()) {
 			if (cachedVotes.containsKey(serverToCheck)
 					&& !config.getBlockedServers().contains(serverToCheck.getServerInfo().getName())) {
@@ -129,7 +143,7 @@ public class VotingPluginVelocity {
 							sendPluginMessageServer(serverToCheck, "Vote", cache.getPlayerName(), cache.getUuid(),
 									cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
 									"" + cache.isRealVote(), cache.getText(), "" + getConfig().getBungeeManageTotals(),
-									"" + BungeeVersion.getPluginMessageVersion());
+									"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast());
 						} else {
 							debug("Not sending vote because user isn't on server " + serverToCheck + ": "
 									+ cache.toString());
@@ -143,7 +157,7 @@ public class VotingPluginVelocity {
 
 	}
 
-	public void checkOnlineVotes(Player player, String uuid, RegisteredServer serverToCheck) {
+	public synchronized void checkOnlineVotes(Player player, String uuid, RegisteredServer serverToCheck) {
 		if (player != null && player.isActive() && cachedOnlineVotes.containsKey(uuid)) {
 			ArrayList<OfflineBungeeVote> c = cachedOnlineVotes.get(uuid);
 			if (!c.isEmpty()) {
@@ -155,7 +169,7 @@ public class VotingPluginVelocity {
 						sendPluginMessageServer(serverToCheck, "VoteOnline", cache.getPlayerName(), cache.getUuid(),
 								cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
 								"" + cache.isRealVote(), cache.getText(), "" + getConfig().getBungeeManageTotals(),
-								"" + BungeeVersion.getPluginMessageVersion());
+								"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast());
 					}
 					cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
 				}
@@ -221,31 +235,41 @@ public class VotingPluginVelocity {
 		return "";
 	}
 
-	private int getValue(ArrayList<Column> cols, String column) {
+	private int getValue(ArrayList<Column> cols, String column, int toAdd) {
 		for (Column d : cols) {
 			if (d.getName().equalsIgnoreCase(column)) {
 
-				Object value = d.getValue();
+				DataValue value = d.getValue();
 				int num = 0;
-				if (value instanceof Integer) {
+				if (value.isInt()) {
+					num = value.getInt();
+				} else if (value.isString()) {
 					try {
-						num = (int) value;
-					} catch (ClassCastException | NullPointerException ex) {
-					}
-				} else if (value instanceof String) {
-					try {
-						num = Integer.parseInt((String) value);
+						num = Integer.parseInt(value.getString());
 					} catch (Exception e) {
 					}
 				}
-				return num;
+				return num + toAdd;
 			}
 		}
-		return 0;
+		return toAdd;
 	}
 
 	private void loadMysql() {
-		mysql = new BungeeMySQL(this, "VotingPlugin_Users", config);
+		mysql = new VelocityMySQL("VotingPlugin_Users", config) {
+
+			@Override
+			public void severe(String str) {
+				getLogger().error(str);
+			}
+
+			@Override
+			public void debug(SQLException e) {
+				if (config.getDebug()) {
+					e.printStackTrace();
+				}
+			}
+		};
 		// column types
 		getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
 		getMysql().alterColumnType("CheckWorld", "VARCHAR(5)");
@@ -273,13 +297,6 @@ public class VotingPluginVelocity {
 		getMysql().alterColumnType("DayVoteStreakLastUpdate", "MEDIUMTEXT");
 	}
 
-	private int mysqlUpdate(ArrayList<Column> cols, String uuid, String column, int toAdd) {
-		int num = getValue(cols, column) + toAdd;
-		debug("Setting " + column + " to " + num + " for " + uuid);
-		mysql.update(uuid, column, num, DataType.INTEGER);
-		return num;
-	}
-
 	@Subscribe
 	public void onPluginMessagingReceived(PluginMessageEvent event) {
 		if (event.getIdentifier().getId().equals(CHANNEL.getId())) {
@@ -298,9 +315,23 @@ public class VotingPluginVelocity {
 					return;
 				} else if (subchannel.equalsIgnoreCase("login")) {
 					String player = in.readUTF();
-					Player p = server.getPlayer(player).get();
-					checkCachedVotes(p.getCurrentServer().get().getServer());
-					checkOnlineVotes(p, p.getUniqueId().toString(), p.getCurrentServer().get().getServer());
+					debug("Login: " + player);
+					if (server.getPlayer(player).isPresent()) {
+						Player p = server.getPlayer(player).get();
+						if (p.getCurrentServer().isPresent()) {
+							final RegisteredServer server = p.getCurrentServer().get().getServer();
+							final Player p1 = p;
+							timer.schedule(new TimerTask() {
+
+								@Override
+								public void run() {
+									checkCachedVotes(server);
+									checkOnlineVotes(p1, p.getUniqueId().toString(), server);
+								}
+							}, 0);
+
+						}
+					}
 					return;
 				} else {
 
@@ -326,6 +357,7 @@ public class VotingPluginVelocity {
 	@Subscribe
 	public void onProxyDisable(ProxyShutdownEvent event) {
 		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			logger.info("VotingPlugin saving vote cache: " + cachedVotes.size() + "/" + cachedOnlineVotes.size());
 			for (Entry<RegisteredServer, ArrayList<OfflineBungeeVote>> entry : cachedVotes.entrySet()) {
 				RegisteredServer server = entry.getKey();
 				int num = 0;
@@ -342,8 +374,14 @@ public class VotingPluginVelocity {
 					num++;
 				}
 			}
-			nonVotedPlayersCache.save();
+
+			voteCacheFile.save();
 		}
+		nonVotedPlayersCache.save();
+		if (mysql != null) {
+			mysql.shutDown();
+		}
+		logger.info("VotingPlugin disabled");
 	}
 
 	@Subscribe
@@ -500,6 +538,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()));
@@ -514,15 +562,87 @@ public class VotingPluginVelocity {
 
 		metrics.addCustomChart(new SimplePie("waitforuseronline", () -> "" + getConfig().getWaitForUserOnline()));
 
+		metrics.addCustomChart(new SimplePie("plugin_version", () -> "" + version));
+
+		if (!buildNumber.equals("NOTSET")) {
+			metrics.addCustomChart(new SimplePie("dev_build_number", () -> "" + buildNumber));
+		}
+
 		logger.info("VotingPlugin velocity loaded, method: " + method.toString() + ", PluginMessagingVersion: "
-				+ BungeeVersion.getPluginMessageVersion());
+				+ BungeeVersion.getPluginMessageVersion() + ", Internal Jar Version: " + version);
+		if (!buildNumber.equals("NOTSET")) {
+			logger.info("Detected using dev build number: " + buildNumber);
+		}
+	}
+
+	private String version = "";
+	private File versionFile;
+	private String buildNumber = "NOTSET";
+
+	private void getVersionFile() {
+		try {
+			CodeSource src = this.getClass().getProtectionDomain().getCodeSource();
+			if (src != null) {
+				URL jar = src.getLocation();
+				ZipInputStream zip = null;
+				zip = new ZipInputStream(jar.openStream());
+				while (true) {
+					ZipEntry e = zip.getNextEntry();
+					if (e != null) {
+						String name = e.getName();
+						if (name.equals("votingpluginversion.yml")) {
+							Reader defConfigStream = new InputStreamReader(zip);
+							if (defConfigStream != null) {
+								versionFile = new File(dataDirectory.toFile(),
+										"tmp" + File.separator + "votingpluginversion.yml");
+								if (!versionFile.exists()) {
+									versionFile.getParentFile().mkdirs();
+									versionFile.createNewFile();
+								}
+								FileWriter fileWriter = new FileWriter(versionFile);
+
+								int charVal;
+								while ((charVal = defConfigStream.read()) != -1) {
+									fileWriter.append((char) charVal);
+								}
+
+								fileWriter.close();
+								YAMLConfigurationLoader loader = YAMLConfigurationLoader.builder().setFile(versionFile)
+										.build();
+								defConfigStream.close();
+								ConfigurationNode node = loader.load();
+								if (node != null) {
+									version = node.getNode("version").getString("");
+									buildNumber = node.getNode("buildnumber").getString("NOTSET");
+								}
+								return;
+							}
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	@Subscribe
 	public void onVotifierEvent(VotifierEvent event) {
-		Vote vote = event.getVote();
-		logger.info("Vote received " + vote.getUsername() + " from service site " + vote.getServiceName());
-		vote(vote.getUsername(), vote.getServiceName(), true);
+		final String serviceSiteVote = event.getVote().getServiceName();
+		final String name = event.getVote().getUsername();
+		timer.schedule(new TimerTask() {
+
+			@Override
+			public void run() {
+				String serviceSite = serviceSiteVote;
+				logger.info("Vote received " + name + " from service site " + serviceSite);
+				if (serviceSite.isEmpty()) {
+					serviceSite = "Empty";
+				}
+				vote(name, serviceSite, true);
+			}
+		}, 0);
+
 	}
 
 	private UUID parseUUIDFromString(String uuidAsString) {
@@ -646,7 +766,7 @@ public class VotingPluginVelocity {
 		}
 	}
 
-	public void vote(String player, String service, boolean realVote) {
+	public synchronized void vote(String player, String service, boolean realVote) {
 		try {
 			if (player == null || player.isEmpty()) {
 				logger.info("No name from vote on " + service);
@@ -687,16 +807,27 @@ public class VotingPluginVelocity {
 				}
 
 				if (!mysql.getUuids().contains(uuid)) {
-					mysql.update(uuid, "PlayerName", player, DataType.STRING);
+					mysql.update(uuid, "PlayerName", new DataValueString(player));
 				}
 
-				ArrayList<Column> data = mysql.getExactQuery(new Column("uuid", uuid, DataType.STRING));
+				ArrayList<Column> data = mysql.getExactQuery(new Column("uuid", new DataValueString(uuid)));
 
-				text = new BungeeMessageData(mysqlUpdate(data, uuid, "AllTimeTotal", 1),
-						mysqlUpdate(data, uuid, "MonthTotal", 1), mysqlUpdate(data, uuid, "WeeklyTotal", 1),
-						mysqlUpdate(data, uuid, "DailyTotal", 1),
-						mysqlUpdate(data, uuid, "Points", getConfig().getPointsOnVote()),
-						mysqlUpdate(data, uuid, "MilestoneCount", 1));
+				int allTimeTotal = getValue(data, "AllTimeTotal", 1);
+				int monthTotal = getValue(data, "MonthTotal", 1);
+				int weeklyTotal = getValue(data, "WeeklyTotal", 1);
+				int dailyTotal = getValue(data, "DailyTotal", 1);
+				int points = getValue(data, "Points", getConfig().getPointsOnVote());
+				int milestoneCount = getValue(data, "MilestoneCount", 1);
+				text = new BungeeMessageData(allTimeTotal, monthTotal, weeklyTotal, dailyTotal, points, milestoneCount);
+				ArrayList<Column> update = new ArrayList<Column>();
+				update.add(new Column("AllTimeTotal", new DataValueInt(allTimeTotal)));
+				update.add(new Column("MonthTotal", new DataValueInt(monthTotal)));
+				update.add(new Column("WeeklyTotal", new DataValueInt(weeklyTotal)));
+				update.add(new Column("DailyTotal", new DataValueInt(dailyTotal)));
+				update.add(new Column("Points", new DataValueInt(points)));
+				update.add(new Column("MilestoneCount", new DataValueInt(milestoneCount)));
+				debug("Setting totals " + text.toString());
+				mysql.update(uuid, update);
 			} else {
 				text = new BungeeMessageData(0, 0, 0, 0, 0, 0);
 			}
@@ -741,7 +872,10 @@ public class VotingPluginVelocity {
 								sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
 										Boolean.TRUE.toString(), "" + realVote, text.toString(),
 										"" + getConfig().getBungeeManageTotals(),
-										"" + BungeeVersion.getPluginMessageVersion());
+										"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast());
+							}
+							if (config.getBroadcast()) {
+								sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
 							}
 						}
 					}
@@ -751,7 +885,8 @@ public class VotingPluginVelocity {
 							.contains(p.getCurrentServer().get().getServerInfo().getName())) {
 						sendPluginMessageServer(p.getCurrentServer().get().getServer(), "VoteOnline", player, uuid,
 								service, "" + time, Boolean.TRUE.toString(), "" + realVote, text.toString(),
-								"" + getConfig().getBungeeManageTotals(), "" + BungeeVersion.getPluginMessageVersion());
+								"" + getConfig().getBungeeManageTotals(), "" + BungeeVersion.getPluginMessageVersion(),
+								"" + config.getBroadcast());
 					} else {
 						if (!cachedOnlineVotes.containsKey(uuid)) {
 							cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
@@ -767,6 +902,9 @@ public class VotingPluginVelocity {
 
 					for (RegisteredServer s : server.getAllServers()) {
 						sendPluginMessageServer(s, "VoteUpdate", uuid);
+						if (config.getBroadcast()) {
+							sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
+						}
 					}
 				}
 			} else if (method.equals(BungeeMethod.SOCKETS)) {

VotingPlugin/src/com/bencodez/votingplugin/commands/CommandLoader.java

@@ -4,6 +4,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Set;
+import java.util.UUID;
 import java.util.regex.Pattern;
 
 import org.bukkit.Bukkit;
@@ -30,7 +31,7 @@ import com.bencodez.advancedcore.api.misc.PlayerUtils;
 import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.updater.Updater;
-import com.bencodez.advancedcore.api.user.UUID;
+import com.bencodez.advancedcore.api.user.userstorage.DataType;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.listeners.BooleanListener;
 import com.bencodez.advancedcore.api.valuerequest.listeners.StringListener;
@@ -262,10 +263,11 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				sendMessage(sender, "&cStarting...");
 				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					user.dontCache();
 					user.setMilestoneCount(user.getTotal(TopVoter.AllTime));
 				}
-				sendMessage(sender, "&cFinished");
+				sendMessage(sender, "&cFinished sync milestonecount with all time total");
 
 			}
 		});
@@ -278,10 +280,7 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						sendMessage(sender, "&cStarting to clear milestonecounts...");
-						for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-							user.setMilestoneCount(0);
-						}
+						plugin.getTopVoterHandler().resetMilestoneCount();
 						sendMessage(sender, "&cFinished");
 
 					}
@@ -305,7 +304,9 @@ public class CommandLoader {
 							}
 						}
 						for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+							VotingPluginUser user = UserManager.getInstance()
+									.getVotingPluginUser(UUID.fromString(uuid));
+							user.dontCache();
 							int milestoneCount = user.getMilestoneCount();
 							for (int num : nums) {
 								if (milestoneCount >= num) {
@@ -333,10 +334,8 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						sendMessage(sender, "&cStarting...");
-						for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-							user.setPoints(0);
-						}
+						plugin.getUserManager().removeAllKeyValues("Points", DataType.INTEGER);
+						plugin.getUserManager().getDataManager().clearCache();
 						sendMessage(sender, "&cFinished");
 
 					}
@@ -364,6 +363,7 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						user.clearCache();
 						synchronized (pointLock) {
 							user.addPoints(Integer.parseInt(args[3]));
 						}
@@ -379,6 +379,7 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						user.clearCache();
 						user.removePoints(Integer.parseInt(args[3]));
 						sender.sendMessage(StringParser.getInstance().colorize("&cRemoved " + args[3] + " points from "
 								+ args[1] + ", " + args[1] + " now has " + user.getPoints() + " points"));
@@ -407,7 +408,7 @@ public class CommandLoader {
 							for (String serviceSite : serviceSites) {
 								boolean hasSite = plugin.hasVoteSite(serviceSite);
 								if (hasSite) {
-									String siteName = plugin.getVoteSiteName(serviceSite);
+									String siteName = plugin.getVoteSiteName(true, serviceSite);
 									sendMessage(sender, serviceSite + " : Current site = " + siteName);
 								} else {
 									sendMessage(sender, serviceSite
@@ -623,6 +624,12 @@ public class CommandLoader {
 
 				sendMessage(sender,
 						"Using AdvancedCore " + plugin.getVersion() + "' built on '" + plugin.getBuildTime());
+				if (!plugin.getAdvancedCoreBuildNumber().equals("NOTSET")) {
+					sendMessage(sender, "AdvancedCore Jenkins build number: " + plugin.getAdvancedCoreBuildNumber());
+				}
+				if (!plugin.getBuildNumber().equals("NOTSET")) {
+					sendMessage(sender, "Using votingplugin jenkins build: " + plugin.getBuildNumber());
+				}
 			}
 		});
 
@@ -651,7 +658,7 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				if (sender instanceof Player) {
-					new AdminGUI(plugin).openAdminGUIVoteSiteSite((Player) sender, plugin.getVoteSite(args[1]));
+					new AdminGUI(plugin).openAdminGUIVoteSiteSite((Player) sender, plugin.getVoteSite(args[1], false));
 				} else {
 					sender.sendMessage("Must be a player to do this");
 				}
@@ -677,7 +684,7 @@ public class CommandLoader {
 				try {
 					sender.sendMessage(ChatColor.GREEN + "PlayerName of player " + ChatColor.DARK_GREEN + args[1]
 							+ ChatColor.GREEN + " is: " + PlayerUtils.getInstance().getPlayerName(
-									UserManager.getInstance().getVotingPluginUser(new UUID(args[1])), args[1]));
+									UserManager.getInstance().getVotingPluginUser(UUID.fromString(args[1])), args[1]));
 				} catch (IllegalArgumentException e) {
 					sendMessage(sender, "&cInvalid uuid");
 				}
@@ -696,16 +703,16 @@ public class CommandLoader {
 					return;
 				}
 
-				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-					user.clearTotals();
+				for (TopVoter top : TopVoter.values()) {
+					plugin.getUserManager().removeAllKeyValues(top.getColumnName(), DataType.INTEGER);
 				}
+				plugin.getUserManager().getDataManager().clearCache();
 				sender.sendMessage(StringParser.getInstance().colorize("&cCleared totals for everyone"));
 			}
 		});
 
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ClearOfflineRewards" },
-				"VotingPlugin.Commands.AdminVote.ClearOfflineRewards|" + adminPerm, "Reset offline votes/rewards") {
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ClearOfflineVoteRewards" },
+				"VotingPlugin.Commands.AdminVote.ClearOfflineVoteRewards|" + adminPerm, "Reset offline votes/rewards") {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
@@ -714,12 +721,11 @@ public class CommandLoader {
 							StringParser.getInstance().colorize("&cThis command can not be done from ingame"));
 					return;
 				}
-
-				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-					user.clearOfflineRewards();
-				}
-				sender.sendMessage(StringParser.getInstance().colorize("&cCleared totals for everyone"));
+				plugin.getUserManager().removeAllKeyValues("OfflineVotes", DataType.STRING);
+				plugin.getUserManager().removeAllKeyValues(plugin.getUserManager().getOfflineRewardsPath(),
+						DataType.STRING);
+				plugin.getUserManager().getDataManager().clearCache();
+				sender.sendMessage(StringParser.getInstance().colorize("&cCleared offline votes/rewards"));
 			}
 		});
 
@@ -832,6 +838,20 @@ public class CommandLoader {
 					}
 				});
 
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(player)", "ClearGottenMilestones" },
+						"VotingPlugin.Commands.AdminVote.ClearGottenMilestones|" + adminPerm,
+						"Clears received milestones") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						user.setHasGottenMilestone(new HashMap<String, Boolean>());
+						sender.sendMessage(
+								StringParser.getInstance().colorize("&cClearing gotten milestones for " + args[1]));
+					}
+				});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Vote", "(player)", "All" },
 				"VotingPlugin.Commands.AdminVote.Vote|" + adminPerm, "Trigger manual vote") {
 
@@ -862,7 +882,8 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[2]), args[1], args[2], false);
+				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[2], true), args[1], args[2],
+						false);
 				sendMessage(sender, "&cTriggering vote...");
 				if (voteEvent.getVoteSite() != null) {
 					if (!voteEvent.getVoteSite().isVaidServiceSite()) {
@@ -928,8 +949,8 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[3]), args[1], args[3],
-								false);
+						PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[3], true), args[1],
+								args[3], false);
 						sendMessage(sender, "&cTriggering vote...");
 						if (voteEvent.getVoteSite() != null) {
 							if (!voteEvent.getVoteSite().isVaidServiceSite()) {
@@ -984,7 +1005,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						String voteSite = plugin.getVoteSiteName(args[1]);
+						String voteSite = plugin.getVoteSiteName(true, args[1]);
 						String serviceSite = args[3];
 						plugin.getConfigVoteSites().setServiceSite(voteSite, serviceSite);
 						sender.sendMessage(StringParser.getInstance()
@@ -998,7 +1019,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						String voteSite = plugin.getVoteSiteName(args[1]);
+						String voteSite = plugin.getVoteSiteName(true, args[1]);
 						String url = args[3];
 						plugin.getConfigVoteSites().setVoteURL(voteSite, url);
 						sender.sendMessage(StringParser.getInstance()
@@ -1012,7 +1033,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						String voteSite = plugin.getVoteSiteName(args[1]);
+						String voteSite = plugin.getVoteSiteName(true, args[1]);
 						int value = Integer.parseInt(args[3]);
 						plugin.getConfigVoteSites().setPriority(voteSite, value);
 						sender.sendMessage(StringParser.getInstance()
@@ -1027,7 +1048,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						String voteSite = plugin.getVoteSiteName(args[1]);
+						String voteSite = plugin.getVoteSiteName(true, args[1]);
 						int delay = Integer.parseInt(args[3]);
 						plugin.getConfigVoteSites().setVoteDelay(voteSite, delay);
 						sender.sendMessage(StringParser.getInstance()
@@ -1083,7 +1104,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						String voteSite = plugin.getVoteSiteName(args[1]);
+						String voteSite = plugin.getVoteSiteName(false, args[1]);
 						boolean value = Boolean.parseBoolean(args[3]);
 
 						plugin.getConfigVoteSites().setEnabled(voteSite, value);
@@ -1147,11 +1168,9 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-					user.setOfflineVotes(new ArrayList<String>());
-				}
-				sender.sendMessage(StringParser.getInstance().colorize("&cCleared"));
+				plugin.getUserManager().removeAllKeyValues("OfflineVotes", DataType.STRING);
+				plugin.getUserManager().getDataManager().clearCache();
+				sender.sendMessage(StringParser.getInstance().colorize("&cOffline votes Cleared"));
 			}
 		});
 
@@ -1518,7 +1537,7 @@ public class CommandLoader {
 													@Override
 													public void onInput(Player player, String value) {
 														PlayerVoteEvent voteEvent = new PlayerVoteEvent(
-																plugin.getVoteSite(value),
+																plugin.getVoteSite(value, true),
 																UserGUI.getInstance().getCurrentPlayer(player),
 																plugin.getVoteSiteServiceSite(value), false);
 														plugin.getServer().getPluginManager().callEvent(voteEvent);
@@ -1829,7 +1848,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				if (com.bencodez.advancedcore.api.user.UserManager.getInstance().userExist(args[1])) {
+				if (plugin.getUserManager().userExist(args[1])) {
 					new VoteLast(plugin, sender, UserManager.getInstance().getVotingPluginUser(args[1])).open();
 				} else {
 					sendMessage(sender, StringParser.getInstance()
@@ -1871,7 +1890,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				if (com.bencodez.advancedcore.api.user.UserManager.getInstance().userExist(args[1])) {
+				if (plugin.getUserManager().userExist(args[1])) {
 					new VoteNext(plugin, sender, UserManager.getInstance().getVotingPluginUser(args[1])).open();
 				} else {
 					sendMessage(sender, StringParser.getInstance()
@@ -1885,7 +1904,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				if (com.bencodez.advancedcore.api.user.UserManager.getInstance().userExist(args[1])) {
+				if (plugin.getUserManager().userExist(args[1])) {
 					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
 					String msg = plugin.getConfigFile().getFormatCommandVotePoints()
 							.replace("%Player%", user.getPlayerName()).replace("%Points%", "" + user.getPoints());
@@ -1928,7 +1947,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				if (com.bencodez.advancedcore.api.user.UserManager.getInstance().userExist(args[1])) {
+				if (plugin.getUserManager().userExist(args[1])) {
 					new VoteGUI(plugin, sender, UserManager.getInstance().getVotingPluginUser(args[1])).open();
 				} else {
 					sendMessage(sender, StringParser.getInstance()
@@ -1984,7 +2003,7 @@ public class CommandLoader {
 
 				@Override
 				public void execute(CommandSender sender, String[] args) {
-					new VoteTopVoter(plugin, sender, null, top, 1).open(GUIMethod.CHAT);
+					new VoteTopVoter(plugin, sender, null, top, 1).open(GUIMethod.valueOf(plugin.getGui().getGuiMethodTopVoter().toUpperCase()));
 				}
 			});
 
@@ -1994,7 +2013,7 @@ public class CommandLoader {
 				@Override
 				public void execute(CommandSender sender, String[] args) {
 					int page = Integer.parseInt(args[2]);
-					new VoteTopVoter(plugin, sender, null, top, page).open(GUIMethod.CHAT);
+					new VoteTopVoter(plugin, sender, null, top, page).open(GUIMethod.valueOf(plugin.getGui().getGuiMethodTopVoter().toUpperCase()));
 				}
 			});
 		}
@@ -2006,7 +2025,7 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				int page = Integer.parseInt(args[1]);
 
-				new VoteTopVoter(plugin, sender, null, TopVoter.getDefault(), page).open(GUIMethod.CHAT);
+				new VoteTopVoter(plugin, sender, null, TopVoter.getDefault(), page).open(GUIMethod.valueOf(plugin.getGui().getGuiMethodTopVoter().toUpperCase()));
 			}
 		});
 
@@ -2054,7 +2073,8 @@ public class CommandLoader {
 				int all = 0;
 
 				for (String uuid : uuids) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					user.dontCache();
 					daily += user.getTotal(TopVoter.Daily);
 					weekly += user.getTotal(TopVoter.Weekly);
 					month += user.getTotal(TopVoter.Monthly);
@@ -2080,7 +2100,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				if (com.bencodez.advancedcore.api.user.UserManager.getInstance().userExist(args[1])) {
+				if (plugin.getUserManager().userExist(args[1])) {
 					new VoteTotal(plugin, sender, UserManager.getInstance().getVotingPluginUser(args[1])).open();
 				} else {
 					sendMessage(sender, StringParser.getInstance()
@@ -2113,7 +2133,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				if (com.bencodez.advancedcore.api.user.UserManager.getInstance().userExist(args[1])) {
+				if (plugin.getUserManager().userExist(args[1])) {
 					new VoteBest(plugin, sender, UserManager.getInstance().getVotingPluginUser(args[1])).open();
 				} else {
 					sendMessage(sender, StringParser.getInstance()
@@ -2136,7 +2156,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				if (com.bencodez.advancedcore.api.user.UserManager.getInstance().userExist(args[1])) {
+				if (plugin.getUserManager().userExist(args[1])) {
 					new VoteStreak(plugin, sender, UserManager.getInstance().getVotingPluginUser(args[1])).open();
 				} else {
 					sendMessage(sender, StringParser.getInstance()
@@ -2153,9 +2173,11 @@ public class CommandLoader {
 				public void execute(CommandSender sender, String[] args) {
 					if (plugin.getConfigFile().isAllowVotePointTransfers()) {
 						VotingPluginUser cPlayer = UserManager.getInstance().getVotingPluginUser((Player) sender);
+						cPlayer.cache();
 
-						if (com.bencodez.advancedcore.api.user.UserManager.getInstance().userExist(args[1])) {
+						if (plugin.getUserManager().userExist(args[1])) {
 							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+							user.dontCache();
 							int pointsToGive = Integer.parseInt(args[2]);
 							if (pointsToGive > 0) {
 								if (cPlayer.getPoints() >= pointsToGive) {

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVoteBungeeSettings.java

@@ -18,7 +18,7 @@ public class AdminVoteBungeeSettings extends GUIHandler {
 	private VotingPluginMain plugin;
 
 	public AdminVoteBungeeSettings(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVoteConfirmation.java

@@ -21,7 +21,7 @@ public abstract class AdminVoteConfirmation extends GUIHandler {
 	private String title;
 
 	public AdminVoteConfirmation(VotingPluginMain plugin, CommandSender player, String title) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.title = title;
 	}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVoteHelp.java

@@ -21,7 +21,7 @@ public class AdminVoteHelp extends GUIHandler {
 	private VotingPluginMain plugin;
 
 	public AdminVoteHelp(VotingPluginMain plugin, CommandSender player, int page) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.page = page;
 	}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVotePerms.java

@@ -22,13 +22,13 @@ public class AdminVotePerms extends GUIHandler {
 	private VotingPluginMain plugin;
 
 	public AdminVotePerms(VotingPluginMain plugin, CommandSender player, int page) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.page = page;
 	}
 
 	public AdminVotePerms(VotingPluginMain plugin, CommandSender player, int page, String playerName) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.page = page;
 		this.playerName = playerName;

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVotePlaceholders.java

@@ -19,11 +19,10 @@ import xyz.upperlevel.spigot.book.BookUtil;
 
 public class AdminVotePlaceholders extends GUIHandler {
 
-	@SuppressWarnings("unused")
 	private VotingPluginMain plugin;
 
 	public AdminVotePlaceholders(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVotePlaceholdersPlayer.java

@@ -20,12 +20,11 @@ import xyz.upperlevel.spigot.book.BookUtil;
 
 public class AdminVotePlaceholdersPlayer extends GUIHandler {
 
-	@SuppressWarnings("unused")
 	private VotingPluginMain plugin;
 	private VotingPluginUser user;
 
 	public AdminVotePlaceholdersPlayer(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVoteVoteParty.java

@@ -28,7 +28,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 	private VotingPluginMain plugin;
 
 	public AdminVoteVoteParty(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVoteVotePlayer.java

@@ -20,7 +20,7 @@ public class AdminVoteVotePlayer extends GUIHandler {
 	private VotingPluginMain plugin;
 
 	public AdminVoteVotePlayer(VotingPluginMain plugin, CommandSender player, String playerName) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.playerName = playerName;
 	}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/cumulative/AdminVoteCumulative.java

@@ -26,7 +26,7 @@ public class AdminVoteCumulative extends GUIHandler {
 	private VotingPluginMain plugin;
 
 	public AdminVoteCumulative(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/cumulative/AdminVoteCumulativeRemove.java

@@ -20,7 +20,7 @@ public class AdminVoteCumulativeRemove extends GUIHandler {
 	private VotingPluginMain plugin;
 
 	public AdminVoteCumulativeRemove(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/milestones/AdminVoteMilestoneRemove.java

@@ -20,7 +20,7 @@ public class AdminVoteMilestoneRemove extends GUIHandler {
 	private VotingPluginMain plugin;
 
 	public AdminVoteMilestoneRemove(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/milestones/AdminVoteMilestones.java

@@ -26,7 +26,7 @@ public class AdminVoteMilestones extends GUIHandler {
 	private VotingPluginMain plugin;
 
 	public AdminVoteMilestones(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/voteshop/AdminVoteVoteShop.java

@@ -21,7 +21,7 @@ public class AdminVoteVoteShop extends GUIHandler {
 	private VotingPluginMain plugin;
 
 	public AdminVoteVoteShop(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/voteshop/AdminVoteVoteShopItem.java

@@ -27,7 +27,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 	private VotingPluginMain plugin;
 
 	public AdminVoteVoteShopItem(VotingPluginMain plugin, CommandSender player, String identifier) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.identifier = identifier;
 	}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/voteshop/AdminVoteVoteShopItemRemove.java

@@ -19,7 +19,7 @@ public class AdminVoteVoteShopItemRemove extends GUIHandler {
 	private VotingPluginMain plugin;
 
 	public AdminVoteVoteShopItemRemove(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/voteshop/AdminVoteVoteShopItems.java

@@ -18,7 +18,7 @@ public class AdminVoteVoteShopItems extends GUIHandler {
 	private VotingPluginMain plugin;
 
 	public AdminVoteVoteShopItems(VotingPluginMain plugin, CommandSender player) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 	}
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteBest.java

@@ -18,12 +18,11 @@ import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteBest extends GUIHandler {
 
-	@SuppressWarnings("unused")
 	private VotingPluginMain plugin;
 	private VotingPluginUser user;
 
 	public VoteBest(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteGUI.java

@@ -25,7 +25,7 @@ public class VoteGUI extends GUIHandler {
 	private VotingPluginUser user;
 
 	public VoteGUI(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteHelp.java

@@ -22,7 +22,7 @@ public class VoteHelp extends GUIHandler {
 	private VotingPluginMain plugin;
 
 	public VoteHelp(VotingPluginMain plugin, CommandSender player, int page) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.page = page;
 	}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteLast.java

@@ -23,7 +23,7 @@ public class VoteLast extends GUIHandler {
 	private VotingPluginUser user;
 
 	public VoteLast(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteNext.java

@@ -27,7 +27,7 @@ public class VoteNext extends GUIHandler {
 	private VotingPluginUser user;
 
 	public VoteNext(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteShop.java

@@ -25,7 +25,7 @@ public class VoteShop extends GUIHandler {
 	private VotingPluginUser user;
 
 	public VoteShop(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}
@@ -85,10 +85,8 @@ public class VoteShop extends GUIHandler {
 							Player player = event.getWhoClicked();
 
 							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-							if (plugin.getConfigFile().isClearCacheOnVoteShopPurchase()
-									|| plugin.getBungeeSettings().isUseBungeecoord()) {
-								user.clearCache();
-							}
+							user.clearCache();
+
 							String identifier = (String) getData("identifier");
 							int limit = (int) getData("Limit");
 							int points = plugin.getGui().getChestShopIdentifierCost(identifier);
@@ -113,6 +111,8 @@ public class VoteShop extends GUIHandler {
 										placeholders.put("points", "" + points);
 										placeholders.put("limit", "" + limit);
 										if (user.removePoints(points)) {
+											plugin.getLogger().info("VoteShop: " + user.getPlayerName() + "/"
+													+ user.getUUID() + " bought " + identifier + " for " + points);
 
 											RewardHandler.getInstance().giveReward(user, plugin.getGui().getData(),
 													plugin.getGui().getChestShopIdentifierRewardsPath(identifier),

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteShopConfirm.java

@@ -26,7 +26,7 @@ public class VoteShopConfirm extends GUIHandler {
 	private VotingPluginUser user;
 
 	public VoteShopConfirm(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, String identifier) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 		this.identifier = identifier;
@@ -54,6 +54,7 @@ public class VoteShopConfirm extends GUIHandler {
 
 			@Override
 			public void onClick(ClickEvent event) {
+				user.clearCache();
 				int points = plugin.getGui().getChestShopIdentifierCost(identifier);
 				int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
 				HashMap<String, String> placeholders = new HashMap<String, String>();
@@ -61,6 +62,8 @@ public class VoteShopConfirm extends GUIHandler {
 				placeholders.put("points", "" + points);
 				placeholders.put("limit", "" + limit);
 				if (user.removePoints(points)) {
+					plugin.getLogger().info("VoteShop: " + user.getPlayerName() + "/" + user.getUUID() + " bought "
+							+ identifier + " for " + points);
 
 					RewardHandler.getInstance().giveReward(user, plugin.getGui().getData(),
 							plugin.getGui().getChestShopIdentifierRewardsPath(identifier),

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteStreak.java

@@ -23,7 +23,7 @@ public class VoteStreak extends GUIHandler {
 	private VotingPluginUser user;
 
 	public VoteStreak(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteToday.java

@@ -5,6 +5,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map.Entry;
+import java.util.UUID;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -17,10 +18,10 @@ import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
-import com.bencodez.advancedcore.api.user.UUID;
 import com.bencodez.advancedcore.nms.NMSManager;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
+import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
 import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
@@ -31,7 +32,7 @@ public class VoteToday extends GUIHandler {
 	private VotingPluginUser user;
 
 	public VoteToday(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, int page) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 		this.page = page;
@@ -84,7 +85,7 @@ public class VoteToday extends GUIHandler {
 		if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
 			inv.dontClose();
 		}
-		for (VotingPluginUser user : plugin.getVoteToday().keySet()) {
+		for (TopVoterPlayer user : plugin.getVoteToday().keySet()) {
 
 			for (VoteSite voteSite : plugin.getVoteToday().get(user).keySet()) {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(plugin.getConfigFile().getFormatTimeFormat());
@@ -103,12 +104,12 @@ public class VoteToday extends GUIHandler {
 				item.setName(StringParser.getInstance().replacePlaceHolder(plugin.getGui().getChestVoteTodayIconTitle(),
 						"player", user.getPlayerName()));
 				item.setLore(msg);
-				final String uuid = user.getUUID();
+				final UUID uuid = user.getUuid();
 				inv.addButton(inv.getNextSlot(), new BInventoryButton(item) {
 
 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(uuid);
 						new VoteGUI(plugin, player, user)
 								.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
 					}
@@ -129,7 +130,7 @@ public class VoteToday extends GUIHandler {
 
 	public String[] voteToday() {
 		ArrayList<String> msg = new ArrayList<String>();
-		for (VotingPluginUser user : plugin.getVoteToday().keySet()) {
+		for (TopVoterPlayer user : plugin.getVoteToday().keySet()) {
 
 			for (VoteSite voteSite : plugin.getVoteToday().get(user).keySet()) {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(plugin.getConfigFile().getFormatTimeFormat());
@@ -150,7 +151,7 @@ public class VoteToday extends GUIHandler {
 
 	public String[] voteTodayGUI() {
 		ArrayList<String> msg = new ArrayList<String>();
-		for (VotingPluginUser user : plugin.getVoteToday().keySet()) {
+		for (TopVoterPlayer user : plugin.getVoteToday().keySet()) {
 
 			LocalDateTime mostRecent = null;
 			VoteSite mostRecentSite = null;

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteTopVoter.java

@@ -19,6 +19,7 @@ import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;
+import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteTopVoter extends GUIHandler {
@@ -29,7 +30,7 @@ public class VoteTopVoter extends GUIHandler {
 	private VotingPluginUser user;
 
 	public VoteTopVoter(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, TopVoter top, int page) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 		this.top = top;
@@ -69,11 +70,11 @@ public class VoteTopVoter extends GUIHandler {
 			if (top == null) {
 				top = TopVoter.getDefault();
 			}
-			Set<Entry<VotingPluginUser, Integer>> users = null;
+			Set<Entry<TopVoterPlayer, Integer>> users = null;
 
 			String topVoter = top.getName();
 			@SuppressWarnings("unchecked")
-			LinkedHashMap<VotingPluginUser, Integer> topVotes = (LinkedHashMap<VotingPluginUser, Integer>) plugin
+			LinkedHashMap<TopVoterPlayer, Integer> topVotes = (LinkedHashMap<TopVoterPlayer, Integer>) plugin
 					.getTopVoter(top).clone();
 			users = topVotes.entrySet();
 
@@ -84,7 +85,7 @@ public class VoteTopVoter extends GUIHandler {
 			}
 
 			int pos = 1;
-			for (Entry<VotingPluginUser, Integer> entry : users) {
+			for (Entry<TopVoterPlayer, Integer> entry : users) {
 				ItemBuilder playerItem;
 
 				if (plugin.getGui().isChestVoteTopUseSkull()) {

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteTopVoterLastMonth.java

@@ -15,6 +15,7 @@ import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteTopVoterLastMonth extends GUIHandler {
@@ -23,7 +24,7 @@ public class VoteTopVoterLastMonth extends GUIHandler {
 	private VotingPluginUser user;
 
 	public VoteTopVoterLastMonth(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}
@@ -44,7 +45,7 @@ public class VoteTopVoterLastMonth extends GUIHandler {
 
 	@Override
 	public void onChest(Player player) {
-		Set<Entry<VotingPluginUser, Integer>> users = null;
+		Set<Entry<TopVoterPlayer, Integer>> users = null;
 
 		users = plugin.getLastMonthTopVoter().entrySet();
 
@@ -55,7 +56,7 @@ public class VoteTopVoterLastMonth extends GUIHandler {
 		}
 
 		int pos = 1;
-		for (Entry<VotingPluginUser, Integer> entry : users) {
+		for (Entry<TopVoterPlayer, Integer> entry : users) {
 			ItemBuilder playerItem;
 
 			if (plugin.getGui().isChestVoteTopUseSkull()) {

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteTotal.java

@@ -19,12 +19,11 @@ import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteTotal extends GUIHandler {
 
-	@SuppressWarnings("unused")
 	private VotingPluginMain plugin;
 	private VotingPluginUser user;
 
 	public VoteTotal(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 	}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteURL.java

@@ -36,7 +36,7 @@ public class VoteURL extends GUIHandler {
 	private VotingPluginUser user;
 
 	public VoteURL(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, boolean json) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 		this.json = json;
@@ -165,7 +165,7 @@ public class VoteURL extends GUIHandler {
 		if (plugin.getGui().getChestVoteURLViewAllUrlsButtonEnabled()) {
 			ItemBuilder builderAll = getItemAll();
 
-			inv.addButton(new UpdatingBInventoryButton(builderAll, 1000, 1000) {
+			inv.addButton(new UpdatingBInventoryButton(builderAll, 5000, 5000) {
 
 				@Override
 				public void onClick(ClickEvent event) {
@@ -190,7 +190,7 @@ public class VoteURL extends GUIHandler {
 					startSlot++;
 				}
 
-				inv.addButton(new UpdatingBInventoryButton(builder, 1000, 1000) {
+				inv.addButton(new UpdatingBInventoryButton(builder, 5000, 5000) {
 
 					@Override
 					public void onClick(ClickEvent event) {

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteURLVoteSite.java

@@ -24,7 +24,7 @@ public class VoteURLVoteSite extends GUIHandler {
 	private String voteSite;
 
 	public VoteURLVoteSite(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, String voteSite) {
-		super(player);
+		super(plugin, player);
 		this.plugin = plugin;
 		this.user = user;
 		this.voteSite = voteSite;
@@ -51,7 +51,7 @@ public class VoteURLVoteSite extends GUIHandler {
 			player.sendMessage("Not a valid votesite");
 			return;
 		}
-		VoteSite site = plugin.getVoteSite(voteSite);
+		VoteSite site = plugin.getVoteSite(voteSite, true);
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteURLSiteName());
 		inv.addPlaceholder("site", site.getDisplayName());
 		inv.setMeta(player, "VoteSite", site);

VotingPlugin/src/com/bencodez/votingplugin/config/BungeeSettings.java

@@ -73,6 +73,10 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private boolean votifierBypass = false;
 
+	@ConfigDataBoolean(path = "DisableBroadcast")
+	@Getter
+	private boolean disableBroadcast = false;
+
 	public BungeeSettings(VotingPluginMain plugin) {
 		super(plugin, new File(plugin.getDataFolder(), "BungeeSettings.yml"));
 	}

VotingPlugin/src/com/bencodez/votingplugin/config/Config.java

@@ -37,6 +37,10 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean allowUnjoined = false;
 
+	@ConfigDataBoolean(path = "PreloadSkulls")
+	@Getter
+	private boolean preloadSkulls = false;
+
 	@ConfigDataBoolean(path = "AllowUnJoinedCheckServer")
 	@Getter
 	private boolean allowUnJoinedCheckServer = true;
@@ -45,10 +49,6 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean allowVotePointTransfers = false;
 
-	@ConfigDataBoolean(path = "AlterColumns")
-	@Getter
-	private boolean alterColumns = true;
-
 	@ConfigDataBoolean(path = "AlternateUUIDLookup")
 	@Getter
 	private boolean alternateUUIDLookup = false;
@@ -73,18 +73,6 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean broadcastVotesEnabled = true;
 
-	@ConfigDataBoolean(path = "clearCacheOnUpdate")
-	@Getter
-	private boolean clearCacheOnUpdate = false;
-
-	@ConfigDataBoolean(path = "ClearCacheOnVote")
-	@Getter
-	private boolean clearCacheOnVote = false;
-
-	@ConfigDataBoolean(path = "ClearCacheOnVoteShopPurchase")
-	@Getter
-	private boolean clearCacheOnVoteShopPurchase = true;
-
 	@ConfigDataBoolean(path = "CountFakeVotes")
 	@Getter
 	private boolean countFakeVotes = true;
@@ -231,7 +219,7 @@ public class Config extends YMLFile {
 
 	@ConfigDataInt(path = "MaxiumNumberOfTopVotersToLoad")
 	@Getter
-	private int MaxiumNumberOfTopVotersToLoad = -1;
+	private int MaxiumNumberOfTopVotersToLoad = 1000;
 
 	@ConfigDataBoolean(path = "OverrideVersionDisable")
 	@Getter

VotingPlugin/src/com/bencodez/votingplugin/cooldown/CoolDownCheck.java

@@ -1,6 +1,10 @@
 package com.bencodez.votingplugin.cooldown;
 
+import java.util.HashSet;
+import java.util.Set;
+import java.util.Timer;
 import java.util.TimerTask;
+import java.util.UUID;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -8,79 +12,105 @@ import org.bukkit.event.Listener;
 
 import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
-import com.bencodez.advancedcore.api.time.events.DateChangedEvent;
-import com.bencodez.advancedcore.api.user.UUID;
+import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
+import com.bencodez.advancedcore.api.user.UserStartup;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.events.PlayerVoteCoolDownEndEvent;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
-// TODO: Auto-generated Javadoc
-/**
- * The Class VoteReminding.
- */
 public class CoolDownCheck implements Listener {
 
 	private VotingPluginMain plugin;
 
-	/**
-	 * Instantiates a new vote reminding.
-	 *
-	 * @param plugin the plugin
-	 */
+	private Set<UUID> uuids = new HashSet<UUID>();
+
 	public CoolDownCheck(VotingPluginMain plugin) {
 		this.plugin = plugin;
+		this.timer = new Timer();
 	}
 
-	public void checkAll() {
+	private Timer timer;
+
+	private boolean cooldownCheckEnabled = false;
+
+	public void checkEnabled() {
 		if (!plugin.getConfigFile().isDisableCoolDownCheck() && RewardHandler.getInstance()
 				.hasRewards(plugin.getSpecialRewardsConfig().getData(), "VoteCoolDownEndedReward")) {
-			plugin.getTimer().schedule(new TimerTask() {
+			cooldownCheckEnabled = true;
+		} else {
+			cooldownCheckEnabled = false;
+		}
+	}
+
+	public void check(UUID uuid) {
+		check(plugin.getVotingPluginUserManager().getVotingPluginUser(uuid));
+	}
+
+	public void vote(VotingPluginUser user) {
+		if (cooldownCheckEnabled) {
+			UUID uuid = UUID.fromString(user.getUUID());
+			if (!uuids.contains(uuid)) {
+				schedule(user);
+			}
+		}
+	}
+
+	public void check(VotingPluginUser user) {
+		boolean coolDownCheck = user.getCoolDownCheck();
+		if (user.canVoteAll() && coolDownCheck) {
+			user.setCoolDownCheck(false);
+			PlayerVoteCoolDownEndEvent event = new PlayerVoteCoolDownEndEvent(user);
+			plugin.getServer().getPluginManager().callEvent(event);
+			uuids.remove(UUID.fromString(user.getUUID()));
+		} else if (!coolDownCheck) {
+			schedule(user);
+		}
+
+	}
+
+	public void schedule(VotingPluginUser user) {
+		final UUID uuid = UUID.fromString(user.getUUID());
+		long time = user.getNextTimeAllSitesAvailable();
+		if (time > 0) {
+			user.setCoolDownCheck(true);
+			uuids.add(uuid);
+			timer.schedule(new TimerTask() {
 
 				@Override
 				public void run() {
-					if (VotingPluginMain.plugin != null) {
-						if (!plugin.getConfigFile().isDisableCoolDownCheck() && RewardHandler.getInstance()
-								.hasRewards(plugin.getSpecialRewardsConfig().getData(), "VoteCoolDownEndedReward")) {
-							for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-								if (VotingPluginMain.plugin != null) {
-									VotingPluginUser user = UserManager.getInstance()
-											.getVotingPluginUser(new UUID(uuid));
-									if (user.getUserData().hasData() && user.hasLoggedOnBefore()) {
-										user.checkCoolDownEvents();
-									}
-								} else {
-									cancel();
-								}
-							}
-						} else {
-							plugin.debug("Not enabling cooldown check reward");
-							cancel();
-						}
-					} else {
-						cancel();
-					}
+					check(uuid);
 				}
-			}, 1000 * 60 * 5, 1000 * 60 * 30);
-		} else {
-			plugin.debug("Not enabling cooldown check reward");
+			}, time * 1000 + 1500);
 		}
 
 	}
 
 	public void load() {
-		checkAll();
+		if (cooldownCheckEnabled) {
+			plugin.addUserStartup(new UserStartup() {
+
+				@Override
+				public void onStartUp(AdvancedCoreUser advancedcoreUser) {
+					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(advancedcoreUser);
+					check(user);
+				}
+
+				@Override
+				public void onStart() {
+
+				}
+
+				@Override
+				public void onFinish() {
+
+				}
+			});
+		}
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onCoolDownEnd(PlayerVoteCoolDownEndEvent event) {
 		RewardHandler.getInstance().giveReward(event.getPlayer(), plugin.getSpecialRewardsConfig().getData(),
-				"VoteCoolDownEndedReward",
-				new RewardOptions().addPlaceholder("Votesite", event.getVoteSite().getDisplayName()));
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-	public void onDayChangeEnd(DateChangedEvent event) {
-		checkAll();
+				"VoteCoolDownEndedReward", new RewardOptions());
 	}
 }

VotingPlugin/src/com/bencodez/votingplugin/events/PlayerVoteCoolDownEndEvent.java

@@ -3,7 +3,6 @@ package com.bencodez.votingplugin.events;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import lombok.Getter;
@@ -35,14 +34,9 @@ public class PlayerVoteCoolDownEndEvent extends Event {
 	@Setter
 	private VotingPluginUser player;
 
-	@Getter
-	@Setter
-	private VoteSite voteSite;
-
-	public PlayerVoteCoolDownEndEvent(VotingPluginUser user, VoteSite site) {
+	public PlayerVoteCoolDownEndEvent(VotingPluginUser user) {
 		super(true);
 		player = user;
-		voteSite = site;
 	}
 
 	/*

VotingPlugin/src/com/bencodez/votingplugin/events/PlayerVoteEvent.java

@@ -76,6 +76,10 @@ public class PlayerVoteEvent extends Event {
 	@Setter
 	private boolean wasOnline;
 
+	@Getter
+	@Setter
+	private boolean broadcast = true;
+
 	public PlayerVoteEvent(VoteSite voteSite, String voteUsername, String serviceSite, boolean realVote) {
 		super(true);
 		this.player = voteUsername;

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

@@ -1,5 +1,7 @@
 package com.bencodez.votingplugin.listeners;
 
+import org.bukkit.Bukkit;
+
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
 import com.vexsoftware.votifier.model.Vote;
@@ -8,8 +10,14 @@ import com.vexsoftware.votifier.model.VotifierEvent;
 public class BungeeVotifierEvent {
 	public void send(VotingPluginMain plugin, PlayerVoteEvent event) {
 		plugin.debug("Triggering vote event");
-		VotifierEvent e = new VotifierEvent(
-				new Vote(event.getServiceSite(), event.getPlayer(), "VotingPlugin", "" + event.getTime()));
-		plugin.getServer().getPluginManager().callEvent(e);
+		Bukkit.getScheduler().runTask(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				VotifierEvent e = new VotifierEvent(
+						new Vote(event.getServiceSite(), event.getPlayer(), "VotingPlugin", "" + event.getTime()));
+				plugin.getServer().getPluginManager().callEvent(e);
+			}
+		});
 	}
 }

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

@@ -95,6 +95,7 @@ public class PlayerJoinEvent implements Listener {
 				VotingPluginMain.plugin.getAdvancedTab().remove(uuid);
 
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(uuid);
+				user.dontCache();
 				user.logoutRewards();
 			}
 		});

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

@@ -72,6 +72,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) {
 			if (!plugin.getConfigFile().isDisableNoServiceSiteMessage()) {
@@ -98,11 +102,6 @@ public class PlayerVoteListener implements Listener {
 		} else {
 			user = UserManager.getInstance().getVotingPluginUser(playerName);
 		}
-		user.updateName(true);
-
-		if (plugin.getConfigFile().isClearCacheOnVote() || plugin.getBungeeSettings().isUseBungeecoord()) {
-			user.clearCache();
-		}
 
 		if (voteSite.isWaitUntilVoteDelay() && !user.canVoteSite(voteSite)) {
 			plugin.getLogger().info(user.getPlayerName() + " must wait until votedelay is over, ignoring vote");
@@ -110,15 +109,22 @@ public class PlayerVoteListener implements Listener {
 		}
 
 		synchronized (object) {
+			// reupdate cache
+			user.clearCache();
+			user.cache();
+
+			user.updateName(true);
 
 			// vote party
 			plugin.getVoteParty().vote(user, event.isRealVote(), event.isForceBungee());
 
-			// broadcast vote if enabled in config
-			if (plugin.getConfigFile().isBroadcastVotesEnabled()
-					&& (plugin.getBungeeSettings().isBungeeBroadcast() || !event.isBungee())) {
-				if (!plugin.getConfigFile().getFormatBroadcastWhenOnline() || user.isOnline()) {
-					voteSite.broadcastVote(user);
+			if (event.isBroadcast() && !plugin.getBungeeSettings().isDisableBroadcast() ) {
+				// broadcast vote if enabled in config
+				if (plugin.getConfigFile().isBroadcastVotesEnabled()
+						&& (plugin.getBungeeSettings().isBungeeBroadcast() || !event.isBungee())) {
+					if (!plugin.getConfigFile().getFormatBroadcastWhenOnline() || user.isOnline()) {
+						voteSite.broadcastVote(user);
+					}
 				}
 			}
 
@@ -132,7 +138,7 @@ public class PlayerVoteListener implements Listener {
 			} else {
 				user.setTime(voteSite);
 			}
-			user.setLastVoteCoolDownCheck(false, voteSite);
+			plugin.getCoolDownCheck().vote(user);
 
 			// try logging to file
 			if (plugin.getConfigFile().isLogVotesToFile()) {
@@ -149,7 +155,7 @@ public class PlayerVoteListener implements Listener {
 			plugin.getSpecialRewards().checkFirstVote(user, event.isForceBungee());
 			plugin.getSpecialRewards().checkFirstVoteToday(user, event.isForceBungee());
 
-			if (user.isReminded()) {
+			if (user.isReminded() && plugin.getConfigFile().getVoteRemindingRemindOnlyOnce()) {
 				user.setReminded(false);
 			}
 
@@ -195,13 +201,15 @@ public class PlayerVoteListener implements Listener {
 						@Override
 						public void run() {
 							if (Bukkit.getOnlinePlayers().size() > 0) {
-								plugin.getPluginMessaging().sendPluginMessage(
-										PlayerUtils.getInstance().getRandomOnlinePlayer(), "VoteUpdate", uuid);
+								plugin.getPluginMessaging().sendPluginMessage("VoteUpdate", uuid);
 							}
 						}
 					}, 40);
 				}
 			}
+			if (!user.isOnline()) {
+				user.clearCache();
+			}
 		}
 
 		plugin.setUpdate(true);

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

@@ -41,7 +41,11 @@ public class VotiferEvent implements Listener {
 	public void onVotiferEvent(VotifierEvent event) {
 
 		Vote vote = event.getVote();
-		final String voteSite = vote.getServiceName();
+		String str = vote.getServiceName();
+		if (str.isEmpty()) {
+			str = "Empty";
+		}
+		final String voteSite = str;
 		final String IP = vote.getAddress();
 		final String voteUsername = vote.getUsername().trim();
 		if (IP.equals("VotingPlugin")) {
@@ -77,15 +81,15 @@ public class VotiferEvent implements Listener {
 						&& (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)
 								|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.SOCKETS))) {
 					plugin.getLogger().severe(
-							"Ignoring vote from votifier since pluginmessaging or socket bungee method is enabled, this means you aren't setup correctly for those methods");
+							"Ignoring vote from votifier since pluginmessaging or socket bungee method is enabled, this means you aren't setup correctly for those methods, please check: https://github.com/BenCodez/VotingPlugin/wiki/Bungeecord-Setups");
 					return;
 				}
-				String voteSiteName = plugin.getVoteSiteName(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 +97,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), voteUsername,
+				String voteSiteName = plugin.getVoteSiteName(true, voteSite);
+
+				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName, true), voteUsername,
 						voteSite, true);
 				plugin.getServer().getPluginManager().callEvent(voteEvent);
 

VotingPlugin/src/com/bencodez/votingplugin/objects/VoteSite.java

@@ -13,7 +13,6 @@ import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
-import com.bencodez.advancedcore.api.misc.PlayerUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.votingplugin.VotingPluginMain;
@@ -119,8 +118,7 @@ public class VoteSite {
 					String service = getServiceSite();
 
 					if (Bukkit.getOnlinePlayers().size() > 0) {
-						plugin.getPluginMessaging().sendPluginMessage(PlayerUtils.getInstance().getRandomOnlinePlayer(),
-								"VoteBroadcast", uuid, service);
+						plugin.getPluginMessaging().sendPluginMessage("VoteBroadcast", uuid, service);
 					}
 				}
 

VotingPlugin/src/com/bencodez/votingplugin/placeholders/PlaceHolders.java

@@ -17,6 +17,7 @@ import com.bencodez.advancedcore.api.placeholder.PlaceHolder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.topvoter.TopVoter;
+import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
 import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
@@ -41,7 +42,11 @@ public class PlaceHolders {
 	}
 
 	public String getPlaceHolder(OfflinePlayer p, String identifier) {
-		if (plugin.getConfigFile().isUseJavascriptPlaceholders()) {
+		return getPlaceHolder(p, identifier, true);
+	}
+
+	public String getPlaceHolder(OfflinePlayer p, String identifier, boolean javascript) {
+		if (plugin.getConfigFile().isUseJavascriptPlaceholders() && javascript) {
 			identifier = StringParser.getInstance().replaceJavascript(p, identifier);
 		}
 
@@ -56,7 +61,7 @@ public class PlaceHolders {
 			user.setWaitForCache(false);
 			if (!user.isCached()) {
 				user.loadCache();
-				return "";
+				return "..";
 			}
 		}
 		if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
@@ -81,7 +86,7 @@ public class PlaceHolders {
 		if (plugin.getConfigFile().isUseJavascriptPlaceholders()) {
 			identifier = StringParser.getInstance().replaceJavascript(p, identifier);
 		}
-		return getPlaceHolder((OfflinePlayer) p, identifier);
+		return getPlaceHolder((OfflinePlayer) p, identifier, false);
 	}
 
 	public void load() {
@@ -316,8 +321,8 @@ public class PlaceHolders {
 			@Override
 			public String placeholderRequest(OfflinePlayer p, VotingPluginUser user, String identifier) {
 				int num = 1;
-				for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
-					if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
+					if (entry.getKey().getUuid().equals(p.getUniqueId())) {
 						return "" + num;
 					}
 					num++;
@@ -332,9 +337,9 @@ public class PlaceHolders {
 			public String placeholderRequest(OfflinePlayer p, VotingPluginUser user, String identifier) {
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
-				for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
 					if (num == number) {
-						return "" + entry.getKey().getTotal(TopVoter.AllTime);
+						return "" + entry.getValue().intValue();
 					}
 					num++;
 				}
@@ -348,7 +353,7 @@ public class PlaceHolders {
 			public String placeholderRequest(OfflinePlayer p, VotingPluginUser user, String identifier) {
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
-				for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
 					if (num == number) {
 						return entry.getKey().getPlayerName();
 					}
@@ -363,8 +368,8 @@ public class PlaceHolders {
 			@Override
 			public String placeholderRequest(OfflinePlayer p, VotingPluginUser user, String identifier) {
 				int num = 1;
-				for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
-					if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
+					if (entry.getKey().getUuid().equals(p.getUniqueId())) {
 						return "" + num;
 					}
 					num++;
@@ -379,7 +384,7 @@ public class PlaceHolders {
 			public String placeholderRequest(OfflinePlayer p, VotingPluginUser user, String identifier) {
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
-				for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
 					if (num == number) {
 						return entry.getKey().getPlayerName();
 					}
@@ -395,9 +400,9 @@ public class PlaceHolders {
 			public String placeholderRequest(OfflinePlayer p, VotingPluginUser user, String identifier) {
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
-				for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
 					if (num == number) {
-						return "" + entry.getKey().getTotal(TopVoter.Monthly);
+						return "" + entry.getValue().intValue();
 					}
 					num++;
 				}
@@ -410,8 +415,8 @@ public class PlaceHolders {
 			@Override
 			public String placeholderRequest(OfflinePlayer p, VotingPluginUser user, String identifier) {
 				int num = 1;
-				for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
-					if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
+					if (entry.getKey().getUuid().equals(p.getUniqueId())) {
 						return "" + num;
 					}
 					num++;
@@ -426,7 +431,7 @@ public class PlaceHolders {
 			public String placeholderRequest(OfflinePlayer p, VotingPluginUser user, String identifier) {
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
-				for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
 					if (num == number) {
 						return entry.getKey().getPlayerName();
 					}
@@ -442,9 +447,9 @@ public class PlaceHolders {
 			public String placeholderRequest(OfflinePlayer p, VotingPluginUser user, String identifier) {
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
-				for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
 					if (num == number) {
-						return "" + entry.getKey().getTotal(TopVoter.Weekly);
+						return "" + entry.getValue().intValue();
 					}
 					num++;
 				}
@@ -457,8 +462,8 @@ public class PlaceHolders {
 			@Override
 			public String placeholderRequest(OfflinePlayer p, VotingPluginUser user, String identifier) {
 				int num = 1;
-				for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
-					if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
+					if (entry.getKey().getUuid().equals(p.getUniqueId())) {
 						return "" + num;
 					}
 					num++;
@@ -473,7 +478,7 @@ public class PlaceHolders {
 			public String placeholderRequest(OfflinePlayer p, VotingPluginUser user, String identifier) {
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
-				for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
 					if (num == number) {
 						return entry.getKey().getPlayerName();
 					}
@@ -497,9 +502,9 @@ public class PlaceHolders {
 			public String placeholderRequest(OfflinePlayer p, VotingPluginUser user, String identifier) {
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
-				for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
 					if (num == number) {
-						return "" + entry.getKey().getTotal(TopVoter.Daily);
+						return "" + entry.getValue().intValue();
 					}
 					num++;
 				}

VotingPlugin/src/com/bencodez/votingplugin/signs/SignHandler.java

@@ -16,7 +16,7 @@ import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.nms.NMSManager;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;
-import com.bencodez.votingplugin.user.VotingPluginUser;
+import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -79,9 +79,11 @@ public class SignHandler {
 	@SuppressWarnings("deprecation")
 	private boolean checkSkull(Block block) {
 		if (block.getState() instanceof Skull) {
-			Skull skull = (Skull) block.getState();
-			skull.setOwner(playerName);
-			skull.update();
+			if (!playerName.equals("No Player")) {
+				Skull skull = (Skull) block.getState();
+				skull.setOwner(playerName);
+				skull.update();
+			}
 			return true;
 		}
 		return false;
@@ -185,7 +187,7 @@ public class SignHandler {
 			lines.add(line3);
 			lines.add(line4);
 
-			ArrayList<VotingPluginUser> users = null;
+			ArrayList<TopVoterPlayer> users = null;
 			if (data.equalsIgnoreCase("all")) {
 				users = plugin.convertSet(plugin.getTopVoter(TopVoter.AllTime).keySet());
 			} else if (data.equalsIgnoreCase("monthly")) {
@@ -197,7 +199,7 @@ public class SignHandler {
 			}
 
 			if (users != null && users.size() >= position) {
-				VotingPluginUser user = users.get(position - 1);
+				TopVoterPlayer user = users.get(position - 1);
 				playerName = user.getPlayerName();
 
 				votes = 0;

VotingPlugin/src/com/bencodez/votingplugin/signs/Signs.java

@@ -81,7 +81,7 @@ public class Signs {
 			}
 		}
 
-		plugin.debug("Signs updated");
+		plugin.debug(getSigns().size() + " Signs updated");
 	}
 
 }

VotingPlugin/src/com/bencodez/votingplugin/test/VoteTester.java

@@ -52,7 +52,7 @@ public class VoteTester {
 		ArrayList<Long> timesPerVote = new ArrayList<Long>();
 		for (int i = 0; i < amount; i++) {
 			long start1 = System.currentTimeMillis();
-			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(site), name,
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(site, false), name,
 					plugin.getVoteSiteServiceSite(site), false);
 			plugin.getServer().getPluginManager().callEvent(voteEvent);
 			long start2 = System.currentTimeMillis();

VotingPlugin/src/com/bencodez/votingplugin/topvoter/TopVoter.java

@@ -5,7 +5,7 @@ import java.util.ArrayList;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 public enum TopVoter {
-	AllTime, Daily, Monthly, Weekly;
+	AllTime, Monthly, Weekly, Daily;
 
 	public static TopVoter getDefault() {
 		TopVoter top = getTopVoter(VotingPluginMain.plugin.getConfigFile().getVoteTopDefault());

VotingPlugin/src/com/bencodez/votingplugin/topvoter/TopVoterHandler.java

@@ -11,6 +11,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.UUID;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -24,8 +25,8 @@ import com.bencodez.advancedcore.api.time.events.DayChangeEvent;
 import com.bencodez.advancedcore.api.time.events.MonthChangeEvent;
 import com.bencodez.advancedcore.api.time.events.PreDateChangedEvent;
 import com.bencodez.advancedcore.api.time.events.WeekChangeEvent;
-import com.bencodez.advancedcore.api.user.UUID;
 import com.bencodez.advancedcore.api.user.UserStorage;
+import com.bencodez.advancedcore.api.user.userstorage.DataType;
 import com.bencodez.advancedcore.api.yml.YMLFileHandler;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.UserManager;
@@ -51,7 +52,7 @@ public class TopVoterHandler implements Listener {
 
 	public String[] getTopVotersWeekly() {
 		ArrayList<String> msg = new ArrayList<String>();
-		ArrayList<VotingPluginUser> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Weekly).keySet());
+		ArrayList<TopVoterPlayer> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Weekly).keySet());
 		for (int i = 0; i < users.size(); i++) {
 			String line = plugin.getConfigFile().getFormatCommandVoteTopLine().replace("%num%", "" + (i + 1))
 					.replace("%player%", users.get(i).getPlayerName())
@@ -85,13 +86,13 @@ public class TopVoterHandler implements Listener {
 	public void loadLastMonth() {
 		if (plugin.getGui().isLastMonthGUI()) {
 			plugin.getLastMonthTopVoter().clear();
-
-			LinkedHashMap<VotingPluginUser, Integer> totals = new LinkedHashMap<VotingPluginUser, Integer>();
+			LinkedHashMap<TopVoterPlayer, Integer> totals = new LinkedHashMap<TopVoterPlayer, Integer>();
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+				user.dontCache();
 				int total = user.getLastMonthTotal();
 				if (total > 0) {
-					totals.put(user, total);
+					totals.put(user.getTopVoterPlayer(), total);
 				}
 			}
 
@@ -110,15 +111,20 @@ public class TopVoterHandler implements Listener {
 			loadLastMonth();
 		}
 		if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
-			plugin.getMysql().clearCache();
+			plugin.getMysql().clearCacheBasic();
 		}
+		plugin.getUserManager().getDataManager().clearCache();
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onDayChange(DayChangeEvent event) {
 		synchronized (VotingPluginMain.plugin) {
+			long startTime = System.currentTimeMillis();
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid), false);
+				user.dontCache();
+				user.tempCache();
+				user.getUserData().updateCacheWithTemp();
 				if (plugin.getConfigFile().isUseVoteStreaks()) {
 					if (!user.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
 						if (user.getDayVoteStreak() != 0) {
@@ -132,11 +138,7 @@ public class TopVoterHandler implements Listener {
 						user.setHighestDailyTotal(user.getTotal(TopVoter.Daily));
 					}
 				}
-				for (String shopIdent : plugin.getGui().getChestShopIdentifiers()) {
-					if (plugin.getGui().getChestVoteShopResetDaily(shopIdent)) {
-						user.setVoteShopIdentifierLimit(shopIdent, 0);
-					}
-				}
+				user.clearTempCache();
 			}
 
 			if (plugin.getConfigFile().getStoreTopVotersDaily()) {
@@ -151,12 +153,14 @@ public class TopVoterHandler implements Listener {
 					int i = 0;
 					int lastTotal = -1;
 					@SuppressWarnings("unchecked")
-					LinkedHashMap<VotingPluginUser, Integer> clone = (LinkedHashMap<VotingPluginUser, Integer>) plugin
+					LinkedHashMap<TopVoterPlayer, Integer> clone = (LinkedHashMap<TopVoterPlayer, Integer>) plugin
 							.getTopVoter(TopVoter.Daily).clone();
-					for (VotingPluginUser user : clone.keySet()) {
+					for (Entry<TopVoterPlayer, Integer> entry : clone.entrySet()) {
+						VotingPluginUser user = entry.getKey().getUser();
+						user.dontCache();
 						if (!plugin.getConfigFile().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
 							if (plugin.getConfigFile().getTopVoterAwardsTies()) {
-								if (user.getTotal(TopVoter.Daily) != lastTotal) {
+								if (entry.getValue().intValue() != lastTotal) {
 									i++;
 								}
 							} else {
@@ -166,26 +170,42 @@ public class TopVoterHandler implements Listener {
 								user.giveDailyTopVoterAward(i, places.get(i));
 							}
 						}
-						lastTotal = user.getTotal(TopVoter.Daily);
+						lastTotal = entry.getValue().intValue();
 					}
 				}
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
 
+			for (String shopIdent : plugin.getGui().getChestShopIdentifiers()) {
+				if (plugin.getGui().getChestVoteShopResetDaily(shopIdent)) {
+					resetVoteShopLimit(shopIdent);
+				}
+			}
+
 			resetTotals(TopVoter.Daily);
 
 			if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
-				plugin.getMysql().clearCache();
+				plugin.getMysql().clearCacheBasic();
 			}
+			plugin.getUserManager().getDataManager().clearCache();
+
+			long now = ((System.currentTimeMillis() - startTime) / 1000);
+			plugin.getLogger().info("Finished processing day change, took " + now + " seconds");
 		}
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onMonthChange(MonthChangeEvent event) {
+		long startTime = System.currentTimeMillis();
 		synchronized (VotingPluginMain.plugin) {
+			plugin.getLogger().info("Saving TopVoters Monthly");
+			storeTopVoters(TopVoter.Monthly);
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid), false);
+				user.dontCache();
+				user.tempCache();
+				user.getUserData().updateCacheWithTemp();
 				if (plugin.getConfigFile().isUseVoteStreaks()) {
 					if (user.getTotal(TopVoter.Monthly) == 0 && user.getMonthVoteStreak() != 0) {
 						user.setMonthVoteStreak(0);
@@ -201,12 +221,6 @@ public class TopVoterHandler implements Listener {
 					}
 				}
 
-				for (String shopIdent : plugin.getGui().getChestShopIdentifiers()) {
-					if (plugin.getGui().getChestVoteShopResetMonthly(shopIdent)) {
-						user.setVoteShopIdentifierLimit(shopIdent, 0);
-					}
-				}
-
 				user.setLastMonthTotal(user.getTotal(TopVoter.Monthly));
 
 				if (plugin.getConfigFile().isUseHighestTotals()) {
@@ -214,11 +228,9 @@ public class TopVoterHandler implements Listener {
 						user.setHighestMonthlyTotal(user.getTotal(TopVoter.Monthly));
 					}
 				}
+				user.clearTempCache();
 			}
 
-			plugin.getLogger().info("Saving TopVoters Monthly");
-			storeTopVoters(TopVoter.Monthly);
-
 			try {
 				if (plugin.getSpecialRewardsConfig().isEnableMonthlyAwards()) {
 					HashMap<Integer, String> places = handlePlaces(
@@ -227,13 +239,14 @@ public class TopVoterHandler implements Listener {
 					int lastTotal = -1;
 
 					@SuppressWarnings("unchecked")
-					LinkedHashMap<VotingPluginUser, Integer> clone = (LinkedHashMap<VotingPluginUser, Integer>) plugin
+					LinkedHashMap<TopVoterPlayer, Integer> clone = (LinkedHashMap<TopVoterPlayer, Integer>) plugin
 							.getTopVoter(TopVoter.Monthly).clone();
-					for (VotingPluginUser user : clone.keySet()) {
-
+					for (Entry<TopVoterPlayer, Integer> entry : clone.entrySet()) {
+						VotingPluginUser user = entry.getKey().getUser();
+						user.dontCache();
 						if (!plugin.getConfigFile().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
 							if (plugin.getConfigFile().getTopVoterAwardsTies()) {
-								if (user.getTotal(TopVoter.Monthly) != lastTotal) {
+								if (entry.getValue().intValue() != lastTotal) {
 									i++;
 								}
 							} else {
@@ -243,7 +256,7 @@ public class TopVoterHandler implements Listener {
 								user.giveMonthlyTopVoterAward(i, places.get(i));
 							}
 						}
-						lastTotal = user.getTotal(TopVoter.Monthly);
+						lastTotal = entry.getValue().intValue();
 					}
 
 				}
@@ -252,19 +265,23 @@ public class TopVoterHandler implements Listener {
 			}
 
 			if (plugin.getSpecialRewardsConfig().getResetMilestonesMonthly()) {
-				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-					user.setMilestoneCount(0);
-					user.setHasGottenMilestone(new HashMap<String, Boolean>());
-				}
-
+				resetMilestoneCount();
+				resetGottenMilestones();
 			}
 
+			for (String shopIdent : plugin.getGui().getChestShopIdentifiers()) {
+				if (plugin.getGui().getChestVoteShopResetMonthly(shopIdent)) {
+					resetVoteShopLimit(shopIdent);
+				}
+			}
 			resetTotals(TopVoter.Monthly);
 
 			if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
-				plugin.getMysql().clearCache();
+				plugin.getMysql().clearCacheBasic();
 			}
+			plugin.getUserManager().getDataManager().clearCache();
+			long now = ((System.currentTimeMillis() - startTime) / 1000);
+			plugin.getLogger().info("Finished processing day change, took " + now + " seconds");
 		}
 	}
 
@@ -276,9 +293,13 @@ public class TopVoterHandler implements Listener {
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onWeekChange(WeekChangeEvent event) {
+		long startTime = System.currentTimeMillis();
 		synchronized (VotingPluginMain.plugin) {
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid), false);
+				user.dontCache();
+				user.tempCache();
+				user.getUserData().updateCacheWithTemp();
 				if (plugin.getConfigFile().isUseVoteStreaks()) {
 					if (user.getTotal(TopVoter.Weekly) == 0 && user.getWeekVoteStreak() != 0) {
 						user.setWeekVoteStreak(0);
@@ -293,17 +314,12 @@ public class TopVoterHandler implements Listener {
 					}
 				}
 
-				for (String shopIdent : plugin.getGui().getChestShopIdentifiers()) {
-					if (plugin.getGui().getChestVoteShopResetWeekly(shopIdent)) {
-						user.setVoteShopIdentifierLimit(shopIdent, 0);
-					}
-				}
-
 				if (plugin.getConfigFile().isUseHighestTotals()) {
 					if (user.getHighestWeeklyTotal() < user.getTotal(TopVoter.Weekly)) {
 						user.setHighestWeeklyTotal(user.getTotal(TopVoter.Weekly));
 					}
 				}
+				user.clearTempCache();
 			}
 
 			if (plugin.getConfigFile().getStoreTopVotersWeekly()) {
@@ -318,12 +334,14 @@ public class TopVoterHandler implements Listener {
 					int i = 0;
 					int lastTotal = -1;
 					@SuppressWarnings("unchecked")
-					LinkedHashMap<VotingPluginUser, Integer> clone = (LinkedHashMap<VotingPluginUser, Integer>) plugin
-							.getTopVoter(TopVoter.Weekly).clone();
-					for (VotingPluginUser user : clone.keySet()) {
+					LinkedHashMap<TopVoterPlayer, Integer> clone = (LinkedHashMap<TopVoterPlayer, Integer>) plugin
+							.getTopVoter(TopVoter.Monthly).clone();
+					for (Entry<TopVoterPlayer, Integer> entry : clone.entrySet()) {
+						VotingPluginUser user = entry.getKey().getUser();
+						user.dontCache();
 						if (!plugin.getConfigFile().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
 							if (plugin.getConfigFile().getTopVoterAwardsTies()) {
-								if (user.getTotal(TopVoter.Weekly) != lastTotal) {
+								if (entry.getValue().intValue() != lastTotal) {
 									i++;
 								}
 							} else {
@@ -333,17 +351,27 @@ public class TopVoterHandler implements Listener {
 								user.giveWeeklyTopVoterAward(i, places.get(i));
 							}
 						}
-						lastTotal = user.getTotal(TopVoter.Weekly);
+						lastTotal = entry.getValue().intValue();
 					}
 				}
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
+
+			for (String shopIdent : plugin.getGui().getChestShopIdentifiers()) {
+				if (plugin.getGui().getChestVoteShopResetWeekly(shopIdent)) {
+					resetVoteShopLimit(shopIdent);
+				}
+			}
 			resetTotals(TopVoter.Weekly);
 
 			if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
-				plugin.getMysql().clearCache();
+				plugin.getMysql().clearCacheBasic();
 			}
+			plugin.getUserManager().getDataManager().clearCache();
+
+			long now = ((System.currentTimeMillis() - startTime) / 1000);
+			plugin.getLogger().info("Finished processing day change, took " + now + " seconds");
 		}
 	}
 
@@ -351,29 +379,31 @@ public class TopVoterHandler implements Listener {
 		plugin.getServer().getPluginManager().registerEvents(this, plugin);
 	}
 
-	public void resetTotals(TopVoter topVoter) {
-		if (!plugin.getStorageType().equals(UserStorage.MYSQL)) {
-			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				if (user.getTotal(topVoter) != 0) {
-					user.resetTotals(topVoter);
-				}
-			}
-		} else {
-			plugin.getMysql().wipeColumnData(topVoter.getColumnName());
-		}
+	public void resetMilestoneCount() {
+		plugin.getUserManager().removeAllKeyValues("MilestoneCount", DataType.INTEGER);
 	}
 
-	public LinkedHashMap<VotingPluginUser, Integer> sortByValues(
-			LinkedHashMap<VotingPluginUser, Integer> topVoterAllTime, final boolean order) {
+	public void resetGottenMilestones() {
+		plugin.getUserManager().removeAllKeyValues("GottenMileStones", DataType.STRING);
+	}
 
-		List<Entry<VotingPluginUser, Integer>> list = new LinkedList<Entry<VotingPluginUser, Integer>>(
-				topVoterAllTime.entrySet());
+	public void resetVoteShopLimit(String shopIdent) {
+		plugin.getUserManager().removeAllKeyValues("VoteShopLimit" + shopIdent, DataType.INTEGER);
+	}
+
+	public void resetTotals(TopVoter topVoter) {
+		plugin.getUserManager().removeAllKeyValues(topVoter.getColumnName(), DataType.INTEGER);
+	}
+
+	public LinkedHashMap<TopVoterPlayer, Integer> sortByValues(LinkedHashMap<TopVoterPlayer, Integer> map,
+			final boolean order) {
+
+		List<Entry<TopVoterPlayer, Integer>> list = new LinkedList<Entry<TopVoterPlayer, Integer>>(map.entrySet());
 
 		// Sorting the list based on values
-		Collections.sort(list, new Comparator<Entry<VotingPluginUser, Integer>>() {
+		Collections.sort(list, new Comparator<Entry<TopVoterPlayer, Integer>>() {
 			@Override
-			public int compare(Entry<VotingPluginUser, Integer> o1, Entry<VotingPluginUser, Integer> o2) {
+			public int compare(Entry<TopVoterPlayer, Integer> o1, Entry<TopVoterPlayer, Integer> o2) {
 				if (order) {
 					return o1.getValue().compareTo(o2.getValue());
 				} else {
@@ -384,8 +414,8 @@ public class TopVoterHandler implements Listener {
 		});
 
 		// Maintaining insertion order with the help of LinkedList
-		LinkedHashMap<VotingPluginUser, Integer> sortedMap = new LinkedHashMap<VotingPluginUser, Integer>();
-		for (Entry<VotingPluginUser, Integer> entry : list) {
+		LinkedHashMap<TopVoterPlayer, Integer> sortedMap = new LinkedHashMap<TopVoterPlayer, Integer>();
+		for (Entry<TopVoterPlayer, Integer> entry : list) {
 			sortedMap.put(entry.getKey(), entry.getValue());
 		}
 
@@ -409,14 +439,17 @@ public class TopVoterHandler implements Listener {
 
 		YMLFileHandler file = new YMLFileHandler(plugin, new File(plugin.getDataFolder(), fileName));
 		file.setup();
+		file.header("Saving top voters for " + top.toString() + ", file also contains other top voter info as backup");
 		for (TopVoter cTop : TopVoter.values()) {
-			ArrayList<String> topVoters = new ArrayList<String>();
-			int count = 1;
-			for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(cTop).entrySet()) {
-				topVoters.add(count + ": " + entry.getKey().getPlayerName() + ": " + entry.getValue());
-				count++;
+			if (plugin.getTopVoter().containsKey(cTop)) {
+				ArrayList<String> topVoters = new ArrayList<String>();
+				int count = 1;
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(cTop).entrySet()) {
+					topVoters.add(count + ": " + entry.getKey().getPlayerName() + ": " + entry.getValue());
+					count++;
+				}
+				file.getData().set(cTop.toString(), topVoters);
 			}
-			file.getData().set(cTop.toString(), topVoters);
 		}
 		file.saveData();
 	}
@@ -432,7 +465,7 @@ public class TopVoterHandler implements Listener {
 		ArrayList<String> msg = new ArrayList<String>();
 		ArrayList<String> topVoters = new ArrayList<String>();
 		int count = 1;
-		for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
+		for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
 			String line = plugin.getConfigFile().getFormatCommandVoteTopLine();
 			line = line.replace("%num%", "" + count);
 			line = line.replace("%player%", entry.getKey().getPlayerName());
@@ -471,7 +504,7 @@ public class TopVoterHandler implements Listener {
 		ArrayList<String> msg = new ArrayList<String>();
 		ArrayList<String> topVoters = new ArrayList<String>();
 		int count = 1;
-		for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
+		for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
 			String line = plugin.getConfigFile().getFormatCommandVoteTopLine();
 			line = line.replace("%num%", "" + count);
 			line = line.replace("%player%", entry.getKey().getPlayerName());
@@ -510,7 +543,7 @@ public class TopVoterHandler implements Listener {
 		ArrayList<String> msg = new ArrayList<String>();
 		ArrayList<String> topVoters = new ArrayList<String>();
 		int count = 1;
-		for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
+		for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
 			String line = plugin.getConfigFile().getFormatCommandVoteTopLine();
 			line = line.replace("%num%", "" + count);
 			line = line.replace("%player%", entry.getKey().getPlayerName());
@@ -545,10 +578,10 @@ public class TopVoterHandler implements Listener {
 	 */
 	public String[] topVotersAllTime() {
 		ArrayList<String> msg = new ArrayList<String>();
-		List<Entry<VotingPluginUser, Integer>> list = new LinkedList<Entry<VotingPluginUser, Integer>>(
+		List<Entry<TopVoterPlayer, Integer>> list = new LinkedList<Entry<TopVoterPlayer, Integer>>(
 				plugin.getTopVoter(TopVoter.AllTime).entrySet());
 		int i = 0;
-		for (Entry<VotingPluginUser, Integer> entry : list) {
+		for (Entry<TopVoterPlayer, Integer> entry : list) {
 			String line = "%num%: %player%, %votes%";
 			line = line.replace("%num%", "" + (i + 1));
 			try {
@@ -574,7 +607,7 @@ public class TopVoterHandler implements Listener {
 
 	public String[] topVotersDaily() {
 		ArrayList<String> msg = new ArrayList<String>();
-		ArrayList<VotingPluginUser> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Daily).keySet());
+		ArrayList<TopVoterPlayer> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Daily).keySet());
 		for (int i = 0; i < users.size(); i++) {
 			String line = "%num%: %player%, %votes%";
 			line = line.replace("%num%", "" + (i + 1));
@@ -598,10 +631,10 @@ public class TopVoterHandler implements Listener {
 	 */
 	public String[] topVotersMonthly() {
 		ArrayList<String> msg = new ArrayList<String>();
-		List<Entry<VotingPluginUser, Integer>> list = new LinkedList<Entry<VotingPluginUser, Integer>>(
+		List<Entry<TopVoterPlayer, Integer>> list = new LinkedList<Entry<TopVoterPlayer, Integer>>(
 				plugin.getTopVoter(TopVoter.Monthly).entrySet());
 		int i = 0;
-		for (Entry<VotingPluginUser, Integer> entry : list) {
+		for (Entry<TopVoterPlayer, Integer> entry : list) {
 			String line = "%num%: %player%, %votes%";
 			line = line.replace("%num%", "" + (i + 1));
 			try {
@@ -630,7 +663,7 @@ public class TopVoterHandler implements Listener {
 		ArrayList<String> msg = new ArrayList<String>();
 		ArrayList<String> topVoters = new ArrayList<String>();
 		int count = 1;
-		for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
+		for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
 			String line = plugin.getConfigFile().getFormatCommandVoteTopLine();
 			line = line.replace("%num%", "" + count);
 			line = line.replace("%player%", entry.getKey().getPlayerName());
@@ -658,46 +691,26 @@ public class TopVoterHandler implements Listener {
 		return ArrayUtils.getInstance().convert(msg);
 	}
 
-	public synchronized void updateTopVoters(ArrayList<VotingPluginUser> users1) {
-		ArrayList<VotingPluginUser> users = new ArrayList<VotingPluginUser>();
-		ArrayList<String> blackList = getTopVoterBlackList();
-		for (VotingPluginUser user : users1) {
-			if (!blackList.contains(user.getPlayerName())) {
-				if ((!plugin.getConfigFile().getTopVoterIgnorePermission() || !user.isTopVoterIgnore())
-						&& !user.isBanned()) {
-					users.add(user);
-				}
-			}
-		}
+	public synchronized void updateTopVoters(
+			LinkedHashMap<TopVoter, LinkedHashMap<TopVoterPlayer, Integer>> tempTopVoter) {
 
-		plugin.debug("Number of users to check top voter: " + users.size());
-
-		for (TopVoter top : TopVoter.values()) {
-			if (plugin.getConfigFile().getLoadTopVoter(top)) {
-				LinkedHashMap<VotingPluginUser, Integer> map = new LinkedHashMap<VotingPluginUser, Integer>();
-
-				for (VotingPluginUser user : users) {
-					int total = user.getTotal(top);
-					if (total > 0) {
-						map.put(user, total);
+		int limitSize = plugin.getConfigFile().getMaxiumNumberOfTopVotersToLoad();
+		for (Entry<TopVoter, LinkedHashMap<TopVoterPlayer, Integer>> entry : tempTopVoter.entrySet()) {
+			LinkedHashMap<TopVoterPlayer, Integer> map = entry.getValue();
+			map = sortByValues(map, false);
+			if (limitSize > 0) {
+				ArrayList<TopVoterPlayer> listKeys = new ArrayList<TopVoterPlayer>(map.keySet());
+				if (listKeys.size() > limitSize) {
+					for (int i = listKeys.size() - 1; i >= 0 && i >= limitSize; i--) {
+						map.remove(listKeys.get(i));
 					}
 				}
 
-				map = sortByValues(map, false);
-				int limitSize = plugin.getConfigFile().getMaxiumNumberOfTopVotersToLoad();
-				if (limitSize > 0) {
-					ArrayList<VotingPluginUser> listKeys = new ArrayList<VotingPluginUser>(map.keySet());
-					if (listKeys.size() > limitSize) {
-						for (int i = listKeys.size() - 1; i >= 0 && i >= limitSize; i--) {
-							map.remove(listKeys.get(i));
-						}
-					}
-
-				}
-				plugin.getTopVoter(top).clear();
-				plugin.getTopVoter().put(top, map);
-				plugin.debug(top.toString() + " TopVoter loaded");
 			}
+			tempTopVoter.put(entry.getKey(), map);
+			plugin.setTopVoter(tempTopVoter);
+			plugin.debug(entry.getKey().getName() + " TopVoter loaded, number of players " + map.size());
+
 		}
 
 		plugin.debug("Updated TopVoter");

VotingPlugin/src/com/bencodez/votingplugin/topvoter/TopVoterPlayer.java

@@ -0,0 +1,34 @@
+package com.bencodez.votingplugin.topvoter;
+
+import java.util.UUID;
+
+import org.bukkit.inventory.ItemStack;
+
+import com.bencodez.advancedcore.api.misc.PlayerUtils;
+import com.bencodez.votingplugin.user.UserManager;
+import com.bencodez.votingplugin.user.VotingPluginUser;
+
+import lombok.Getter;
+import lombok.Setter;
+
+public class TopVoterPlayer {
+	@Getter
+	@Setter
+	private UUID uuid;
+	@Getter
+	@Setter
+	private String playerName;
+
+	public TopVoterPlayer(UUID uuid, String playerName) {
+		this.uuid = uuid;
+		this.playerName = playerName;
+	}
+	
+	public ItemStack getPlayerHead() {
+		return PlayerUtils.getInstance().getPlayerSkull(getPlayerName(), false);
+	}
+
+	public VotingPluginUser getUser() {
+		return UserManager.getInstance().getVotingPluginUser(getUuid(), getPlayerName());
+	}
+}

VotingPlugin/src/com/bencodez/votingplugin/updater/CheckUpdate.java

@@ -39,10 +39,8 @@ public class CheckUpdate {
 			break;
 		}
 		case UPDATE_AVAILABLE: {
-			plugin.getLogger()
-					.info(plugin.getName() + " has an update available! Your Version: "
-							+ plugin.getDescription().getVersion() + " New Version: " + plugin.getUpdater().getVersion()
-							+ " Use /av download to get the latest update!");
+			plugin.getLogger().info(plugin.getName() + " has an update available! Your Version: "
+					+ plugin.getDescription().getVersion() + " New Version: " + plugin.getUpdater().getVersion());
 			break;
 		}
 		default: {
@@ -59,10 +57,8 @@ public class CheckUpdate {
 		final Updater.UpdateResult result = plugin.getUpdater().getResult();
 		switch (result) {
 		case UPDATE_AVAILABLE: {
-			plugin.getLogger()
-					.info(plugin.getName() + " has an update available! Your Version: "
-							+ plugin.getDescription().getVersion() + " New Version: " + plugin.getUpdater().getVersion()
-							+ " Use /av download to get the latest update!");
+			plugin.getLogger().info(plugin.getName() + " has an update available! Your Version: "
+					+ plugin.getDescription().getVersion() + " New Version: " + plugin.getUpdater().getVersion());
 			break;
 		}
 		default: {

VotingPlugin/src/com/bencodez/votingplugin/user/UserManager.java

@@ -1,11 +1,14 @@
 package com.bencodez.votingplugin.user;
 
 import java.util.ArrayList;
+import java.util.UUID;
 
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.bencodez.advancedcore.api.user.UUID;
+import com.bencodez.advancedcore.api.user.usercache.UserDataManager;
+import com.bencodez.advancedcore.api.user.usercache.keys.UserDataKeyInt;
+import com.bencodez.advancedcore.api.user.usercache.keys.UserDataKeyString;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 public class UserManager {
@@ -24,24 +27,62 @@ public class UserManager {
 	}
 
 	public UserManager() {
-		super();
+	}
+
+	public void addCachingKeys() {
+		UserDataManager manager = plugin.getUserManager().getDataManager();
+		manager.addKey(new UserDataKeyString("TopVoterIgnore").setColumnType("VARCHAR(5)"));
+		manager.addKey(new UserDataKeyInt("VotePartyVotes"));
+		manager.addKey(new UserDataKeyString("LastVotes"));
+		manager.addKey(new UserDataKeyString("CoolDownCheck").setColumnType("VARCHAR(5)"));
+		manager.addKey(new UserDataKeyString("OfflineVotes").setColumnType("MEDIUMTEXT"));
+		manager.addKey(new UserDataKeyInt("MilestoneCount"));
+		manager.addKey(new UserDataKeyInt("MonthTotal"));
+		manager.addKey(new UserDataKeyInt("AllTimeTotal"));
+		manager.addKey(new UserDataKeyInt("DailyTotal"));
+		manager.addKey(new UserDataKeyInt("WeeklyTotal"));
+		manager.addKey(new UserDataKeyInt("Points"));
+		manager.addKey(new UserDataKeyInt("DayVoteStreak"));
+		manager.addKey(new UserDataKeyInt("BestDayVoteStreak"));
+		manager.addKey(new UserDataKeyString("DayVoteStreakLastUpdate").setColumnType("MEDIUMTEXT"));
+		manager.addKey(new UserDataKeyString("GottenMileStones").setColumnType("MEDIUMTEXT"));
+		manager.addKey(new UserDataKeyString("Reminded").setColumnType("VARCHAR(5)"));
+		manager.addKey(new UserDataKeyString("DisableBroadcast").setColumnType("VARCHAR(5)"));
+		manager.addKey(new UserDataKeyInt("WeekVoteStreak"));
+		manager.addKey(new UserDataKeyInt("BestWeekVoteStreak"));
+		manager.addKey(new UserDataKeyInt("MonthVoteStreak"));
+		manager.addKey(new UserDataKeyInt("HighestDailyTotal"));
+		manager.addKey(new UserDataKeyInt("HighestMonthlyTotal"));
+		manager.addKey(new UserDataKeyInt("HighestWeeklyTotal"));
+		manager.addKey(new UserDataKeyInt("LastMonthTotal"));
+		manager.addKey(new UserDataKeyInt("BestMonthVoteStreak"));
+		if (plugin.getOptions().isPerServerRewards()) {
+			manager.addKey(new UserDataKeyString("OfflineRewards" + plugin.getOptions().getServer())
+					.setColumnType("MEDIUMTEXT"));
+		}
+		if (plugin.getConfigFile().isExtraAllSitesCheck()) {
+			manager.addKey(new UserDataKeyInt(getGottenAllSitesDayPath()));
+		}
+	}
+
+	public String getGottenAllSitesDayPath() {
+		if (plugin.getBungeeSettings().isUseBungeecoord()) {
+			return "AllSitesLast_" + plugin.getBungeeSettings().getServerNameStorage();
+		}
+		return "AllSitesLast";
 	}
 
 	public ArrayList<String> getAllUUIDs() {
-		return com.bencodez.advancedcore.api.user.UserManager.getInstance().getAllUUIDs();
+		return plugin.getUserManager().getAllUUIDs();
 	}
 
 	public VotingPluginUser getVotingPluginUser(com.bencodez.advancedcore.api.user.AdvancedCoreUser user) {
-		return getVotingPluginUser(java.util.UUID.fromString(user.getUUID()));
-	}
-
-	public VotingPluginUser getVotingPluginUser(java.util.UUID uuid) {
-		return getVotingPluginUser(new UUID(uuid.toString()));
+		return new VotingPluginUser(plugin, user);
 	}
 
 	@SuppressWarnings("deprecation")
-	public VotingPluginUser getVotingPluginUser(java.util.UUID uuid, String playerName) {
-		return new VotingPluginUser(plugin, new UUID(uuid.toString()), playerName);
+	public VotingPluginUser getVotingPluginUser(UUID uuid, String playerName) {
+		return new VotingPluginUser(plugin, uuid, playerName);
 	}
 
 	public VotingPluginUser getVotingPluginUser(OfflinePlayer player) {
@@ -54,12 +95,16 @@ public class UserManager {
 
 	@SuppressWarnings("deprecation")
 	public VotingPluginUser getVotingPluginUser(String playerName) {
-		return new VotingPluginUser(plugin,
-				com.bencodez.advancedcore.api.user.UserManager.getInstance().getProperName(playerName));
+		return new VotingPluginUser(plugin, plugin.getUserManager().getProperName(playerName));
 	}
 
 	@SuppressWarnings("deprecation")
 	public VotingPluginUser getVotingPluginUser(UUID uuid) {
 		return new VotingPluginUser(plugin, uuid);
 	}
+
+	@SuppressWarnings("deprecation")
+	public VotingPluginUser getVotingPluginUser(UUID uuid, boolean loadName) {
+		return new VotingPluginUser(plugin, uuid, loadName);
+	}
 }

VotingPlugin/src/com/bencodez/votingplugin/user/VotingPluginUser.java

@@ -13,6 +13,7 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import org.bukkit.Bukkit;
@@ -23,15 +24,15 @@ import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
-import com.bencodez.advancedcore.api.user.UUID;
+import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.events.PlayerReceivePointsEvent;
-import com.bencodez.votingplugin.events.PlayerVoteCoolDownEndEvent;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.topvoter.TopVoter;
+import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -72,6 +73,11 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		this.plugin = plugin;
 	}
 
+	public VotingPluginUser(VotingPluginMain plugin, AdvancedCoreUser user) {
+		super(plugin, user);
+		this.plugin = plugin;
+	}
+
 	public void addAllTimeTotal() {
 		setAllTimeTotal(getAllTimeTotal() + 1);
 	}
@@ -153,9 +159,9 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 
 	public void bungeeVote(String service, BungeeMessageData text, boolean setTotals) {
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
-			VotingPluginMain.plugin.debug("Bungee vote for " + getPlayerName() + " on " + service);
+			plugin.debug("Bungee vote for " + getPlayerName() + " on " + service);
 
-			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service, true), getPlayerName(), service,
 					true);
 			voteEvent.setBungee(true);
 			voteEvent.setForceBungee(true);
@@ -174,9 +180,9 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 
 	public void bungeeVoteOnline(String service, BungeeMessageData text, boolean setTotals) {
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
-			VotingPluginMain.plugin.debug("Bungee online vote for " + getPlayerName() + " on " + service);
+			plugin.debug("Bungee online vote for " + getPlayerName() + " on " + service);
 
-			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service, true), getPlayerName(), service,
 					true);
 			voteEvent.setBungee(true);
 			voteEvent.setForceBungee(true);
@@ -194,11 +200,11 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	}
 
 	public void bungeeVotePluginMessaging(String service, long time, BungeeMessageData text, boolean setTotals,
-			boolean wasOnline) {
+			boolean wasOnline, boolean broadcast) {
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
-			VotingPluginMain.plugin.debug("Pluginmessaging vote for " + getPlayerName() + " on " + service);
+			plugin.debug("Pluginmessaging vote for " + getPlayerName() + " on " + service);
 
-			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service, true), getPlayerName(), service,
 					true);
 			voteEvent.setBungee(true);
 			voteEvent.setVotingPluginUser(this);
@@ -207,6 +213,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			voteEvent.setAddTotals(setTotals);
 			voteEvent.setBungeeTextTotals(text);
 			voteEvent.setWasOnline(wasOnline);
+			voteEvent.setBroadcast(broadcast);
 			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 				@Override
@@ -261,7 +268,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		try {
 			LocalDateTime now = plugin.getTimeChecker().getTime();
 			LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault())
-					.plusHours(VotingPluginMain.plugin.getOptions().getTimeHourOffSet());
+					.plusHours(plugin.getOptions().getTimeHourOffSet());
 
 			if (!voteSite.isVoteDelayDaily()) {
 				double votedelay = voteSite.getVoteDelay();
@@ -299,12 +306,14 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		ArrayList<Integer> days = new ArrayList<Integer>();
 
 		for (VoteSite voteSite : plugin.getVoteSites()) {
-			long time = user.getTime(voteSite);
-			if (time != 0) {
-				months.add(MiscUtils.getInstance().getMonthFromMili(time));
-				days.add(MiscUtils.getInstance().getDayFromMili(time));
-			} else {
-				return false;
+			if (voteSite.isEnabled() && !voteSite.isHidden()) {
+				long time = user.getTime(voteSite);
+				if (time != 0) {
+					months.add(MiscUtils.getInstance().getMonthFromMili(time));
+					days.add(MiscUtils.getInstance().getDayFromMili(time));
+				} else {
+					return false;
+				}
 			}
 		}
 
@@ -325,17 +334,6 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		return true;
 	}
 
-	public void checkCoolDownEvents() {
-		for (VoteSite site : plugin.getVoteSites()) {
-			if (canVoteSite(site) != getLastCoolDownCheck(site)) {
-				plugin.debug(getPlayerName() + " vote cooldown ended: " + site.getKey());
-				PlayerVoteCoolDownEndEvent event = new PlayerVoteCoolDownEndEvent(this, site);
-				plugin.getServer().getPluginManager().callEvent(event);
-				setLastVoteCoolDownCheck(true, site);
-			}
-		}
-	}
-
 	public void checkDayVoteStreak(boolean forceBungee) {
 		if (!voteStreakUpdatedToday(LocalDateTime.now())) {
 			if (!plugin.getSpecialRewardsConfig().isVoteStreakRequirementUsePercentage() || hasPercentageTotal(
@@ -347,10 +345,9 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		}
 	}
 
-	public void clearOfflineRewards() {
+	public void clearOfflineVotes() {
 		setOfflineVotes(new ArrayList<String>());
 		setOfflineRewards(new ArrayList<String>());
-		setOfflineOtherRewards(new ArrayList<String>());
 	}
 
 	public void clearTotals() {
@@ -361,48 +358,44 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 
 	@Deprecated
 	public int getAllTimeTotal() {
-		return getUserData().getInt("AllTimeTotal");
+		return getUserData().getInt("AllTimeTotal", isCacheData(), isWaitForCache());
 	}
 
 	public int getBestDayVoteStreak() {
-		return getData().getInt("BestDayVoteStreak", isWaitForCache());
+		return getData().getInt("BestDayVoteStreak", isCacheData(), isWaitForCache());
 	}
 
 	public int getBestMonthVoteStreak() {
-		return getData().getInt("BestMonthVoteStreak", isWaitForCache());
+		return getData().getInt("BestMonthVoteStreak", isCacheData(), isWaitForCache());
 	}
 
 	public int getBestWeekVoteStreak() {
-		return getData().getInt("BestWeekVoteStreak", isWaitForCache());
+		return getData().getInt("BestWeekVoteStreak", isCacheData(), isWaitForCache());
 	}
 
 	@Deprecated
 	public int getDailyTotal() {
-		return getUserData().getInt("DailyTotal", isWaitForCache());
+		return getUserData().getInt("DailyTotal", isCacheData(), isWaitForCache());
 	}
 
 	public int getDayVoteStreak() {
-		return getData().getInt("DayVoteStreak", isWaitForCache());
+		return getData().getInt("DayVoteStreak", isCacheData(), isWaitForCache());
 	}
 
 	public long getDayVoteStreakLastUpdate() {
-		String str = getData().getString("DayVoteStreakLastUpdate", isWaitForCache());
-		if (str.isEmpty()) {
+		String str = getData().getString("DayVoteStreakLastUpdate", isCacheData(), isWaitForCache());
+		if (str == null || str.isEmpty() || str.equals("null")) {
 			return 0;
 		}
 		return Long.parseLong(str);
 	}
 
 	public boolean getDisableBroadcast() {
-		return getUserData().getBoolean("DisableBroadcast");
+		return getUserData().getBoolean("DisableBroadcast", isCacheData(), isWaitForCache());
 	}
 
 	public int getGottenAllSitesDay() {
-		if (plugin.getBungeeSettings().isUseBungeecoord()) {
-			return getData().getInt("AllSitesLast_" + plugin.getBungeeSettings().getServerNameStorage(), 0, true);
-		} else {
-			return getData().getInt("AllSitesLast", 0, true);
-		}
+		return getData().getInt(plugin.getVotingPluginUserManager().getGottenAllSitesDayPath(), 0, isWaitForCache());
 	}
 
 	public HashMap<String, Boolean> getHasGottenMilestone() {
@@ -419,48 +412,19 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	}
 
 	public int getHighestDailyTotal() {
-		return getData().getInt("HighestDailyTotal", isWaitForCache());
+		return getData().getInt("HighestDailyTotal", isCacheData(), isWaitForCache());
 	}
 
 	public int getHighestMonthlyTotal() {
-		return getData().getInt("HighestMonthlyTotal", isWaitForCache());
+		return getData().getInt("HighestMonthlyTotal", isCacheData(), isWaitForCache());
 	}
 
 	public int getHighestWeeklyTotal() {
-		return getData().getInt("HighestWeeklyTotal", isWaitForCache());
-	}
-
-	public boolean getLastCoolDownCheck(VoteSite site) {
-		HashMap<VoteSite, Boolean> array = getLastCoolDownCheckArray();
-		if (array.containsKey(site)) {
-			return array.get(site).booleanValue();
-		}
-		return true;
-	}
-
-	public HashMap<VoteSite, Boolean> getLastCoolDownCheckArray() {
-		HashMap<VoteSite, Boolean> lastVotesCheck = new HashMap<VoteSite, Boolean>();
-		ArrayList<String> LastVotesCheckList = getUserData().getStringList("LastVoteCoolDownCheck");
-		for (String str : LastVotesCheckList) {
-			String[] data = str.split("//");
-			if (data.length > 1 && plugin.hasVoteSite(data[0])) {
-				VoteSite site = plugin.getVoteSite(data[0]);
-				if (site != null) {
-					Boolean value = Boolean.FALSE;
-					try {
-						value = Boolean.valueOf(data[1]);
-					} catch (NumberFormatException e) {
-						plugin.debug("Not value: " + data[1]);
-					}
-					lastVotesCheck.put(site, value);
-				}
-			}
-		}
-		return lastVotesCheck;
+		return getData().getInt("HighestWeeklyTotal", isCacheData(), isWaitForCache());
 	}
 
 	public int getLastMonthTotal() {
-		return getData().getInt("LastMonthTotal", isWaitForCache());
+		return getData().getInt("LastMonthTotal", isCacheData(), isWaitForCache());
 	}
 
 	public HashMap<VoteSite, Long> getLastVotes() {
@@ -469,7 +433,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		for (String str : LastVotesList) {
 			String[] data = str.split("//");
 			if (data.length > 1 && plugin.hasVoteSite(data[0])) {
-				VoteSite site = plugin.getVoteSite(data[0]);
+				VoteSite site = plugin.getVoteSite(data[0], true);
 				if (site != null) {
 					long time = 0;
 					try {
@@ -503,20 +467,20 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	}
 
 	public int getMilestoneCount() {
-		return getData().getInt("MilestoneCount", getAllTimeTotal(), isWaitForCache());
+		return getData().getInt("MilestoneCount", getAllTimeTotal(), isCacheData(), isWaitForCache());
 	}
 
 	@Deprecated
 	public int getMonthTotal() {
-		return getData().getInt("MonthTotal");
+		return getData().getInt("MonthTotal", isCacheData(), isWaitForCache());
 	}
 
 	public int getMonthVoteStreak() {
-		return getData().getInt("MonthVoteStreak", isWaitForCache());
+		return getData().getInt("MonthVoteStreak", isCacheData(), isWaitForCache());
 	}
 
 	public ArrayList<String> getOfflineVotes() {
-		return getUserData().getStringList("OfflineVotes");
+		return getUserData().getStringList("OfflineVotes", isCacheData(), isWaitForCache());
 	}
 
 	/**
@@ -525,7 +489,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	 * @return the points
 	 */
 	public int getPoints() {
-		return getUserData().getInt(getPointsPath(), isWaitForCache());
+		return getUserData().getInt(getPointsPath(), isCacheData(), isWaitForCache());
 	}
 
 	public String getPointsPath() {
@@ -537,7 +501,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	}
 
 	public java.util.UUID getPrimaryAccount() {
-		String s = getData().getString("PrimaryAccount", true);
+		String s = getData().getString("PrimaryAccount", isCacheData(), isWaitForCache());
 		if (s != null && !s.isEmpty()) {
 			return java.util.UUID.fromString(s);
 		}
@@ -571,13 +535,13 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	public int getTotal(TopVoter top) {
 		switch (top) {
 		case AllTime:
-			return getUserData().getInt("AllTimeTotal", isWaitForCache());
+			return getUserData().getInt("AllTimeTotal", isCacheData(), isWaitForCache());
 		case Daily:
-			return getUserData().getInt("DailyTotal", isWaitForCache());
+			return getUserData().getInt("DailyTotal", isCacheData(), isWaitForCache());
 		case Monthly:
-			return getData().getInt("MonthTotal", isWaitForCache());
+			return getData().getInt("MonthTotal", isCacheData(), isWaitForCache());
 		case Weekly:
-			return getUserData().getInt("WeeklyTotal", isWaitForCache());
+			return getUserData().getInt("WeeklyTotal", isCacheData(), isWaitForCache());
 		default:
 			break;
 		}
@@ -585,20 +549,20 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	}
 
 	public int getVotePartyVotes() {
-		return getUserData().getInt("VotePartyVotes", isWaitForCache());
+		return getUserData().getInt("VotePartyVotes", isCacheData(), isWaitForCache());
 	}
 
 	public int getVoteShopIdentifierLimit(String identifier) {
-		return getData().getInt("VoteShopLimit" + identifier, isWaitForCache());
+		return getData().getInt("VoteShopLimit" + identifier, isCacheData(), isWaitForCache());
 	}
 
 	@Deprecated
 	public int getWeeklyTotal() {
-		return getUserData().getInt("WeeklyTotal");
+		return getUserData().getInt("WeeklyTotal", isCacheData(), isWaitForCache());
 	}
 
 	public int getWeekVoteStreak() {
-		return getData().getInt("WeekVoteStreak", isWaitForCache());
+		return getData().getInt("WeekVoteStreak", isCacheData(), isWaitForCache());
 	}
 
 	public void giveDailyTopVoterAward(int place, String path) {
@@ -725,14 +689,14 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	 * Off vote.
 	 */
 	public void offVote() {
-		if (!VotingPluginMain.plugin.getOptions().isProcessRewards()) {
-			VotingPluginMain.plugin.debug("Processing rewards is disabled");
+		if (!plugin.getOptions().isProcessRewards()) {
+			plugin.debug("Processing rewards is disabled");
 			return;
 		}
 
 		Player player = getPlayer();
 		if (player != null) {
-			VotingPluginMain.plugin.extraDebug("Checking offline vote site votes for " + player.getName());
+			plugin.extraDebug("Checking offline vote site votes for " + player.getName());
 
 			boolean topVoterIngorePerm = player.hasPermission("VotingPlugin.TopVoter.Ignore");
 			if (isTopVoterIgnore() != topVoterIngorePerm) {
@@ -748,7 +712,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			for (int i = 0; i < offlineVotes.size(); i++) {
 				if (plugin.hasVoteSite(offlineVotes.get(i))) {
 					plugin.debug("Giving offline site reward: " + offlineVotes.get(i));
-					playerVote(plugin.getVoteSite(offlineVotes.get(i)), false, true, false);
+					playerVote(plugin.getVoteSite(offlineVotes.get(i), true), false, true, false);
 				} else {
 					plugin.debug("Site doesn't exist: " + offlineVotes.get(i));
 				}
@@ -758,7 +722,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 
 	public void playerVote(VoteSite voteSite, boolean online, boolean broadcast, boolean bungee) {
 		if (plugin.getConfigFile().getFormatBroadcastWhenOnline() && plugin.getConfigFile().isBroadcastVotesEnabled()
-				&& broadcast) {
+				&& broadcast && !plugin.getBungeeSettings().isDisableBroadcast()) {
 			voteSite.broadcastVote(this);
 		}
 		voteSite.giveRewards(this, online, bungee);
@@ -830,11 +794,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	}
 
 	public void setGottenAllSitesDay(int day) {
-		if (plugin.getBungeeSettings().isUseBungeecoord()) {
-			getData().setInt("AllSitesLast_" + plugin.getBungeeSettings().getServerNameStorage(), day);
-		} else {
-			getData().setInt("AllSitesLast", day);
-		}
+		getData().setInt(plugin.getVotingPluginUserManager().getGottenAllSitesDayPath(), day);
 	}
 
 	public void setHasGotteMilestone(int votesRequired, boolean b) {
@@ -864,25 +824,10 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		getData().setInt("HighestWeeklyTotal", total);
 	}
 
-	public void setLastCoolDownCheckArray(HashMap<VoteSite, Boolean> lastVotesCheck) {
-		ArrayList<String> data = new ArrayList<String>();
-		for (Entry<VoteSite, Boolean> entry : lastVotesCheck.entrySet()) {
-			String str = entry.getKey().getKey() + "//" + entry.getValue().booleanValue();
-			data.add(str);
-		}
-		getUserData().setStringList("LastVoteCoolDownCheck", data);
-	}
-
 	public void setLastMonthTotal(int total) {
 		getData().setInt("LastMonthTotal", total);
 	}
 
-	public void setLastVoteCoolDownCheck(boolean lastDelay, VoteSite voteSite) {
-		HashMap<VoteSite, Boolean> array = getLastCoolDownCheckArray();
-		array.put(voteSite, Boolean.valueOf(lastDelay));
-		setLastCoolDownCheckArray(array);
-	}
-
 	public void setLastVotes(HashMap<VoteSite, Long> lastVotes) {
 		ArrayList<String> data = new ArrayList<String>();
 		for (Entry<VoteSite, Long> entry : lastVotes.entrySet()) {
@@ -896,6 +841,22 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		getData().setInt("MilestoneCount", value);
 	}
 
+	public String getCoolDownCheckPath() {
+		if (plugin.getBungeeSettings().isUseBungeecoord()) {
+			return "CoolDownCheck_" + plugin.getBungeeSettings().getServer();
+		} else {
+			return "CoolDownCheck";
+		}
+	}
+
+	public void setCoolDownCheck(boolean coolDownCheck) {
+		getData().setBoolean(getCoolDownCheckPath(), coolDownCheck);
+	}
+
+	public boolean getCoolDownCheck() {
+		return getData().getBoolean(getCoolDownCheckPath(), isCacheData(), isWaitForCache());
+	}
+
 	@Deprecated
 	public void setMonthTotal(int total) {
 		setTotal(TopVoter.Monthly, total);
@@ -908,10 +869,6 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		}
 	}
 
-	public void setOfflineOtherRewards(ArrayList<String> offlineOtherRewards) {
-		getUserData().setStringList("OfflineOtherRewards", offlineOtherRewards);
-	}
-
 	public void setOfflineVotes(ArrayList<String> offlineVotes) {
 		getUserData().setStringList("OfflineVotes", offlineVotes);
 	}
@@ -1127,7 +1084,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		LocalDateTime now = plugin.getTimeChecker().getTime();
 
 		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault())
-				.plusHours(VotingPluginMain.plugin.getOptions().getTimeHourOffSet());
+				.plusHours(plugin.getOptions().getTimeHourOffSet());
 
 		if (!voteSite.isVoteDelayDaily()) {
 			double votedelay = voteSite.getVoteDelay();
@@ -1222,9 +1179,9 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	public long voteNextDurationTime(VoteSite voteSite) {
 		long time = getTime(voteSite);
 		LocalDateTime now = plugin.getTimeChecker().getTime();
-		;
+
 		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault())
-				.plusHours(VotingPluginMain.plugin.getOptions().getTimeHourOffSet());
+				.plusHours(plugin.getOptions().getTimeHourOffSet());
 
 		if (!voteSite.isVoteDelayDaily()) {
 			double votedelay = voteSite.getVoteDelay();
@@ -1283,4 +1240,20 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		return amount;
 	}
 
+	public TopVoterPlayer getTopVoterPlayer() {
+		return new TopVoterPlayer(UUID.fromString(getUUID()), getPlayerName());
+	}
+
+	public long getNextTimeAllSitesAvailable() {
+		long longest = 0;
+		for (VoteSite site : plugin.getVoteSites()) {
+			long seconds = voteNextDurationTime(site);
+			if (seconds > longest) {
+				longest = seconds;
+			}
+		}
+
+		return longest;
+	}
+
 }

VotingPlugin/src/com/bencodez/votingplugin/voteparty/VoteParty.java

@@ -3,6 +3,7 @@ package com.bencodez.votingplugin.voteparty;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.UUID;
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -16,7 +17,7 @@ import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.time.events.DayChangeEvent;
 import com.bencodez.advancedcore.api.time.events.MonthChangeEvent;
 import com.bencodez.advancedcore.api.time.events.WeekChangeEvent;
-import com.bencodez.advancedcore.api.user.UUID;
+import com.bencodez.advancedcore.api.user.userstorage.DataType;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.events.VotePartyEvent;
 import com.bencodez.votingplugin.user.UserManager;
@@ -185,7 +186,8 @@ public class VoteParty implements Listener {
 		if (plugin.getSpecialRewardsConfig().getVotePartyGiveAllPlayers()) {
 			plugin.debug("Trying to give all players vote party");
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+				user.dontCache();
 				if (!plugin.getSpecialRewardsConfig().isVotePartyGiveOnlinePlayersOnly() || user.isOnline()) {
 					giveReward(user, forceBungee);
 				}
@@ -195,7 +197,8 @@ public class VoteParty implements Listener {
 			plugin.debug("Trying to give all voted players vote party");
 			plugin.debug(ArrayUtils.getInstance().makeStringList(getVotedUsers()));
 			for (String uuid : getVotedUsers()) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+				user.dontCache();
 				if (!plugin.getSpecialRewardsConfig().isVotePartyGiveOnlinePlayersOnly() || user.isOnline()) {
 					giveReward(user, forceBungee);
 				}
@@ -234,17 +237,16 @@ public class VoteParty implements Listener {
 		plugin.getServer().getPluginManager().registerEvents(this, plugin);
 	}
 
+	public void resetVotePartyCount() {
+		plugin.getUserManager().removeAllKeyValues("VotePartyVotes", DataType.INTEGER);
+	}
+
 	public void reset(boolean override) {
 		if (override) {
 			setTotalVotes(0);
 		}
 		setVotedUsers(new ArrayList<String>());
-		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-			VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getVotePartyVotes() != 0) {
-				user.setVotePartyVotes(0);
-			}
-		}
+		resetVotePartyCount();
 
 	}
 

VotingPlugin/src/com/bencodez/votingplugin/votereminding/VoteReminding.java

@@ -67,6 +67,8 @@ public class VoteReminding {
 							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
 							checkRemind(user);
 						}
+					} else {
+						cancel();
 					}
 				}
 			}, 1000 * 30, plugin.getConfigFile().getVoteRemindingRemindDelay() * 1000 * 60);
@@ -84,7 +86,7 @@ public class VoteReminding {
 				user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
 			}
 			giveReward(user);
-			if (user.getData().hasData()) {
+			if (user.getData().hasData() && plugin.getConfigFile().getVoteRemindingRemindOnlyOnce()) {
 				user.setReminded(true);
 			}
 
@@ -107,16 +109,18 @@ public class VoteReminding {
 
 	public void runRemindLogin(VotingPluginUser user) {
 		if (plugin.getConfigFile().getVoteRemindingEnabled()) {
-			if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
-				user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
-			}
-			if ((!UserManager.getInstance().getAllUUIDs().contains(user.getUUID()) || shouldRemind(user))) {
-				giveReward(user);
-				if (user.getData().hasData()) {
-					user.setReminded(true);
+			if (user.hasPermission("VotingPlugin.Login.RemindVotes") || user.hasPermission("VotingPlugin.Player")) {
+				if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
+					user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
 				}
-				plugin.debug(user.getPlayerName() + " was reminded!");
+				if ((!UserManager.getInstance().getAllUUIDs().contains(user.getUUID()) || shouldRemind(user))) {
+					giveReward(user);
+					if (user.getData().hasData()) {
+						user.setReminded(true);
+					}
+					plugin.debug(user.getPlayerName() + " was reminded!");
 
+				}
 			}
 		}
 	}