Update version number

Fix vnext

.github/stale.yml

@@ -1,7 +1,7 @@
 # Number of days of inactivity before an issue becomes stale
 daysUntilStale: 20
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
+daysUntilClose: 5
 # Issues with these labels will never be considered stale
 exemptLabels:
   - Priority

VotingPlugin/.classpath

@@ -6,7 +6,7 @@
 			<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">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_261">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

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

@@ -9,6 +9,7 @@ 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
@@ -24,4 +25,6 @@ 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/Resources/Config.yml

@@ -131,7 +131,7 @@ Format:
     # %url% = site URL
     Vote: 
       Text:
-      - '&4&lVote for our server!'
+      - '&6&lVote for our server!'
       
       # If you want to want to use the feature below where the plugin will
       # automaticly list the sites then set the message in the text above
@@ -140,7 +140,10 @@ Format:
       # make sure to set VoteURL in your VoteSites
       # Requires above to be true
       # Text will be sent before this
-      Sites: '&4%num%: &c&l%SiteName% - &c%url%'
+      Sites: '&6%num%: &e&l%SiteName% - &e%url%'
+      
+      # If true, links will always be forced as urls
+      ForceLinks: true
       
       # Format for /vote next
       Next: 
@@ -334,6 +337,8 @@ GUI:
         Data: 0
         Amount: 1
         Name: '&4URL'
+        Lore:
+        - '&aClick me for links'
         # You can set skulls of the player using the following
         # Remove the # to enable
         #Skull: '%Player%'
@@ -357,7 +362,7 @@ GUI:
         Name: '&4Total'
     Top:
       Item:
-        Material: 'SIGN'
+        Material: 'OAK_SIGN'
         Data: 0
         Amount: 1
         Name: '&4Top'
@@ -446,7 +451,14 @@ GUI:
     BackButton: true
   VoteToday:
     Name: 'VoteToday'
+    Line: '&6%VoteSite% : %Time%'
+    IconTitle: '%player%'
     BackButton: true
+    UseSkull: true
+    # If UseSkull is false, use this item
+    PlayerItem:
+      Material: 'PAPER'
+      Amount: 1
   VoteTop:
     Name: 'VoteTop %topvoter%'
     BackButton: false
@@ -456,7 +468,7 @@ GUI:
     SwitchItem:
       Name: '&3Switch TopVoter'
       Lore: '&bCurrently: %Top%'
-      Material: 'SIGN'
+      Material: 'OAK_SIGN'
       Amount: 1
       # 8 Slots over from the bottom left
       Slot: 7
@@ -572,11 +584,13 @@ VoteShopEnabled: true
 VoteShopHideLimitedReached: true
 # Requires above to be false
 VoteShopLimitReached: '&aYou reached your limit'
+VoteShopRequireConfirmation: false
 Shop:
   # Identifier
   # Used in placeholders for formats
   # Do not have spaces in the identifier
   Diamond:
+    Identifier_Name: 'Diamond'
     # Item
     Material: 'DIAMOND'
     Data: 0
@@ -593,6 +607,11 @@ Shop:
     Permission: ''
     # Limit how many times you can buy this
     #Limit: 3
+    # Reset limit daily/weekly/monthly
+    #Reset:
+      #Daily: false
+      #Weekly: false
+      #Monthly: false
     # If true, item is not buyable
     #NotBuyable: false
     # Rewards to run if player buys successfully
@@ -837,6 +856,14 @@ ClickSound:
   Volume: 1.0
   Pitch: 1.0
   
+# Playernames to not be broadcasted when voting
+# case sensitive
+VotingBroadcastBlacklist: []
+
+# Set to false to prevent javascript
+# parsing on placeholderapi placeholders
+UseJavascriptPlaceholders: true
+  
 # Limit monthly votes to number of days of a month multipled by the number of sites
 LimitMonthlyVotes: false
 
@@ -967,9 +994,30 @@ ExtraBackgroundUpdate: false
 # Plugin using bungee, requires plugin on bungee server
 UseBungeecoord: false
 
+# For pluginmessaging method only
+# Whether to broadcast on cached votes
+BungeeBroadcastAlways: false
+
+# What type of bungee setup
+# Requires restart and set on all servers
+# https://github.com/Ben12345rocks/VotingPlugin/wiki/Bungeecoord-Setups
+# Available:
+# SOCKETS
+# PLUGINMESSAGING
+# MYSQL
+BungeeMethod: SOCKETS
+
+# Enables more debug messages for communication between servers
+# Use /votingpluginbungee status for testing communication
+BungeeDebug: false
+
 # Get the plugin to broadcast to all servers
 BungeeBroadcast: false
 
+# -----------------------------
+# For socket setup below only
+# -----------------------------
+
 # What server this is in bungee (must match)
 # Also can be applied to rewards
 Server: PleaseSet
@@ -985,7 +1033,7 @@ SpigotServer:
   Port: 1298
 
 # ---------------------------------------------------------
-# Mysql cache options
+# Mysql cache options 
 # Clearing cache forces the plugin to pull from database
 # Not needed unless you are using multiple servers
 # ---------------------------------------------------------
@@ -994,7 +1042,7 @@ SpigotServer:
 # Also may require AlwaysUpdate set to true
 ClearCacheOnUpdate: false
 
-# Clear mysql on player join always
+# Clear cache on player join always
 ClearCacheOnJoin: false
 
 # Clears cache for the player who voted only
@@ -1002,6 +1050,11 @@ ClearCacheOnJoin: false
 # Would recommend for some bungee setups
 ClearCacheOnVote: false
 
+# Clear cache when player leaves
+ClearCacheOnLeave: false
+
+ClearCacheOnVoteShopPurchase: true
+
 # ###############################################################
 # Deprecated options, don't recommend using any of these
 

VotingPlugin/Resources/VoteSites.yml

@@ -33,6 +33,9 @@ VoteSites:
     # Most sites are 24 hours
     VoteDelay: 24
     
+    # Use to have a minute votedelay
+    #VoteDelayMin: 30
+    
     # Require waiting until votedelay time has pasted in order to accept vote
     # Recommend: false
     WaitUntilVoteDelay: false
@@ -48,7 +51,7 @@ VoteSites:
     
     # VoteSite Material for some GUI's
     # Removing this may result in an error, required on each site
-    Item:
+    DisplayItem:
       Material: 'DIAMOND'
       Amount: 1
 
@@ -68,7 +71,7 @@ VoteSites:
     ServiceSite: 'PlanetMinecraft.com'
     VoteURL: 'link to vote URL here, used in /vote'
     VoteDelay: 24
-    Item:
+    DisplayItem:
       Material: 'DIAMOND'
       Amount: 1
     Rewards:
@@ -84,7 +87,10 @@ VoteSites:
         Reward1:
           Chance: 50
           # Any other requirement here
-          # If any requirement fails, the next will be attempted
+          # If any requirement fails, the next reward will be attempted
+          # Use permission requirement for rank based rewards
+          #RequirePermission: true
+          #Permission: 'permhere'
           Messages:
             Player: 'You got first reward'
         Reward2:

VotingPlugin/Resources/bungeeconfig.yml

@@ -1,35 +1,7 @@
-# STILL A WORK IN PROGRESS, USE AT YOUR OWN RISK
-# 
-# Set bungeecoord to true on servers on the network
+# Set bungeecoord to true on servers on the network (In VotingPlugin)
 # Set server name in each server related to what it is on bungee
 #
-# Have a reward on each server
-SendVotesToAllServers: true
-# Have a reward on 1 server on the network
-SendToOnlineServer: false 
-# Tell servers to broadcast
-Broadcast: true
-# List of servers the plugin won't send the vote to
-BlockedServers:
-- hub
-FallBackServer: factions
-
-# Bungee communication, Add this to each spigot server
-BungeeServer:
-  Host: '127.0.0.1'
-  Port: 1297
-  
-# Bungee communication, add each spigot server here
-SpigotServers:
-  lobby:
-    Host: '127.0.0.1'
-    Port: 1298
-  factions:
-    Host: '127.0.0.1'
-    Port: 1999
-
-
-# MYSQL Required
+# MYSQL Required on all setups
 # MYSQL INFO --------------------------
 Host: ''
 # Default port is 3306
@@ -46,4 +18,43 @@ MaxSize: -1
 # Table name prefix, for use with mutliple servers
 Prefix: ''
 #UseSSL: true
-#########################################
+
+Debug: false
+# Have a reward on each server
+# 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
+BlockedServers:
+- hub
+
+# What type of bungee setup
+# Requires restart and set on all servers
+# https://github.com/Ben12345rocks/VotingPlugin/wiki/Bungeecoord-Setups
+# Available:
+# SOCKETS 
+# PLUGINMESSAGING 
+# MYSQL
+BungeeMethod: SOCKETS
+
+# ----------------------------
+# SOCKET METHOD Only, ignore otherwise
+# ----------------------------
+FallBackServer: factions
+
+# Tell servers to broadcast
+Broadcast: true
+
+# Bungee communication, Add this to each spigot server
+BungeeServer:
+  Host: '127.0.0.1'
+  Port: 1297
+  
+# Bungee communication, add each spigot server here
+SpigotServers:
+  lobby:
+    Host: '127.0.0.1'
+    Port: 1298
+  factions:
+    Host: '127.0.0.1'
+    Port: 1999

VotingPlugin/Resources/plugin.yml

@@ -4,7 +4,7 @@ main: com.Ben12345rocks.VotingPlugin.Main
 description: Highly Customizable Voting Listener!
 website: https://www.spigotmc.org/resources/votingplugin.15358/
 author: Ben12345rocks
-softdepend: [MVdWPlaceholders, Votifier, CMI, Vault, PlaceholderAPI, ProtocolLib]
+softdepend: [MVdWPlaceholders, Votifier, CMI, Vault, PlaceholderAPI, ProtocolLib, MVdWPlaceholderAPI, AuthMe]
 api-version: 1.13
 commands:
   vote:

VotingPlugin/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.21</version>
+	<version>5.23</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -78,7 +78,7 @@
 			<plugin>
 				<groupId>org.projectlombok</groupId>
 				<artifactId>lombok-maven-plugin</artifactId>
-				<version>1.18.2.0</version>
+				<version>1.18.12.0</version>
 				<executions>
 					<execution>
 						<id>delombok</id>
@@ -254,12 +254,12 @@
 			<version>master-SNAPSHOT</version>
 		</dependency>
 
-		<!-- <dependency> <groupId>com.Ben12345rocks</groupId> <artifactId>AdvancedCore</artifactId> 
+		<!--<dependency> <groupId>com.Ben12345rocks</groupId> <artifactId>AdvancedCore</artifactId> 
 			<version>LATEST</version> <scope>compile</scope> </dependency> -->
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.15.2-R0.1-SNAPSHOT</version>
+			<version>1.16.2-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/BungeeHandler.java

@@ -1,11 +1,12 @@
 package com.Ben12345rocks.VotingPlugin;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.UUID;
 
-import org.bukkit.Bukkit;
-
 import com.Ben12345rocks.AdvancedCore.Util.Encryption.EncryptionHandler;
+import com.Ben12345rocks.AdvancedCore.Util.PluginMessage.PluginMessage;
+import com.Ben12345rocks.AdvancedCore.Util.PluginMessage.PluginMessageHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Sockets.ClientHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketReceiver;
@@ -13,6 +14,7 @@ import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+import com.Ben12345rocks.VotingPlugin.bungee.BungeeMethod;
 
 import lombok.Getter;
 
@@ -31,91 +33,196 @@ public class BungeeHandler {
 
 	private EncryptionHandler encryptionHandler;
 
+	@Getter
+	private BungeeMethod method;
+
 	public void close() {
 		socketHandler.closeConnection();
 		clientHandler.stopConnection();
 	}
 
 	public void load() {
-		encryptionHandler = new EncryptionHandler(new File(Main.plugin.getDataFolder(), "secretkey.key"));
-		Bukkit.getScheduler().runTask(Main.plugin, new Runnable() {
+		Main.plugin.debug("Loading bungee handler");
 
-			@Override
-			public void run() {
-				clientHandler = new ClientHandler(Config.getInstance().getBungeeServerHost(),
-						Config.getInstance().getBungeeServerPort(), encryptionHandler);
+		method = BungeeMethod.getByName(Config.getInstance().getBungeeMethod());
 
-				socketHandler.add(new SocketReceiver() {
+		Main.plugin.getLogger().info("Using BungeeMethod: " + method.toString());
 
-					@Override
-					public void onReceive(String[] data) {
-						if (data.length > 3) {
-							if (data[0].equalsIgnoreCase("bungeevote")) {
-								String uuid = data[1];
-								User user = null;
-								if (!uuid.isEmpty()) {
-									user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-								} else {
-									user = UserManager.getInstance().getVotingPluginUser(data[2]);
-								}
+		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			Main.plugin.registerBungeeChannels();
 
-								user.clearCache();
+			PluginMessage.getInstance().add(new PluginMessageHandler("Vote") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					String player = args.get(0);
+					String uuid = args.get(1);
+					String service = args.get(2);
+					long time = Long.parseLong(args.get(3));
+					Main.plugin.debug("pluginmessaging vote received from " + player + " on " + service);
+					User user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					user.clearCache();
 
-								user.bungeeVote(data[3]);
+					user.bungeeVotePluginMessaging(service, time);
 
-							}
+					if (Boolean.valueOf(args.get(4)) || Config.getInstance().isBungeeBroadcastAlways()) {
+						VoteSite site = Main.plugin.getVoteSite(service);
+						if (site != null) {
+							site.broadcastVote(user, false);
+						} else {
+							Main.plugin.getLogger().warning("No votesite for " + service);
 						}
 					}
-				});
+				}
+			});
 
-				socketHandler.add(new SocketReceiver() {
+			PluginMessage.getInstance().add(new PluginMessageHandler("VoteOnline") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					String player = args.get(0);
+					String uuid = args.get(1);
+					String service = args.get(2);
+					long time = Long.parseLong(args.get(3));
+					Main.plugin.debug("pluginmessaging voteonline received from " + player + " on " + service);
+					User user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					user.clearCache();
 
-					@Override
-					public void onReceive(String[] data) {
-						if (data.length > 3) {
-							if (data[0].equalsIgnoreCase("bungeevoteonline")) {
-								String uuid = data[1];
-								User user = null;
-								if (!uuid.isEmpty()) {
-									user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-								} else {
-									user = UserManager.getInstance().getVotingPluginUser(data[2]);
-								}
+					user.bungeeVotePluginMessaging(service, time);
 
-								user.clearCache();
-
-								user.bungeeVoteOnline(data[3]);
-
-							}
+					if (Boolean.valueOf(args.get(4)) || Config.getInstance().isBungeeBroadcastAlways()) {
+						VoteSite site = Main.plugin.getVoteSite(service);
+						if (site != null) {
+							site.broadcastVote(user, false);
+						} else {
+							Main.plugin.getLogger().warning("No votesite for " + service);
 						}
 					}
-				});
+				}
+			});
 
-				socketHandler.add(new SocketReceiver() {
+			PluginMessage.getInstance().add(new PluginMessageHandler("VoteUpdate") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					String player = args.get(0);
+					Main.plugin.debug("pluginmessaging voteupdate received for " + player);
+					User user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(player));
+					user.clearCache();
 
-					@Override
-					public void onReceive(String[] data) {
-						if (data.length > 2) {
-							if (data[0].equalsIgnoreCase("BungeeBroadcast")) {
+					user.offVote();
 
-								VoteSite site = Main.plugin.getVoteSite(data[1]);
-								String p = data[3];
-								User user = UserManager.getInstance().getVotingPluginUser(p);
-								if (site != null) {
-									site.broadcastVote(user, false);
-								} else {
-									Main.plugin.getLogger().warning("No votesite for " + data[1]);
-								}
-								Main.plugin.setUpdate(true);
-							}
+					Main.plugin.setUpdate(true);
+				}
+			});
+
+			PluginMessage.getInstance().add(new PluginMessageHandler("VoteBroadcast") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					String uuid = args.get(0);
+					String service = args.get(1);
+					User user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					VoteSite site = Main.plugin.getVoteSite(service);
+					if (site != null) {
+						site.broadcastVote(user, false);
+					} else {
+						Main.plugin.getLogger().warning("No votesite for " + service);
+					}
+				}
+			});
+
+		} else if (method.equals(BungeeMethod.SOCKETS)) {
+			encryptionHandler = new EncryptionHandler(new File(Main.plugin.getDataFolder(), "secretkey.key"));
+
+			clientHandler = new ClientHandler(Config.getInstance().getBungeeServerHost(),
+					Config.getInstance().getBungeeServerPort(), encryptionHandler,
+					Config.getInstance().isBungeeDebug());
+
+			socketHandler = new SocketHandler(Main.plugin.getVersion(), Config.getInstance().getSpigotServerHost(),
+					Config.getInstance().getSpigotServerPort(), encryptionHandler,
+					Config.getInstance().isBungeeDebug());
+
+			socketHandler.add(new SocketReceiver("bungeevote") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 3) {
+						Main.plugin.extraDebug("BungeeVote from " + data[2] + ", processing");
+						String uuid = data[1];
+						User user = null;
+						if (!uuid.isEmpty()) {
+							user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+						} else {
+							user = UserManager.getInstance().getVotingPluginUser(data[2]);
+						}
+
+						user.clearCache();
+
+						user.bungeeVote(data[3]);
+					}
+				}
+			});
+
+			socketHandler.add(new SocketReceiver("bungeevoteonline") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 3) {
+						Main.plugin.extraDebug("BungeeVoteOnline from " + data[2] + ", processing");
+						String uuid = data[1];
+						User user = null;
+						if (!uuid.isEmpty()) {
+							user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+						} else {
+							user = UserManager.getInstance().getVotingPluginUser(data[2]);
+						}
+
+						user.clearCache();
+
+						user.bungeeVoteOnline(data[3]);
+					}
+				}
+			});
+
+			socketHandler.add(new SocketReceiver("BungeeBroadcast") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 2) {
+						VoteSite site = Main.plugin.getVoteSite(data[1]);
+						String p = data[3];
+						User user = UserManager.getInstance().getVotingPluginUser(p);
+						if (site != null) {
+							site.broadcastVote(user, false);
+						} else {
+							Main.plugin.getLogger().warning("No votesite for " + data[1]);
 						}
 					}
-				});
+				}
+			});
+
+			socketHandler.add(new SocketReceiver("Status") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 0) {
+						Main.plugin.getLogger().info("Received status command, sending status back");
+						sendData("StatusOkay", Main.plugin.getOptions().getServer());
+
+					}
+				}
+			});
+
+			socketHandler.add(new SocketReceiver("BungeeUpdate") {
+
+				@Override
+				public void onReceive(String[] data) {
+					Main.plugin.setUpdate(true);
+				}
+			});
+
+			if (Main.plugin.getOptions().getServer().equalsIgnoreCase("pleaseset")) {
+				Main.plugin.getLogger().warning("Server name for bungee voting is not set, please set it");
 			}
-		});
 
-		socketHandler = new SocketHandler(Main.plugin.getVersion(), Config.getInstance().getSpigotServerHost(),
-				Config.getInstance().getSpigotServerPort(), encryptionHandler);
+		}
 
 	}
 

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Commands/CommandLoader.java

@@ -2,6 +2,7 @@ package com.Ben12345rocks.VotingPlugin.Commands;
 
 import java.io.File;
 import java.io.IOException;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -24,6 +25,7 @@ import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
 import com.Ben12345rocks.AdvancedCore.Commands.GUI.UserGUI;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.TimeChecker;
 import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
@@ -223,6 +225,16 @@ public class CommandLoader {
 	private void loadAdminVoteCommand() {
 		plugin.setAdminVoteCommand(new ArrayList<CommandHandler>());
 
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "CurrentPluginTime" },
+				"VotingPlugin.Commands.AdminVote.CurrentPluginTime|" + adminPerm, "Current plugin time") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(Config.getInstance().getFormatTimeFormat());
+				sendMessage(sender, TimeChecker.getInstance().getTime().format(formatter));
+			}
+		});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ConvertFrom", "GAL" },
 				"VotingPlugin.Commands.AdminVote.ConvertFrom.GAL|" + adminPerm, "Convert from GAL") {
 
@@ -343,6 +355,23 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "ResetPoints" },
+						"VotingPlugin.Commands.AdminVote.ResetPoints|" + adminPerm, "Clears all points of all players",
+						true, false) {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						sendMessage(sender, "&cStarting...");
+						for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+							User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+							user.setPoints(0);
+						}
+						sendMessage(sender, "&cFinished");
+
+					}
+				});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ResyncMilestones", "(player)" },
 				"VotingPlugin.Commands.AdminVote.SetResyncMilestones|" + adminPerm, "Resync Milestones") {
 
@@ -1520,7 +1549,7 @@ public class CommandLoader {
 			}
 		});
 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "URL", "(SiteName)" },
-				"VotingPlugin.Commands.Vote.URL.VoteSite", "Open VoteURL GUI", false) {
+				"VotingPlugin.Commands.Vote.URL.VoteSite", "Open VoteURL GUI for VoteSite", false) {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
@@ -2175,14 +2204,18 @@ public class CommandLoader {
 
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 						int pointsToGive = Integer.parseInt(args[2]);
-						if (cPlayer.getPoints() >= pointsToGive) {
-							user.addPoints(pointsToGive);
-							cPlayer.removePoints(pointsToGive);
-							sendMessage(sender, "&c" + pointsToGive + " points given to " + user.getPlayerName());
-							user.sendMessage(
-									"&cYou received " + pointsToGive + " points from " + cPlayer.getPlayerName());
+						if (pointsToGive > 0) {
+							if (cPlayer.getPoints() >= pointsToGive) {
+								user.addPoints(pointsToGive);
+								cPlayer.removePoints(pointsToGive);
+								sendMessage(sender, "&c" + pointsToGive + " points given to " + user.getPlayerName());
+								user.sendMessage(
+										"&cYou received " + pointsToGive + " points from " + cPlayer.getPlayerName());
+							} else {
+								sendMessage(sender, "&cNot enough points");
+							}
 						} else {
-							sendMessage(sender, "&cNot enough points");
+							sendMessage(sender, "&cNumber of points needs to be greater than 0");
 						}
 					}
 				}
@@ -2197,9 +2230,9 @@ public class CommandLoader {
 						if (!Config.getInstance().isCommandsUseGUIVote() || !(sender instanceof Player)) {
 							if (isPlayer(sender)) {
 								User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-								user.sendMessage(Commands.getInstance().voteURLs(user));
+								user.sendMessage(Commands.getInstance().voteURLs(user, true));
 							} else {
-								sender.sendMessage(Commands.getInstance().voteURLs(null));
+								sender.sendMessage(Commands.getInstance().voteURLs(null, false));
 							}
 						} else {
 							PlayerGUIs.getInstance().openVoteURL((Player) sender);
@@ -2215,9 +2248,9 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				if (isPlayer(sender)) {
 					User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-					user.sendMessage(Commands.getInstance().voteURLs(user));
+					user.sendMessage(Commands.getInstance().voteURLs(user, true));
 				} else {
-					sender.sendMessage(Commands.getInstance().voteURLs(null));
+					sender.sendMessage(Commands.getInstance().voteURLs(null, true));
 				}
 			}
 		});

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Commands/Commands.java

@@ -737,17 +737,19 @@ public class Commands {
 
 		long time = user.getTime(voteSite);
 		LocalDateTime now = TimeChecker.getInstance().getTime();
+		;
 		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault())
 				.plusHours(Main.plugin.getOptions().getTimeHourOffSet());
 
 		if (!voteSite.isVoteDelayDaily()) {
 			double votedelay = voteSite.getVoteDelay();
-			if (votedelay == 0) {
+			if (votedelay == 0 && voteSite.getVoteDelayMin() == 0) {
 				String errorMsg = config.getFormatCommandsVoteNextInfoError();
 				info = errorMsg;
 			} else {
 
-				LocalDateTime nextvote = lastVote.plusHours((long) votedelay);
+				LocalDateTime nextvote = lastVote.plusHours((long) votedelay)
+						.plusMinutes((long) voteSite.getVoteDelayMin());
 
 				if (time == 0 || now.isAfter(nextvote)) {
 					info = config.getFormatCommandsVoteNextInfoCanVote();
@@ -767,23 +769,64 @@ public class Commands {
 				}
 			}
 		} else {
-			if (lastVote.getDayOfYear() == now.getDayOfYear() && lastVote.getYear() == now.getYear()) {
-				LocalDateTime midnight = TimeChecker.getInstance().getTime().plusDays(1).withHour(0).withMinute(0);
-				Duration dur = Duration.between(now, midnight);
+			LocalDateTime offsetoclockyesterday = TimeChecker.getInstance().getTime().plusDays(-1).withHour(0).withMinute(0)
+					.plusHours((long) voteSite.getTimeOffSet());
+			LocalDateTime offsetoclocktoday = TimeChecker.getInstance().getTime().withHour(0).withMinute(0)
+					.plusHours((long) voteSite.getTimeOffSet());
+			LocalDateTime offsetoclocktomorrow = TimeChecker.getInstance().getTime().plusDays(1).withHour(0).withMinute(0)
+					.plusHours((long) voteSite.getTimeOffSet());
 
-				int diffHours = (int) (dur.getSeconds() / (60 * 60));
-				long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;
+			if (!now.isBefore(offsetoclocktoday)) {
+				if (!lastVote.isBefore(offsetoclocktoday)) {
+					Duration dur = Duration.between(now, offsetoclocktomorrow);
+					int diffHours = (int) (dur.getSeconds() / (60 * 60));
+					long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;
 
-				String timeMsg = config.getFormatCommandsVoteNextInfoVoteDelayDaily();
-				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
-				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
-						Long.toString(diffMinutes));
-				info = timeMsg;
+					if (diffHours < 0) {
+						diffHours = diffHours * -1;
+					}
+					if (diffHours >= 24) {
+						diffHours = diffHours - 24;
+					}
+					if (diffMinutes < 0) {
+						diffMinutes = diffMinutes * -1;
+					}
 
+					String timeMsg = config.getFormatCommandsVoteNextInfoVoteDelayDaily();
+					timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%",
+							Integer.toString(diffHours));
+					timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
+							Long.toString(diffMinutes));
+					info = timeMsg;
+				} else {
+					info = config.getFormatCommandsVoteNextInfoCanVote();
+				}
 			} else {
-				info = config.getFormatCommandsVoteNextInfoCanVote();
-			}
+				if (!lastVote.isBefore(offsetoclockyesterday)) {
+					Duration dur = Duration.between(now, offsetoclocktoday);
+					int diffHours = (int) (dur.getSeconds() / (60 * 60));
+					long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;
 
+					if (diffHours < 0) {
+						diffHours = diffHours * -1;
+					}
+					if (diffHours >= 24) {
+						diffHours = diffHours - 24;
+					}
+					if (diffMinutes < 0) {
+						diffMinutes = diffMinutes * -1;
+					}
+
+					String timeMsg = config.getFormatCommandsVoteNextInfoVoteDelayDaily();
+					timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%",
+							Integer.toString(diffHours));
+					timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
+							Long.toString(diffMinutes));
+					info = timeMsg;
+				} else {
+					info = config.getFormatCommandsVoteNextInfoCanVote();
+				}
+			}
 		}
 		return info;
 	}
@@ -909,7 +952,7 @@ public class Commands {
 		return ArrayUtils.getInstance().convert(msg);
 	}
 
-	public String[] voteURLs(User user) {
+	public String[] voteURLs(User user, boolean json) {
 		ArrayList<String> sites = new ArrayList<String>();
 
 		List<String> title = config.getFormatCommandsVoteText();
@@ -920,13 +963,15 @@ public class Commands {
 			int counter = 0;
 			for (VoteSite voteSite : plugin.getVoteSites()) {
 				counter++;
-				String voteURL = voteSite.getVoteURL();
+				String voteURL = voteSite.getVoteURL(json);
 				MessageBuilder message = new MessageBuilder(config.getFormatCommandsVoteURLS());
 				message.replacePlaceholder("num", Integer.toString(counter)).replacePlaceholder("url", voteURL)
-						.replacePlaceholder("SiteName", voteSite.getDisplayName())
-						.replacePlaceholder("player", "" + user.getPlayerName())
-						.replacePlaceholder("Next", "" + voteCommandNextInfo(user, voteSite)).colorize();
-				sites.add(message.getText());
+						.replacePlaceholder("SiteName", voteSite.getDisplayName());
+				if (user != null && user.getPlayerName() != null) {
+					message.replacePlaceholder("player", "" + user.getPlayerName()).replacePlaceholder("Next",
+							"" + voteCommandNextInfo(user, voteSite));
+				}
+				sites.add(message.colorize().getText());
 			}
 		}
 		if (user != null) {
@@ -938,6 +983,7 @@ public class Commands {
 
 			sites = ArrayUtils.getInstance().replacePlaceHolder(sites, phs);
 		}
+
 		sites = ArrayUtils.getInstance().colorize(sites);
 		return ArrayUtils.getInstance().convert(sites);
 	}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Commands/GUI/PlayerGUIs.java

@@ -12,7 +12,9 @@ import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
 
+import com.Ben12345rocks.AdvancedCore.NMSManager.NMSManager;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
@@ -21,7 +23,6 @@ import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventoryButton;
 import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
 import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Commands.Commands;
@@ -146,7 +147,7 @@ public class PlayerGUIs {
 
 			if (lore.length == 0) {
 				if (slot.equalsIgnoreCase("url")) {
-					lore = Commands.getInstance().voteURLs(user);
+					lore = new String[] { "&aClick me" };
 				} else if (slot.equalsIgnoreCase("next")) {
 					lore = Commands.getInstance().voteCommandNext(user);
 				} else if (slot.equalsIgnoreCase("last")) {
@@ -181,48 +182,44 @@ public class PlayerGUIs {
 
 				@Override
 				public void onClick(ClickEvent event) {
-					Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
-						@Override
-						public void run() {
-							Player player = event.getWhoClicked();
-							String cmd = Config.getInstance().getVoteGUISlotCommand(slot);
-							User user = getSelectedPlayer(player);
-							if (cmd.equalsIgnoreCase("none")) {
-								return;
-							} else if (!cmd.equals("")) {
-								Bukkit.getScheduler().runTask(plugin, new Runnable() {
+					Player player = event.getWhoClicked();
+					String cmd = Config.getInstance().getVoteGUISlotCommand(slot);
+					User user = getSelectedPlayer(player);
+					if (cmd.equalsIgnoreCase("none")) {
+						return;
+					} else if (!cmd.equals("")) {
+						event.runSync(new Runnable() {
 
-									@Override
-									public void run() {
-										player.performCommand(cmd);
-									}
-								});
-							} else {
-								if (slot.equalsIgnoreCase("url")) {
-									openVoteURL(player);
-								} else if (slot.equalsIgnoreCase("next")) {
-									openVoteNext(player, user);
-								} else if (slot.equalsIgnoreCase("last")) {
-									openVoteLast(player, user);
-								} else if (slot.equalsIgnoreCase("total")) {
-									openVoteTotal(player, user);
-								} else if (slot.equalsIgnoreCase("top")) {
-									openVoteTop(player, null);
-								} else if (slot.equalsIgnoreCase("today")) {
-									openVoteToday(player);
-								} else if (slot.equalsIgnoreCase("help")) {
-									player.performCommand("vote help");
-								} else if (slot.equalsIgnoreCase("shop")) {
-									openVoteShop(player);
-								} else if (slot.equalsIgnoreCase("lastmonth")) {
-									openVoteTopLastMonth(player);
-								}
+							@Override
+							public void run() {
+								player.performCommand(cmd);
 							}
+						});
+					} else {
+						if (slot.equalsIgnoreCase("url")) {
+							user.sendMessage(Commands.getInstance().voteURLs(user, true));
+							event.closeInventory();
+						} else if (slot.equalsIgnoreCase("next")) {
+							openVoteNext(player, user);
+						} else if (slot.equalsIgnoreCase("last")) {
+							openVoteLast(player, user);
+						} else if (slot.equalsIgnoreCase("total")) {
+							openVoteTotal(player, user);
+						} else if (slot.equalsIgnoreCase("top")) {
+							openVoteTop(player, null);
+						} else if (slot.equalsIgnoreCase("today")) {
+							openVoteToday(player);
+						} else if (slot.equalsIgnoreCase("help")) {
+							player.performCommand("vote help");
+						} else if (slot.equalsIgnoreCase("shop")) {
+							openVoteShop(player);
+						} else if (slot.equalsIgnoreCase("lastmonth")) {
+							openVoteTopLastMonth(player);
 						}
-					});
-
+					}
 				}
+
 			});
 		}
 
@@ -312,7 +309,9 @@ public class PlayerGUIs {
 							event.getButton().getInv().closeInv(player, null);
 
 							User user = UserManager.getInstance().getVotingPluginUser(player);
-							user.clearCache();
+							if (Config.getInstance().isClearCacheOnVoteShopPurchase()) {
+								user.clearCache();
+							}
 							String identifier = (String) getData("identifier");
 							int limit = (int) getData("Limit");
 							int points = Config.getInstance().getIdentifierCost(identifier);
@@ -327,25 +326,30 @@ public class PlayerGUIs {
 								}
 
 								if (limitPass) {
-									HashMap<String, String> placeholders = new HashMap<String, String>();
-									placeholders.put("identifier", identifier);
-									placeholders.put("points", "" + points);
-									placeholders.put("limit", "" + limit);
-									if (user.removePoints(points)) {
+									if (!Config.getInstance().isVoteShopRequireConfirmation()) {
+										HashMap<String, String> placeholders = new HashMap<String, String>();
+										placeholders.put("identifier",
+												Config.getInstance().getIdentifierIdentifierName(identifier));
+										placeholders.put("points", "" + points);
+										placeholders.put("limit", "" + limit);
+										if (user.removePoints(points)) {
 
-										RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-												Config.getInstance().getIdentifierRewardsPath(identifier),
-												new RewardOptions().setPlaceholders(placeholders));
+											RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
+													Config.getInstance().getIdentifierRewardsPath(identifier),
+													new RewardOptions().setPlaceholders(placeholders));
 
-										user.sendMessage(StringParser.getInstance().replacePlaceHolder(
-												Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
-										if (limit > 0) {
-											user.setVoteShopIdentifierLimit(identifier,
-													user.getVoteShopIdentifierLimit(identifier) + 1);
+											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+													Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
+											if (limit > 0) {
+												user.setVoteShopIdentifierLimit(identifier,
+														user.getVoteShopIdentifierLimit(identifier) + 1);
+											}
+										} else {
+											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+													Config.getInstance().getFormatShopFailedMsg(), placeholders));
 										}
 									} else {
-										user.sendMessage(StringParser.getInstance().replacePlaceHolder(
-												Config.getInstance().getFormatShopFailedMsg(), placeholders));
+										openVoteShopConfirmation(player, identifier);
 									}
 								} else {
 									user.sendMessage(Config.getInstance().getVoteShopLimitReached());
@@ -377,6 +381,56 @@ public class PlayerGUIs {
 		inv.openInventory(player);
 	}
 
+	public void openVoteShopConfirmation(Player player, String identifier) {
+		PlayerUtils.getInstance().setPlayerMeta(player, "ident", identifier);
+		BInventory inv = new BInventory("Confirm Purchase?");
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.EMERALD_BLOCK).setName("&aYes")) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				String ident = (String) PlayerUtils.getInstance().getPlayerMeta(event.getPlayer(), "ident");
+				User user = UserManager.getInstance().getVotingPluginUser(event.getPlayer());
+				int points = Config.getInstance().getIdentifierCost(ident);
+				int limit = Config.getInstance().getIdentifierLimit(identifier);
+				HashMap<String, String> placeholders = new HashMap<String, String>();
+				placeholders.put("identifier", identifier);
+				placeholders.put("points", "" + points);
+				placeholders.put("limit", "" + limit);
+				if (user.removePoints(points)) {
+
+					RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
+							Config.getInstance().getIdentifierRewardsPath(identifier),
+							new RewardOptions().setPlaceholders(placeholders));
+
+					user.sendMessage(StringParser.getInstance()
+							.replacePlaceHolder(Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
+					if (limit > 0) {
+						user.setVoteShopIdentifierLimit(identifier, user.getVoteShopIdentifierLimit(identifier) + 1);
+					}
+				} else {
+					user.sendMessage(StringParser.getInstance()
+							.replacePlaceHolder(Config.getInstance().getFormatShopFailedMsg(), placeholders));
+				}
+				Bukkit.getScheduler().runTask(plugin, new Runnable() {
+
+					@Override
+					public void run() {
+						event.getPlayer().closeInventory();
+					}
+				});
+
+			}
+		});
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.BARRIER).setName("&cNo")) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				event.getPlayer().closeInventory();
+			}
+		});
+		inv.openInventory(player);
+	}
+
 	public void openVoteStreak(Player player, User user) {
 		setSelectedPlayer(player, user);
 		BInventory inv = new BInventory(StringParser.getInstance()
@@ -456,9 +510,21 @@ public class PlayerGUIs {
 			for (VoteSite voteSite : plugin.getVoteToday().get(user).keySet()) {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(Config.getInstance().getFormatTimeFormat());
 				String timeString = plugin.getVoteToday().get(user).get(voteSite).format(formatter);
-				String msg = "&6" + voteSite.getDisplayName() + " : " + timeString;
-				inv.addButton(inv.getNextSlot(), new BInventoryButton(user.getPlayerName(), new String[] { msg },
-						MiscUtils.getInstance().setSkullOwner(user.getOfflinePlayer())) {
+				String msg = Config.getInstance().getGUIVoteTodayLine();
+				HashMap<String, String> placeholders = new HashMap<String, String>();
+				placeholders.put("VoteSite", voteSite.getDisplayName());
+				placeholders.put("Time", timeString);
+				msg = StringParser.getInstance().replacePlaceHolder(msg, placeholders);
+				ItemBuilder item = null;
+				if (Config.getInstance().isGUIVoteTodayUseSkull() && !NMSManager.getInstance().isVersion("1.12")) {
+					item = new ItemBuilder(new ItemStack(Material.PLAYER_HEAD, 1)).setSkullOwner(player);
+				} else {
+					item = new ItemBuilder(Config.getInstance().getGUIVoteTodayPlayerItem());
+				}
+				item.setName(StringParser.getInstance().replacePlaceHolder(
+						Config.getInstance().getGUIVoteTodayIconTitle(), "player", user.getPlayerName()));
+				item.setLore(msg);
+				inv.addButton(inv.getNextSlot(), new BInventoryButton(item) {
 
 					@Override
 					public void onClick(ClickEvent clickEvent) {
@@ -654,7 +720,7 @@ public class PlayerGUIs {
 				@Override
 				public void onClick(ClickEvent event) {
 					User user = UserManager.getInstance().getVotingPluginUser(event.getPlayer());
-					user.sendMessage(Commands.getInstance().voteURLs(user));
+					user.sendMessage(Commands.getInstance().voteURLs(user, true));
 				}
 			});
 

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Config/Config.java

@@ -9,6 +9,7 @@ import org.bukkit.configuration.ConfigurationSection;
 
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.AnnotationHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataBoolean;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataConfigurationSection;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataDouble;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataInt;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataListString;
@@ -56,7 +57,11 @@ public class Config extends YMLFile {
 	@ConfigDataBoolean(path = "Commands.VoteRewardFromVoteURL")
 	@Getter
 	private boolean commandsVoteRewardFromVoteURL = false;
-	
+
+	@ConfigDataBoolean(path = "ClearCacheOnVoteShopPurchase")
+	@Getter
+	private boolean clearCacheOnVoteShopPurchase = true;
+
 	@ConfigDataBoolean(path = "ExtraBackgroundUpdate")
 	@Getter
 	private boolean extraBackgroundUpdate = false;
@@ -149,11 +154,19 @@ public class Config extends YMLFile {
 
 	@ConfigDataBoolean(path = "UseBungeecoord")
 	@Getter
-	private boolean useBungeeCoord = false;
+	private boolean useBungeecoord = false;
 
 	@ConfigDataBoolean(path = "BungeeBroadcast")
 	@Getter
 	private boolean bungeeBroadcast = false;
+	
+	@ConfigDataBoolean(path = "BungeeBroadcastAlways")
+	@Getter
+	private boolean bungeeBroadcastAlways = false;
+
+	@ConfigDataBoolean(path = "BungeeDebug")
+	@Getter
+	private boolean bungeeDebug = false;
 
 	@ConfigDataBoolean(path = "GUI.VoteURL.AllUrlsButton.RequireAllSitesVoted")
 	@Getter
@@ -247,6 +260,14 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean disableAdvancedTab = false;
 
+	@ConfigDataBoolean(path = "VoteShopRequireConfirmation")
+	@Getter
+	private boolean voteShopRequireConfirmation = false;
+
+	@ConfigDataBoolean(path = "Format.Commands.Vote.ForceLinks")
+	@Getter
+	private boolean formatCommandsVoteForceLinks = true;
+
 	@Getter
 	private String firstVoteRewardsPath = "FirstVote";
 
@@ -292,6 +313,10 @@ public class Config extends YMLFile {
 	@ConfigDataString(path = "GUI.VoteTop.PlayerItem.Material")
 	@Getter
 	private String guiVoteTopPlayerItemMaterial = "PAPER";
+	
+	@ConfigDataString(path = "BungeeMethod")
+	@Getter
+	private String bungeeMethod = "SOCKETS";
 
 	@ConfigDataBoolean(path = "AllowVotePointTransfers")
 	@Getter
@@ -320,6 +345,22 @@ public class Config extends YMLFile {
 	@Getter
 	private String formatCommandsVoteTodayLine = "&6%player% : %VoteSite% : %Time%";
 
+	@ConfigDataString(path = "GUI.VoteToday.Line")
+	@Getter
+	private String GUIVoteTodayLine = "&6%VoteSite% : %Time%";
+
+	@ConfigDataBoolean(path = "GUI.VoteToday.UseSkull", defaultValue = true)
+	@Getter
+	private boolean GUIVoteTodayUseSkull = true;
+
+	@ConfigDataConfigurationSection(path = "GUI.VoteToday.PlayerItem")
+	@Getter
+	private ConfigurationSection GUIVoteTodayPlayerItem;
+
+	@ConfigDataString(path = "GUI.VoteToday.IconTitle")
+	@Getter
+	private String GUIVoteTodayIconTitle = "%player%";
+
 	@ConfigDataBoolean(path = "OverrideVersionDisable")
 	@Getter
 	private boolean overrideVersionDisable = false;
@@ -332,10 +373,18 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean allowUnJoinedCheckServer = true;
 
+	@ConfigDataBoolean(path = "UseJavascriptPlaceholders")
+	@Getter
+	private boolean useJavascriptPlaceholders = true;
+
 	@ConfigDataListString(path = "DisabledCommands")
 	@Getter
 	private ArrayList<String> disabledCommands = new ArrayList<String>();
 
+	@ConfigDataListString(path = "VotingBroadcastBlacklist")
+	@Getter
+	private ArrayList<String> votingBroadcastBlacklist = new ArrayList<String>();
+
 	@ConfigDataString(path = "BungeeServer.Host")
 	@Getter
 	private String bungeeServerHost = "";
@@ -985,6 +1034,10 @@ public class Config extends YMLFile {
 		return getData().getInt("Shop." + identifier + ".Cost");
 	}
 
+	public String getIdentifierIdentifierName(String identifier) {
+		return getData().getString("Shop." + identifier + ".Identifier_Name", identifier);
+	}
+
 	public int getIdentifierLimit(String identifier) {
 		return getData().getInt("Shop." + identifier + ".Limit", -1);
 	}
@@ -1332,6 +1385,18 @@ public class Config extends YMLFile {
 		return getData().getBoolean("Shop." + shop + ".NotBuyable", false);
 	}
 
+	public boolean getVoteShopResetDaily(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Daily", false);
+	}
+
+	public boolean getVoteShopResetWeekly(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Weekly", false);
+	}
+
+	public boolean getVoteShopResetMonthly(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Monthly", false);
+	}
+
 	public String getVoteShopPermission(String ident) {
 		return getData().getString("Shop." + ident + ".Permission", "");
 	}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Config/ConfigVoteSites.java

@@ -63,14 +63,14 @@ public class ConfigVoteSites extends YMLFile {
 			setServiceSite(siteName, org);
 			setVoteURL(siteName, "VoteURL");
 			setVoteDelay(siteName, 24);
-			set(siteName, "Item.Material", "GRASS");
-			set(siteName, "Item.Amount", 1);
+			set(siteName, "DisplayItem.Material", "GRASS");
+			set(siteName, "DisplayItem.Amount", 1);
 			set(siteName, "Rewards.Messages.Player", "&aThanks for voting on %ServiceSite%!");
 
 			plugin.loadVoteSites();
 
 			for (Player p : Bukkit.getOnlinePlayers()) {
-				if (p.hasPermission("VotingPlugin.Admin.GenerateServiceSite")) {
+				if (p.hasPermission("VotingPlugin.Admin.GenerateServiceSite") || p.isOp()) {
 					p.sendMessage(StringParser.getInstance().colorize("&cGenerating votesite for service site "
 							+ siteName + ", please check console for details"));
 				}
@@ -98,6 +98,9 @@ public class ConfigVoteSites extends YMLFile {
 	}
 
 	public ConfigurationSection getItem(String site) {
+		if (getData(site).isConfigurationSection("DisplayItem")) {
+			return getData(site).getConfigurationSection("DisplayItem");
+		}
 		return getData(site).getConfigurationSection("Item");
 	}
 
@@ -145,6 +148,14 @@ public class ConfigVoteSites extends YMLFile {
 		return getData(siteName).getInt("VoteDelay");
 	}
 
+	public int getTimeOffSet(String siteName) {
+		return getData(siteName).getInt("TimeOffSet", 0);
+	}
+
+	public int getVoteDelayMin(String siteName) {
+		return getData(siteName).getInt("VoteDelayMin", 0);
+	}
+
 	/**
 	 * Gets the vote site enabled.
 	 *

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/CoolDown/CoolDownCheck.java

@@ -1,6 +1,7 @@
 package com.Ben12345rocks.VotingPlugin.CoolDown;
 
-import org.bukkit.Bukkit;
+import java.util.TimerTask;
+
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -53,20 +54,26 @@ public class CoolDownCheck implements Listener {
 	}
 
 	public void checkAll() {
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+		Main.plugin.getTimer().schedule(new TimerTask() {
 
 			@Override
 			public void run() {
-				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-					if (Main.plugin != null) {
-						User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-						if (user.getUserData().hasData() && user.hasLoggedOnBefore()) {
-							user.checkCoolDownEvents();
+				if (Main.plugin != null) {
+					for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+						if (Main.plugin != null) {
+							User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+							if (user.getUserData().hasData() && user.hasLoggedOnBefore()) {
+								user.checkCoolDownEvents();
+							}
+						} else {
+							cancel();
 						}
 					}
+				} else {
+					cancel();
 				}
 			}
-		});
+		}, 1000 * 60 * 3);
 
 	}
 

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Events/PlayerVoteEvent.java

@@ -42,10 +42,14 @@ public class PlayerVoteEvent extends Event {
 	@Setter
 	private boolean realVote = true;
 
+	@Getter
+	@Setter
+	private boolean addTotals = true;
+
 	@Getter
 	@Setter
 	private String serviceSite = "";
-	
+
 	@Getter
 	@Setter
 	private long time;
@@ -70,7 +74,7 @@ public class PlayerVoteEvent extends Event {
 	@Getter
 	@Setter
 	private boolean bungee = false;
-	
+
 	@Getter
 	@Setter
 	private boolean forceBungee = false;

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Listeners/PlayerCommandSendListener.java

@@ -30,18 +30,24 @@ public class PlayerCommandSendListener implements Listener {
 			return;
 		}
 		ArrayList<String> removeCmds = new ArrayList<String>();
-		ArrayList<String> whiteListed = new ArrayList<String>();
-		for (String cmd : event.getCommands()) {
-			if (CommandLoader.getInstance().isVotingPluginCommand(event.getPlayer(), cmd)) {
-				if (!CommandLoader.getInstance().hasPermission(event.getPlayer(), cmd) && !whiteListed.contains(cmd)) {
-					removeCmds.add(cmd);
-					// plugin.debug("removed " + cmd);
-				} else {
-					removeCmds.remove(cmd);
-					whiteListed.add(cmd);
-					// plugin.debug("has " + cmd);
+		if (!Main.plugin.getAdvancedTab().containsKey(event.getPlayer().getUniqueId())) {
+			ArrayList<String> whiteListed = new ArrayList<String>();
+			for (String cmd : event.getCommands()) {
+				if (CommandLoader.getInstance().isVotingPluginCommand(event.getPlayer(), cmd)) {
+					if (!CommandLoader.getInstance().hasPermission(event.getPlayer(), cmd)
+							&& !whiteListed.contains(cmd)) {
+						removeCmds.add(cmd);
+						// plugin.debug("removed " + cmd);
+					} else {
+						removeCmds.remove(cmd);
+						whiteListed.add(cmd);
+						// plugin.debug("has " + cmd);
+					}
 				}
 			}
+			Main.plugin.getAdvancedTab().put(event.getPlayer().getUniqueId(), removeCmds);
+		} else {
+			removeCmds = Main.plugin.getAdvancedTab().get(event.getPlayer().getUniqueId());
 		}
 		event.getCommands().removeAll(removeCmds);
 	}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Listeners/PlayerJoinEvent.java

@@ -1,13 +1,16 @@
 package com.Ben12345rocks.VotingPlugin.Listeners;
 
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
 
 import com.Ben12345rocks.AdvancedCore.Listeners.AdvancedCoreLoginEvent;
 import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 
@@ -59,6 +62,21 @@ public class PlayerJoinEvent implements Listener {
 			// give offline vote (if they voted offline)
 			user.offVote();
 		}
+	}
+
+	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+	public void onPlayerQuit(PlayerQuitEvent event) {
+		if (Config.getInstance().isDisableAdvancedTab()) {
+			return;
+		}
+		final java.util.UUID uuid = event.getPlayer().getUniqueId();
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				Main.plugin.getAdvancedTab().remove(uuid);
+			}
+		});
 
 	}
 }

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Listeners/PlayerVoteListener.java

@@ -2,12 +2,15 @@ package com.Ben12345rocks.VotingPlugin.Listeners;
 
 import java.util.ArrayList;
 
+import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
+import com.Ben12345rocks.AdvancedCore.Util.PluginMessage.PluginMessage;
+import com.Ben12345rocks.VotingPlugin.BungeeHandler;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
@@ -17,6 +20,7 @@ import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
 import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
+import com.Ben12345rocks.VotingPlugin.bungee.BungeeMethod;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -84,7 +88,7 @@ public class PlayerVoteListener implements Listener {
 		User user = UserManager.getInstance().getVotingPluginUser(playerName);
 		user.updateName();
 
-		if (Config.getInstance().isClearCacheOnVote() || Config.getInstance().isUseBungeeCoord()) {
+		if (Config.getInstance().isClearCacheOnVote() || Config.getInstance().isUseBungeecoord()) {
 			user.clearCache();
 		}
 
@@ -133,7 +137,7 @@ public class PlayerVoteListener implements Listener {
 			}
 
 			// add to total votes
-			if (Config.getInstance().isCountFakeVotes() || event.isRealVote()) {
+			if ((Config.getInstance().isCountFakeVotes() || event.isRealVote()) && event.isAddTotals()) {
 				if (Config.getInstance().isAddTotals()) {
 					user.addTotal();
 					user.addTotalDaily();
@@ -148,6 +152,23 @@ public class PlayerVoteListener implements Listener {
 			SpecialRewards.getInstance().checkAllSites(user);
 			SpecialRewards.getInstance().checkCumualativeVotes(user);
 			SpecialRewards.getInstance().checkMilestone(user);
+
+			if (config.isUseBungeecoord()) {
+				if (BungeeHandler.getInstance().getMethod().equals(BungeeMethod.MYSQL)) {
+					final String uuid = user.getUUID();
+					Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+						@Override
+						public void run() {
+							if (Bukkit.getOnlinePlayers().size() > 0) {
+								PluginMessage.getInstance().sendPluginMessage(
+										PlayerUtils.getInstance().getRandomOnlinePlayer(), "VoteUpdate", uuid);
+							}
+						}
+					}, 40);
+				}
+
+			}
 		}
 
 		plugin.setUpdate(true);

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Main.java

@@ -12,7 +12,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.Timer;
 import java.util.TimerTask;
 
 import org.bukkit.Bukkit;
@@ -139,6 +138,9 @@ public class Main extends AdvancedCorePlugin {
 
 	private boolean votifierLoaded = true;
 
+	@Getter
+	private LinkedHashMap<java.util.UUID, ArrayList<String>> advancedTab = new LinkedHashMap<java.util.UUID, ArrayList<String>>();
+
 	/**
 	 * Check votifier.
 	 */
@@ -146,7 +148,7 @@ public class Main extends AdvancedCorePlugin {
 		try {
 			Class.forName("com.vexsoftware.votifier.model.VotifierEvent");
 		} catch (ClassNotFoundException e) {
-			if (!Config.getInstance().isUseBungeeCoord()) {
+			if (!Config.getInstance().isUseBungeecoord()) {
 				plugin.getLogger()
 						.warning("No VotifierEvent found, install Votifier, NuVotifier, or another Votifier plugin");
 			} else {
@@ -775,14 +777,14 @@ public class Main extends AdvancedCorePlugin {
 
 	@Override
 	public void onPostLoad() {
-		if (Config.getInstance().isUseBungeeCoord()) {
+		if (Config.getInstance().isUseBungeecoord()) {
 			BungeeHandler.getInstance().load();
-			if (Config.getInstance().isUseBungeeCoord()) {
-				if (getOptions().getServer().equalsIgnoreCase("PleaseSet")) {
-					getLogger().warning(
-							"Bungeecoord is true and server name is not set, bungeecoord features may not work");
-				}
+
+			if (getOptions().getServer().equalsIgnoreCase("PleaseSet")) {
+				getLogger()
+						.warning("Bungeecoord is true and server name is not set, bungeecoord features may not work");
 			}
+
 		}
 
 		registerCommands();
@@ -990,7 +992,7 @@ public class Main extends AdvancedCorePlugin {
 
 		// disable plugin for older versions below 1.12
 
-		if (NMSManager.getInstance().isVersion("1.7", "1.8", "1.9", "1.10", "1.11", "1.12")) {
+		if (NMSManager.getInstance().isVersion("1.7", "1.8", "1.9", "1.10", "1.11")) {
 			plugin.getLogger().severe("Detected running " + Bukkit.getVersion()
 					+ ", this version is not supported on this build, read the plugin page. Disabling...");
 			if (!Config.getInstance().isOverrideVersionDisable()) {
@@ -1016,15 +1018,9 @@ public class Main extends AdvancedCorePlugin {
 	 */
 	@Override
 	public void onUnLoad() {
-		new Timer().schedule(new TimerTask() {
-
-			@Override
-			public void run() {
-				Signs.getInstance().storeSigns();
-			}
-		}, 0);
+		Signs.getInstance().storeSigns();
 		HandlerList.unregisterAll(plugin);
-		if (Config.getInstance().isUseBungeeCoord()) {
+		if (Config.getInstance().isUseBungeecoord()) {
 			try {
 				BungeeHandler.getInstance().close();
 			} catch (Exception e) {
@@ -1082,7 +1078,9 @@ public class Main extends AdvancedCorePlugin {
 		pm.registerEvents(new BlockBreak(this), this);
 		pm.registerEvents(new PlayerInteract(this), this);
 		pm.registerEvents(new VotingPluginUpdateEvent(this), this);
-		pm.registerEvents(new PlayerCommandSendListener(this), this);
+		if (!NMSManager.getInstance().isVersion("1.12")) {
+			pm.registerEvents(new PlayerCommandSendListener(this), this);
+		}
 		pm.registerEvents(new CoolDownCheck(this), this);
 
 		plugin.debug("Loaded Events");
@@ -1134,7 +1132,7 @@ public class Main extends AdvancedCorePlugin {
 	 * Update.
 	 */
 	public void update() {
-		if (update || Config.getInstance().isAlwaysUpdate() || Config.getInstance().isUseBungeeCoord()) {
+		if (update || Config.getInstance().isAlwaysUpdate()) {
 			if (!updateStarted && plugin != null) {
 				if (!Config.getInstance().isUpdateWithPlayersOnlineOnly() || Bukkit.getOnlinePlayers().size() != 0) {
 					updateStarted = true;
@@ -1146,7 +1144,7 @@ public class Main extends AdvancedCorePlugin {
 								plugin.debug("MySQL not loaded yet");
 								return;
 							} else if (Config.getInstance().isClearCacheOnUpdate()
-									|| Config.getInstance().isUseBungeeCoord()) {
+									|| Config.getInstance().isUseBungeecoord()) {
 								getMysql().clearCache();
 							} else {
 								getMysql().clearCacheBasic();

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Objects/User.java

@@ -1,8 +1,8 @@
 package com.Ben12345rocks.VotingPlugin.Objects;
 
 import java.time.Instant;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.YearMonth;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -22,9 +22,9 @@ import com.Ben12345rocks.AdvancedCore.TimeChecker.TimeChecker;
 import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
+import com.Ben12345rocks.VotingPlugin.BungeeHandler;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
-import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerReceivePointsEvent;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteCoolDownEndEvent;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
@@ -32,6 +32,7 @@ import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
 import com.Ben12345rocks.VotingPlugin.VoteReminding.VoteReminding;
+import com.Ben12345rocks.VotingPlugin.bungee.BungeeMethod;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -218,7 +219,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	 */
 	public boolean canVoteSite(VoteSite voteSite) {
 
-		String siteName = voteSite.getKey();
 		long time = getTime(voteSite);
 		if (time == 0) {
 			return true;
@@ -229,13 +229,14 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 					.plusHours(Main.plugin.getOptions().getTimeHourOffSet());
 
 			if (!voteSite.isVoteDelayDaily()) {
-				int votedelay = ConfigVoteSites.getInstance().getVoteDelay(siteName);
+				double votedelay = voteSite.getVoteDelay();
 
 				if (votedelay == 0) {
 					return false;
 				}
 
-				LocalDateTime nextvote = lastVote.plusHours(votedelay);
+				LocalDateTime nextvote = lastVote.plusHours((long) votedelay)
+						.plusMinutes((long) voteSite.getVoteDelayMin());
 
 				return now.isAfter(nextvote);
 			} else {
@@ -605,8 +606,28 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				.withPlaceHolder("votes", "" + getTotal(TopVoter.Weekly)).setOnline(isOnline()).send(this);
 	}
 
+	public void bungeeVotePluginMessaging(String service, long time) {
+		if (Config.getInstance().isUseBungeecoord()) {
+			Main.plugin.debug("Pluginmessaging vote for " + getPlayerName() + " on " + service);
+
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
+					true);
+			voteEvent.setBungee(true);
+			voteEvent.setForceBungee(true);
+			voteEvent.setTime(time);
+			voteEvent.setAddTotals(false);
+			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
+				}
+			});
+		}
+	}
+
 	public void bungeeVote(String service) {
-		if (Config.getInstance().isUseBungeeCoord()) {
+		if (Config.getInstance().isUseBungeecoord()) {
 			Main.plugin.debug("Bungee vote for " + getPlayerName() + " on " + service);
 
 			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
@@ -624,7 +645,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	}
 
 	public void bungeeVoteOnline(String service) {
-		if (Config.getInstance().isUseBungeeCoord()) {
+		if (Config.getInstance().isUseBungeecoord()) {
 			Main.plugin.debug("Bungee online vote for " + getPlayerName() + " on " + service);
 
 			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
@@ -647,6 +668,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	 * @return true if user got the first vote reward
 	 */
 	public boolean hasGottenFirstVote() {
+		if (Config.getInstance().isUseBungeecoord()
+				&& BungeeHandler.getInstance().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
+			return getTotal(TopVoter.AllTime) > 1;
+		}
 		return getTotal(TopVoter.AllTime) != 0;
 	}
 
@@ -925,7 +950,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				break;
 			case Monthly:
 				if (Config.getInstance().isLimitMonthlyVotes()) {
-					int days = LocalDate.now().lengthOfMonth();
+					LocalDateTime time = TimeChecker.getInstance().getTime();
+					int days = YearMonth.of(time.getYear(), time.getMonth()).lengthOfMonth();
 					if (value >= days * plugin.getVoteSites().size()) {
 						value = days * plugin.getVoteSites().size();
 					}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Objects/VoteSite.java

@@ -14,12 +14,15 @@ import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
 import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
+import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
+import com.Ben12345rocks.AdvancedCore.Util.PluginMessage.PluginMessage;
 import com.Ben12345rocks.VotingPlugin.BungeeHandler;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+import com.Ben12345rocks.VotingPlugin.bungee.BungeeMethod;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -38,10 +41,21 @@ public class VoteSite {
 	/** The plugin. */
 	static Main plugin = Main.plugin;
 
-	@Getter
 	@Setter
 	private String voteURL;
 
+	public String getVoteURL(boolean json) {
+		if (!Config.getInstance().isFormatCommandsVoteForceLinks() || !json) {
+			return voteURL;
+		} else {
+			return "[Text=\"" + voteURL + "\",url=\"" + voteURL + "\"]";
+		}
+	}
+
+	public String getVoteURL() {
+		return getVoteURL(true);
+	}
+
 	@Getter
 	@Setter
 	private String serviceSite;
@@ -58,6 +72,14 @@ public class VoteSite {
 	@Setter
 	private double voteDelay;
 
+	@Getter
+	@Setter
+	private double voteDelayMin;
+
+	@Getter
+	@Setter
+	private double timeOffSet;
+
 	@Getter
 	@Setter
 	private boolean enabled;
@@ -116,10 +138,26 @@ public class VoteSite {
 	 */
 	public void broadcastVote(User user, boolean checkBungee) {
 		if (!user.isVanished()) {
-			if (checkBungee && Config.getInstance().isBungeeBroadcast()) {
-				BungeeHandler.getInstance().sendData("Broadcast", getServiceSite(), user.getPlayerName());
+			if (checkBungee && Config.getInstance().isBungeeBroadcast() && Config.getInstance().isUseBungeecoord()) {
+				if (BungeeHandler.getInstance().getMethod().equals(BungeeMethod.SOCKETS)) {
+					BungeeHandler.getInstance().sendData("Broadcast", getServiceSite(), user.getPlayerName());
+				} else if (BungeeHandler.getInstance().getMethod().equals(BungeeMethod.MYSQL)
+						|| BungeeHandler.getInstance().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
+					String uuid = user.getUUID();
+					String service = getServiceSite();
+
+					if (Bukkit.getOnlinePlayers().size() > 0) {
+						PluginMessage.getInstance().sendPluginMessage(PlayerUtils.getInstance().getRandomOnlinePlayer(),
+								"VoteBroadcast", uuid, service);
+					}
+				}
+
 			} else {
 				String playerName = user.getPlayerName();
+				if (config.getVotingBroadcastBlacklist().contains(playerName)) {
+					plugin.getLogger().info("Not broadcasting for " + playerName + ", in blacklist");
+					return;
+				}
 				String bc = StringParser.getInstance().colorize(config.getFormatBroadCastMsg());
 				HashMap<String, String> placeholders = new HashMap<String, String>();
 				placeholders.put("player", playerName);
@@ -128,6 +166,7 @@ public class VoteSite {
 				placeholders.put("sitename", getDisplayName());
 				placeholders.put("servicesite", getServiceSite());
 				bc = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
+				bc = StringParser.getInstance().replacePlaceHolders(user.getOfflinePlayer(), bc);
 				ArrayList<Player> players = new ArrayList<Player>();
 				for (Player p : Bukkit.getOnlinePlayers()) {
 					if (!UserManager.getInstance().getVotingPluginUser(p).getDisableBroadcast()) {
@@ -182,6 +221,7 @@ public class VoteSite {
 		setVoteURL(configVoteSites.getVoteURL(key));
 		setServiceSite(configVoteSites.getServiceSite(key));
 		setVoteDelay(configVoteSites.getVoteDelay(key));
+		setVoteDelayMin(configVoteSites.getVoteDelayMin(key));
 		setEnabled(configVoteSites.getVoteSiteEnabled(key));
 		setPriority(configVoteSites.getPriority(key));
 		displayName = configVoteSites.getDisplayName(key);
@@ -192,6 +232,7 @@ public class VoteSite {
 		voteDelayDaily = configVoteSites.getVoteSiteResetVoteDelayDaily(key);
 		giveOffline = configVoteSites.getVoteSiteGiveOffline(key);
 		waitUntilVoteDelay = configVoteSites.getWaitUntilVoteDelay(key);
+		timeOffSet = configVoteSites.getTimeOffSet(key);
 	}
 
 	public boolean isVaidServiceSite() {

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Signs/SignHandler.java

@@ -11,6 +11,7 @@ import org.bukkit.block.Sign;
 import org.bukkit.block.Skull;
 import org.bukkit.block.data.Directional;
 
+import com.Ben12345rocks.AdvancedCore.NMSManager.NMSManager;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -259,19 +260,21 @@ public class SignHandler {
 	}
 
 	public void updateSkulls(Location loc1, Location loc2) {
-		BlockState state = getLocation().getBlock().getState();
-		if (state instanceof Sign && state.getBlockData() instanceof Directional) {
-			Directional s = (Directional) state.getBlockData();
-			Block b = location.getBlock().getRelative(s.getFacing());
-			Block above = b.getRelative(BlockFace.UP);
-			if (checkSkull(above)) {
-				return;
+		if (!NMSManager.getInstance().isVersion("1.12")) {
+			BlockState state = getLocation().getBlock().getState();
+			if (state instanceof Sign && state.getBlockData() instanceof Directional) {
+				Directional s = (Directional) state.getBlockData();
+				Block b = location.getBlock().getRelative(s.getFacing());
+				Block above = b.getRelative(BlockFace.UP);
+				if (checkSkull(above)) {
+					return;
+				}
+
 			}
 
-		}
-
-		for (Block block : MiscUtils.getInstance().getRegionBlocks(location.getWorld(), loc1, loc2)) {
-			checkSkull(block);
+			for (Block block : MiscUtils.getInstance().getRegionBlocks(location.getWorld(), loc1, loc2)) {
+				checkSkull(block);
+			}
 		}
 	}
 }

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Signs/Signs.java

@@ -90,7 +90,8 @@ public class Signs {
 		int time = 0;
 		for (int i = plugin.getSigns().size() - 1; i >= 0; i--) {
 			if (!plugin.getSigns().get(i).isValid()) {
-				plugin.debug("Sign " + i + " invalid, removing from data.");
+				plugin.debug("Sign " + i + " invalid, removing from data: "
+						+ plugin.getSigns().get(i).getLocation().toString());
 				plugin.getSigns().get(i).removeSign();
 				plugin.getSigns().remove(i);
 			} else {

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/TopVoter/TopVoterHandler.java

@@ -125,106 +125,138 @@ public class TopVoterHandler implements Listener {
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onDayChange(DayChangeEvent event) {
-		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (!user.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
-				if (user.getDayVoteStreak() != 0) {
-					user.setDayVoteStreak(0);
+		synchronized (Main.plugin) {
+			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				if (!user.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
+					if (user.getDayVoteStreak() != 0) {
+						user.setDayVoteStreak(0);
+					}
+				}
+
+				if (user.getHighestDailyTotal() < user.getTotal(TopVoter.Daily)) {
+					user.setHighestDailyTotal(user.getTotal(TopVoter.Daily));
+				}
+				for (String shopIdent : Config.getInstance().getIdentifiers()) {
+					if (Config.getInstance().getVoteShopResetDaily(shopIdent)) {
+						user.setVoteShopIdentifierLimit(shopIdent, 0);
+					}
 				}
 			}
 
-			if (user.getHighestDailyTotal() < user.getTotal(TopVoter.Daily)) {
-				user.setHighestDailyTotal(user.getTotal(TopVoter.Daily));
+			if (Config.getInstance().getStoreTopVotersDaily()) {
+				plugin.getLogger().info("Saving TopVoters Daily");
+				storeTopVoters(TopVoter.Daily);
 			}
-		}
 
-		if (Config.getInstance().getStoreTopVotersDaily()) {
-			plugin.getLogger().info("Saving TopVoters Daily");
-			storeTopVoters(TopVoter.Daily);
-		}
-
-		if (Config.getInstance().isEnableDailyRewards()) {
-			HashMap<Integer, String> places = handlePlaces(Config.getInstance().getDailyPossibleRewardPlaces());
-			int i = 0;
-			int lastTotal = -1;
-			for (User user : plugin.getTopVoter(TopVoter.Daily).keySet()) {
-				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					if (Config.getInstance().getTopVoterAwardsTies()) {
-						if (user.getTotal(TopVoter.Daily) != lastTotal) {
-							i++;
+			try {
+				if (Config.getInstance().isEnableDailyRewards()) {
+					HashMap<Integer, String> places = handlePlaces(Config.getInstance().getDailyPossibleRewardPlaces());
+					int i = 0;
+					int lastTotal = -1;
+					@SuppressWarnings("unchecked")
+					LinkedHashMap<User, Integer> clone = (LinkedHashMap<User, Integer>) plugin
+							.getTopVoter(TopVoter.Daily).clone();
+					for (User user : clone.keySet()) {
+						if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
+							if (Config.getInstance().getTopVoterAwardsTies()) {
+								if (user.getTotal(TopVoter.Daily) != lastTotal) {
+									i++;
+								}
+							} else {
+								i++;
+							}
+							if (places.containsKey(i)) {
+								user.giveDailyTopVoterAward(i, places.get(i));
+							}
 						}
-					} else {
-						i++;
-					}
-					if (places.containsKey(i)) {
-						user.giveDailyTopVoterAward(i, places.get(i));
+						lastTotal = user.getTotal(TopVoter.Daily);
 					}
 				}
-				lastTotal = user.getTotal(TopVoter.Daily);
+			} catch (Exception e) {
+				e.printStackTrace();
 			}
-		}
-		resetTotals(TopVoter.Daily);
 
+			resetTotals(TopVoter.Daily);
+		}
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onMonthChange(MonthChangeEvent event) {
-		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getTotal(TopVoter.Monthly) == 0 && user.getMonthVoteStreak() != 0) {
-				user.setMonthVoteStreak(0);
-			} else {
-				if (!Config.getInstance().isVoteStreakRequirementUsePercentage() || user.hasPercentageTotal(
-						TopVoter.Monthly, Config.getInstance().getVoteStreakRequirementMonth(),
-						LocalDateTime.now().minusDays(1))) {
-					user.addMonthVoteStreak();
-					SpecialRewards.getInstance().checkVoteStreak(user, "Month");
-				}
-			}
-
-			user.setLastMonthTotal(user.getTotal(TopVoter.Monthly));
-
-			if (user.getHighestMonthlyTotal() < user.getTotal(TopVoter.Monthly)) {
-				user.setHighestMonthlyTotal(user.getTotal(TopVoter.Monthly));
-			}
-		}
-
-		if (Config.getInstance().getStoreTopVotersMonthly()) {
-			plugin.getLogger().info("Saving TopVoters Monthly");
-			storeTopVoters(TopVoter.Monthly);
-		}
-
-		if (Config.getInstance().isEnableMonthlyAwards()) {
-			HashMap<Integer, String> places = handlePlaces(Config.getInstance().getMonthlyPossibleRewardPlaces());
-			int i = 0;
-			int lastTotal = -1;
-			for (User user : plugin.getTopVoter(TopVoter.Monthly).keySet()) {
-
-				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					if (Config.getInstance().getTopVoterAwardsTies()) {
-						if (user.getTotal(TopVoter.Monthly) != lastTotal) {
-							i++;
-						}
-					} else {
-						i++;
-					}
-					if (places.containsKey(i)) {
-						user.giveMonthlyTopVoterAward(i, places.get(i));
-					}
-				}
-				lastTotal = user.getTotal(TopVoter.Monthly);
-			}
-		}
-
-		resetTotals(TopVoter.Monthly);
-
-		if (Config.getInstance().getResetMilestonesMonthly()) {
+		synchronized (Main.plugin) {
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				user.setMilestoneCount(0);
-				user.setHasGottenMilestone(new HashMap<String, Boolean>());
+				if (user.getTotal(TopVoter.Monthly) == 0 && user.getMonthVoteStreak() != 0) {
+					user.setMonthVoteStreak(0);
+				} else {
+					if (!Config.getInstance().isVoteStreakRequirementUsePercentage() || user.hasPercentageTotal(
+							TopVoter.Monthly, Config.getInstance().getVoteStreakRequirementMonth(),
+							LocalDateTime.now().minusDays(1))) {
+						user.addMonthVoteStreak();
+						SpecialRewards.getInstance().checkVoteStreak(user, "Month");
+					}
+				}
+
+				for (String shopIdent : Config.getInstance().getIdentifiers()) {
+					if (Config.getInstance().getVoteShopResetMonthly(shopIdent)) {
+						user.setVoteShopIdentifierLimit(shopIdent, 0);
+					}
+				}
+
+				user.setLastMonthTotal(user.getTotal(TopVoter.Monthly));
+
+				if (user.getHighestMonthlyTotal() < user.getTotal(TopVoter.Monthly)) {
+					user.setHighestMonthlyTotal(user.getTotal(TopVoter.Monthly));
+				}
 			}
 
+			if (Config.getInstance().getStoreTopVotersMonthly()) {
+				plugin.getLogger().info("Saving TopVoters Monthly");
+				storeTopVoters(TopVoter.Monthly);
+			}
+
+			try {
+				if (Config.getInstance().isEnableMonthlyAwards()) {
+					HashMap<Integer, String> places = handlePlaces(
+							Config.getInstance().getMonthlyPossibleRewardPlaces());
+					int i = 0;
+					int lastTotal = -1;
+
+					@SuppressWarnings("unchecked")
+					LinkedHashMap<User, Integer> clone = (LinkedHashMap<User, Integer>) plugin
+							.getTopVoter(TopVoter.Monthly).clone();
+					for (User user : clone.keySet()) {
+
+						if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
+							if (Config.getInstance().getTopVoterAwardsTies()) {
+								if (user.getTotal(TopVoter.Monthly) != lastTotal) {
+									i++;
+								}
+							} else {
+								i++;
+							}
+							if (places.containsKey(i)) {
+								user.giveMonthlyTopVoterAward(i, places.get(i));
+							}
+						}
+						lastTotal = user.getTotal(TopVoter.Monthly);
+					}
+
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			resetTotals(TopVoter.Monthly);
+
+			if (Config.getInstance().getResetMilestonesMonthly()) {
+				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+					User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+					user.setMilestoneCount(0);
+					user.setHasGottenMilestone(new HashMap<String, Boolean>());
+				}
+
+			}
 		}
 	}
 
@@ -236,50 +268,65 @@ public class TopVoterHandler implements Listener {
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onWeekChange(WeekChangeEvent event) {
-		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getTotal(TopVoter.Weekly) == 0 && user.getWeekVoteStreak() != 0) {
-				user.setWeekVoteStreak(0);
-			} else {
-				if (!Config.getInstance().isVoteStreakRequirementUsePercentage() || user.hasPercentageTotal(
-						TopVoter.Weekly, Config.getInstance().getVoteStreakRequirementWeek(), null)) {
-					user.addWeekVoteStreak();
-					SpecialRewards.getInstance().checkVoteStreak(user, "Week");
+		synchronized (Main.plugin) {
+			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				if (user.getTotal(TopVoter.Weekly) == 0 && user.getWeekVoteStreak() != 0) {
+					user.setWeekVoteStreak(0);
+				} else {
+					if (!Config.getInstance().isVoteStreakRequirementUsePercentage() || user.hasPercentageTotal(
+							TopVoter.Weekly, Config.getInstance().getVoteStreakRequirementWeek(), null)) {
+						user.addWeekVoteStreak();
+						SpecialRewards.getInstance().checkVoteStreak(user, "Week");
+					}
+				}
+
+				for (String shopIdent : Config.getInstance().getIdentifiers()) {
+					if (Config.getInstance().getVoteShopResetWeekly(shopIdent)) {
+						user.setVoteShopIdentifierLimit(shopIdent, 0);
+					}
+				}
+
+				if (user.getHighestWeeklyTotal() < user.getTotal(TopVoter.Weekly)) {
+					user.setHighestWeeklyTotal(user.getTotal(TopVoter.Weekly));
 				}
 			}
 
-			if (user.getHighestWeeklyTotal() < user.getTotal(TopVoter.Weekly)) {
-				user.setHighestWeeklyTotal(user.getTotal(TopVoter.Weekly));
+			if (Config.getInstance().getStoreTopVotersWeekly()) {
+				plugin.getLogger().info("Saving TopVoters Weekly");
+				storeTopVoters(TopVoter.Weekly);
 			}
-		}
 
-		if (Config.getInstance().getStoreTopVotersWeekly()) {
-			plugin.getLogger().info("Saving TopVoters Weekly");
-			storeTopVoters(TopVoter.Weekly);
-		}
-
-		if (Config.getInstance().isEnableWeeklyAwards()) {
-			HashMap<Integer, String> places = handlePlaces(Config.getInstance().getWeeklyPossibleRewardPlaces());
-			int i = 0;
-			int lastTotal = -1;
-			for (User user : plugin.getTopVoter(TopVoter.Weekly).keySet()) {
-				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					if (Config.getInstance().getTopVoterAwardsTies()) {
-						if (user.getTotal(TopVoter.Weekly) != lastTotal) {
-							i++;
+			try {
+				if (Config.getInstance().isEnableWeeklyAwards()) {
+					HashMap<Integer, String> places = handlePlaces(
+							Config.getInstance().getWeeklyPossibleRewardPlaces());
+					int i = 0;
+					int lastTotal = -1;
+					@SuppressWarnings("unchecked")
+					LinkedHashMap<User, Integer> clone = (LinkedHashMap<User, Integer>) plugin
+							.getTopVoter(TopVoter.Weekly).clone();
+					for (User user : clone.keySet()) {
+						if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
+							if (Config.getInstance().getTopVoterAwardsTies()) {
+								if (user.getTotal(TopVoter.Weekly) != lastTotal) {
+									i++;
+								}
+							} else {
+								i++;
+							}
+							if (places.containsKey(i)) {
+								user.giveWeeklyTopVoterAward(i, places.get(i));
+							}
 						}
-					} else {
-						i++;
-					}
-					if (places.containsKey(i)) {
-						user.giveWeeklyTopVoterAward(i, places.get(i));
+						lastTotal = user.getTotal(TopVoter.Weekly);
 					}
 				}
-				lastTotal = user.getTotal(TopVoter.Weekly);
+			} catch (Exception e) {
+				e.printStackTrace();
 			}
+			resetTotals(TopVoter.Weekly);
 		}
-		resetTotals(TopVoter.Weekly);
-
 	}
 
 	public void register() {
@@ -602,6 +649,8 @@ public class TopVoterHandler implements Listener {
 			}
 		}
 
+		plugin.debug("Number of users to check top voter: " + users.size());
+
 		for (TopVoter top : TopVoter.values()) {
 			plugin.getTopVoter(top).clear();
 			if (Config.getInstance().getLoadTopVoter(top)) {

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Util/PlaceHolders/PlaceHolders.java

@@ -65,7 +65,9 @@ public class PlaceHolders {
 	}
 
 	public String getPlaceHolder(OfflinePlayer p, String identifier) {
-		identifier = StringParser.getInstance().replaceJavascript(p, identifier);
+		if (Config.getInstance().isUseJavascriptPlaceholders()) {
+			identifier = StringParser.getInstance().replaceJavascript(p, identifier);
+		}
 
 		for (PlaceHolder<User> placeholder : nonPlayerPlaceholders) {
 			if (placeholder.matches(identifier)) {
@@ -85,7 +87,9 @@ public class PlaceHolders {
 	}
 
 	public String getPlaceHolder(Player p, String identifier) {
-		identifier = StringParser.getInstance().replaceJavascript(p, identifier);
+		if (Config.getInstance().isUseJavascriptPlaceholders()) {
+			identifier = StringParser.getInstance().replaceJavascript(p, identifier);
+		}
 		return getPlaceHolder((OfflinePlayer) p, identifier);
 	}
 

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/Bungee.java

@@ -1,18 +1,44 @@
 package com.Ben12345rocks.VotingPlugin.bungee;
 
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+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.UUID;
+import java.util.concurrent.TimeUnit;
 
+import com.Ben12345rocks.AdvancedCore.UserStorage.sql.Column;
+import com.Ben12345rocks.AdvancedCore.UserStorage.sql.DataType;
 import com.Ben12345rocks.AdvancedCore.Util.Encryption.EncryptionHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Sockets.ClientHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketReceiver;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.vexsoftware.votifier.bungee.events.VotifierEvent;
 import com.vexsoftware.votifier.model.Vote;
 
 import lombok.Getter;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
+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.Plugin;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.event.EventHandler;
@@ -31,6 +57,119 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 
 	private EncryptionHandler encryptionHandler;
 
+	private BungeeMethod method;
+
+	private HashMap<String, ArrayList<OfflineBungeeVote>> cachedVotes = new HashMap<String, ArrayList<OfflineBungeeVote>>();
+
+	private HashMap<String, ArrayList<OfflineBungeeVote>> cachedOnlineVotes = new HashMap<String, ArrayList<OfflineBungeeVote>>();
+
+	private VoteCache voteCacheFile;
+
+	@EventHandler
+	public void onPluginMessage(PluginMessageEvent ev) {
+		if (!ev.getTag().equals("VotingPlugin:VotingPlugin".toLowerCase())) {
+			return;
+		}
+		ByteArrayInputStream instream = new ByteArrayInputStream(ev.getData());
+		DataInputStream in = new DataInputStream(instream);
+		try {
+			ByteArrayOutputStream outstream = new ByteArrayOutputStream();
+			DataOutputStream out = new DataOutputStream(outstream);
+			String subchannel = in.readUTF();
+			int size = in.readInt();
+			out.writeUTF(subchannel);
+			out.writeInt(size);
+			for (int i = 0; i < size; i++) {
+				out.writeUTF(in.readUTF());
+			}
+			for (String send : getProxy().getServers().keySet()) {
+				if (getProxy().getServers().get(send).getPlayers().size() > 0) {
+					getProxy().getServers().get(send).sendData("VotingPlugin:VotingPlugin".toLowerCase(),
+							outstream.toByteArray());
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void checkOnlineVotes(ProxiedPlayer player, String uuid) {
+		if (player != null && player.isConnected() && cachedOnlineVotes.containsKey(uuid)) {
+			ArrayList<OfflineBungeeVote> c = cachedOnlineVotes.get(uuid);
+			if (!c.isEmpty()) {
+				for (OfflineBungeeVote cache : c) {
+					sendPluginMessageServer(getProxy().getPlayer(UUID.fromString(uuid)).getServer().getInfo().getName(),
+							"VoteOnline", cache.getPlayerName(), cache.getUuid(), cache.getService(),
+							"" + cache.getTime(), Boolean.FALSE.toString());
+				}
+				cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
+			}
+		}
+	}
+
+	public void checkCachedVotes(String server) {
+		if (!getProxy().getServerInfo(server).getPlayers().isEmpty()) {
+			if (cachedVotes.containsKey(server)) {
+				ArrayList<OfflineBungeeVote> c = cachedVotes.get(server);
+				if (!c.isEmpty()) {
+					for (OfflineBungeeVote cache : c) {
+						sendPluginMessageServer(server, "Vote", cache.getPlayerName(), cache.getUuid(),
+								cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString());
+					}
+					cachedVotes.put(server, new ArrayList<OfflineBungeeVote>());
+				}
+			}
+		}
+	}
+
+	@EventHandler
+	public void onServerConnected(ServerConnectedEvent event) {
+		final String server = event.getServer().getInfo().getName();
+		getProxy().getScheduler().schedule(this, new Runnable() {
+
+			@Override
+			public void run() {
+				checkCachedVotes(server);
+			}
+
+		}, 2, TimeUnit.SECONDS);
+	}
+
+	@EventHandler
+	public void onPlayerJoin(PostLoginEvent event) {
+		final String uuid = event.getPlayer().getUniqueId().toString();
+		getProxy().getScheduler().schedule(this, new Runnable() {
+
+			@Override
+			public void run() {
+				checkOnlineVotes(event.getPlayer(), uuid);
+			}
+		}, 2, TimeUnit.SECONDS);
+
+	}
+
+	@Override
+	public void onDisable() {
+		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			for (Entry<String, ArrayList<OfflineBungeeVote>> entry : cachedVotes.entrySet()) {
+				String server = entry.getKey();
+				int num = 0;
+				for (OfflineBungeeVote voteData : entry.getValue()) {
+					voteCacheFile.addVote(server, num, voteData);
+					num++;
+				}
+			}
+			for (Entry<String, ArrayList<OfflineBungeeVote>> entry : cachedOnlineVotes.entrySet()) {
+				String name = entry.getKey();
+				int num = 0;
+				for (OfflineBungeeVote voteData : entry.getValue()) {
+					voteCacheFile.addVoteOnline(name, num, voteData);
+					num++;
+				}
+			}
+		}
+	}
+
 	@Override
 	public void onEnable() {
 		getProxy().getPluginManager().registerListener(this, this);
@@ -65,32 +204,108 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 		getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
 
 		getProxy().getPluginManager().registerCommand(this, new VotingPluginBungeeCommand(this));
-		encryptionHandler = new EncryptionHandler(new File(getDataFolder(), "secretkey.key"));
 
-		socketHandler = new SocketHandler(getDescription().getVersion(), config.getBungeeHost(), config.getBungeePort(),
-				encryptionHandler);
+		method = BungeeMethod.getByName(config.getBungeeMethod());
 
-		socketHandler.add(new SocketReceiver() {
+		if (method.equals(BungeeMethod.MYSQL)) {
+			this.getProxy().registerChannel("VotingPlugin:VotingPlugin".toLowerCase());
 
-			@Override
-			public void onReceive(String[] data) {
-				if (data.length > 2) {
-					if (data[0].equalsIgnoreCase("Broadcast")) {
-						sendServerMessage(data);
+		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			voteCacheFile = new VoteCache(this);
+			voteCacheFile.load();
+
+			try {
+				for (String server : voteCacheFile.getServers()) {
+					ArrayList<OfflineBungeeVote> vote = new ArrayList<OfflineBungeeVote>();
+					for (String num : voteCacheFile.getServerVotes(server)) {
+						Configuration data = voteCacheFile.getServerVotes(server, num);
+						vote.add(new OfflineBungeeVote(data.getString("Name"), data.getString("UUID"),
+								data.getString("Service"), data.getLong("Time")));
+					}
+					cachedVotes.put(server, vote);
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			try {
+				for (String player : voteCacheFile.getPlayers()) {
+					ArrayList<OfflineBungeeVote> vote = new ArrayList<OfflineBungeeVote>();
+					for (String num : voteCacheFile.getServerVotes(player)) {
+						Configuration data = voteCacheFile.getOnlineVotes(player, num);
+						vote.add(new OfflineBungeeVote(data.getString("Name"), data.getString("UUID"),
+								data.getString("Service"), data.getLong("Time")));
+					}
+					cachedOnlineVotes.put(player, vote);
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			voteCacheFile.clearData();
+
+			getProxy().getScheduler().runAsync(this, new Runnable() {
+
+				@Override
+				public void run() {
+					for (String server : cachedVotes.keySet()) {
+						checkCachedVotes(server);
+					}
+
+					for (String player : cachedOnlineVotes.keySet()) {
+						checkOnlineVotes(getProxy().getPlayer(UUID.fromString(player)), player);
 					}
 				}
-			}
-		});
+			});
 
-		clientHandles = new HashMap<String, ClientHandler>();
-		List<String> l = config.getBlockedServers();
-		for (String s : config.getSpigotServers()) {
-			if (!l.contains(s)) {
-				Configuration d = config.getSpigotServerConfiguration(s);
-				clientHandles.put(s,
-						new ClientHandler(d.getString("Host", ""), d.getInt("Port", 1298), encryptionHandler));
+			this.getProxy().registerChannel("VotingPlugin:VotingPlugin".toLowerCase());
+		} else if (method.equals(BungeeMethod.SOCKETS)) {
+			encryptionHandler = new EncryptionHandler(new File(getDataFolder(), "secretkey.key"));
+
+			socketHandler = new SocketHandler(getDescription().getVersion(), config.getBungeeHost(),
+					config.getBungeePort(), encryptionHandler, config.getDebug());
+
+			socketHandler.add(new SocketReceiver() {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 1) {
+						if (data.length > 2) {
+							if (data[0].equalsIgnoreCase("Broadcast")) {
+								sendServerMessage(data);
+							}
+						}
+					}
+
+				}
+			});
+
+			socketHandler.add(new SocketReceiver() {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 1) {
+						if (data[0].equalsIgnoreCase("StatusOkay")) {
+							String server = data[1];
+							getLogger().info("Voting communicaton okay with " + server);
+						}
+					}
+
+				}
+			});
+
+			clientHandles = new HashMap<String, ClientHandler>();
+			List<String> l = config.getBlockedServers();
+			for (String s : config.getSpigotServers()) {
+				if (!l.contains(s)) {
+					Configuration d = config.getSpigotServerConfiguration(s);
+					clientHandles.put(s, new ClientHandler(d.getString("Host", ""), d.getInt("Port", 1298),
+							encryptionHandler, config.getDebug()));
+				}
 			}
 		}
+
+		getLogger().info("VotingPlugin loaded, using method: " + method.toString());
 	}
 
 	public void reload() {
@@ -101,7 +316,158 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 	public void onVote(VotifierEvent event) {
 		Vote vote = event.getVote();
 		getLogger().info("Vote received " + vote.getUsername() + " from service site " + vote.getServiceName());
-		saveVote(vote.getUsername(), vote.getServiceName());
+
+		vote(vote.getUsername(), vote.getServiceName());
+
+	}
+
+	public void debug(String msg) {
+		if (config.getDebug()) {
+			getLogger().info("Debug: " + msg);
+		}
+	}
+
+	public void vote(String player, String service) {
+		if (method.equals(BungeeMethod.SOCKETS)) {
+			sendSocketVote(player, service);
+		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			String uuid = getUUID(player);
+			if (uuid.isEmpty()) {
+				UUID u = null;
+				try {
+					u = fetchUUID(player);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				if (u == null) {
+					debug("Failed to get uuid for " + player);
+					return;
+				}
+				uuid = u.toString();
+			}
+
+			player = getProperName(uuid, player);
+
+			if (!mysql.getUuids().contains(uuid)) {
+				mysql.update(uuid, "PlayerName", player, DataType.STRING);
+			}
+
+			// add totals here
+			ArrayList<Column> data = mysql.getExactQuery(new Column("uuid", uuid, DataType.STRING));
+			for (Column d : data) {
+				if (d.getName().equalsIgnoreCase("alltimetotal") || d.getName().equalsIgnoreCase("monthtotal")
+						|| d.getName().equalsIgnoreCase("weeklytotal") || d.getName().equalsIgnoreCase("dailytotal")
+						|| d.getName().equalsIgnoreCase("Points") || d.getName().equalsIgnoreCase("milestonecount")) {
+					Object value = d.getValue();
+					int num = 0;
+					if (value instanceof Integer) {
+						try {
+							num = (int) value;
+						} catch (ClassCastException | NullPointerException ex) {
+						}
+					} else if (value instanceof String) {
+						try {
+							num = Integer.parseInt((String) value);
+						} catch (Exception e) {
+						}
+					}
+					mysql.update(uuid, d.getName(), num + 1, DataType.STRING);
+
+					debug("Setting " + d.getName() + " to " + (num + 1));
+
+				}
+			}
+
+			long time = LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+
+			if (config.getSendVotesToAllServers()) {
+				for (String s : getProxy().getServers().keySet()) {
+					if (!config.getBlockedServers().contains(s)) {
+						ServerInfo info = getProxy().getServerInfo(s);
+						if (info.getPlayers().isEmpty()) {
+							// cache
+							if (!cachedVotes.containsKey(s)) {
+								cachedVotes.put(s, new ArrayList<OfflineBungeeVote>());
+							}
+							ArrayList<OfflineBungeeVote> list = cachedVotes.get(s);
+							list.add(new OfflineBungeeVote(player, uuid, service, time));
+							cachedVotes.put(s, list);
+
+							debug("Caching vote for " + player + " on " + service);
+
+						} else {
+							// send
+							sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
+									Boolean.TRUE.toString());
+						}
+					}
+				}
+			} else {
+				ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
+				if (p.isConnected()) {
+					sendPluginMessageServer(p.getServer().getInfo().getName(), "VoteOnline", player, uuid, service,
+							"" + time, Boolean.TRUE.toString());
+				} else {
+					if (!cachedOnlineVotes.containsKey(uuid)) {
+						cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
+					}
+					ArrayList<OfflineBungeeVote> list = cachedVotes.get(uuid);
+					list.add(new OfflineBungeeVote(player, uuid, service, time));
+					cachedOnlineVotes.put(uuid, list);
+					debug("Caching online vote for " + player + " on " + service);
+				}
+			}
+
+		}
+	}
+
+	public UUID fetchUUID(String playerName) throws Exception {
+		// Get response from Mojang API
+		URL url = new URL("https://api.mojang.com/users/profiles/minecraft/" + playerName);
+		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+		connection.connect();
+
+		if (connection.getResponseCode() == 400) {
+			System.err.println("There is no player with the name \"" + playerName + "\"!");
+			return null;
+		}
+
+		InputStream inputStream = connection.getInputStream();
+		BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+
+		// Parse JSON response and get UUID
+		JsonElement element = new JsonParser().parse(bufferedReader);
+		JsonObject object = element.getAsJsonObject();
+		String uuidAsString = object.get("id").getAsString();
+
+		// Return UUID
+		return parseUUIDFromString(uuidAsString);
+	}
+
+	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),
+				"0x" + uuidAsString.substring(20, 32) };
+
+		long mostSigBits = Long.decode(parts[0]).longValue();
+		mostSigBits <<= 16;
+		mostSigBits |= Long.decode(parts[1]).longValue();
+		mostSigBits <<= 16;
+		mostSigBits |= Long.decode(parts[2]).longValue();
+
+		long leastSigBits = Long.decode(parts[3]).longValue();
+		leastSigBits <<= 48;
+		leastSigBits |= Long.decode(parts[4]).longValue();
+
+		return new UUID(mostSigBits, leastSigBits);
+	}
+
+	public String getProperName(String uuid, String currentName) {
+		ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
+		if (p != null && p.isConnected()) {
+			return p.getName();
+		}
+		return currentName;
 	}
 
 	public String getUUID(String playerName) {
@@ -116,37 +482,35 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 		return "";
 	}
 
-	public void saveVote(String name, String service) {
+	public void sendSocketVote(String name, String service) {
 		String uuid = getUUID(name);
 
-		if (!uuid.isEmpty()) {
-			if (config.getSendVotesToAllServers()) {
-				// for (String send : getProxy().getServers().keySet()) {
-				// mysql.update(uuid, "Proxy_" + send, finalData, DataType.STRING);
-				// }
-				sendServerMessage("bungeevote", uuid, name, service);
-				if (config.getBroadcast()) {
-					sendServerMessage("BungeeBroadcast", service, uuid, name);
-				}
-			} else if (config.getSendToOnlineServer()) {
-				ProxiedPlayer p = getProxy().getPlayer(name);
-
-				String server = "";
-				if (p != null && p.isConnected()) {
-					server = p.getServer().getInfo().getName();
-				} else {
-					server = config.getFallBack();
-				}
-				if (config.getBlockedServers().contains(server)) {
-					server = config.getFallBack();
-				}
-				// mysql.update(uuid, "Proxy_Online", finalData, DataType.STRING);
-				sendServerMessageServer(server, "bungeevoteonline", uuid, name, service);
-				if (config.getBroadcast()) {
-					sendServerMessage("BungeeBroadcast", service, uuid, name);
-				}
+		if (config.getSendVotesToAllServers()) {
+			sendServerMessage("bungeevote", uuid, name, service);
+			if (config.getBroadcast()) {
+				sendServerMessage("BungeeBroadcast", service, uuid, name);
 			}
+		} else {
+			// online server only
+			ProxiedPlayer p = getProxy().getPlayer(name);
+
+			String server = "";
+			if (p != null && p.isConnected()) {
+				server = p.getServer().getInfo().getName();
+			} else {
+				server = config.getFallBack();
+			}
+			if (config.getBlockedServers().contains(server)) {
+				server = config.getFallBack();
+			}
+
+			sendServerMessageServer(server, "bungeevoteonline", uuid, name, service);
+			if (config.getBroadcast()) {
+				sendServerMessage("BungeeBroadcast", service, uuid, name);
+			}
+			sendServerMessage("BungeeUpdate");
 		}
+
 	}
 
 	public void sendServerMessage(String... messageData) {
@@ -161,4 +525,30 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 		}
 	}
 
+	public void sendPluginMessageServer(String server, String channel, String... messageData) {
+		ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
+		DataOutputStream out = new DataOutputStream(byteOutStream);
+		try {
+			out.writeUTF(channel);
+			out.writeInt(messageData.length);
+			for (String message : messageData) {
+				out.writeUTF(message);
+			}
+			if (getProxy().getServers().get(server).getPlayers().size() > 0) {
+				getProxy().getServers().get(server).sendData("VotingPlugin:VotingPlugin".toLowerCase(),
+						byteOutStream.toByteArray(), false);
+			}
+			out.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		debug("Sending plugin message " + server + " " + channel + " "
+				+ ArrayUtils.getInstance().makeStringList(ArrayUtils.getInstance().convert(messageData)));
+
+	}
+
+	public void status(CommandSender sender) {
+		sendServerMessage("status");
+	}
+
 }

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/BungeeMethod.java

@@ -0,0 +1,14 @@
+package com.Ben12345rocks.VotingPlugin.bungee;
+
+public enum BungeeMethod {
+	SOCKETS, PLUGINMESSAGING, MYSQL;
+
+	public static BungeeMethod getByName(String str) {
+		for (BungeeMethod method : values()) {
+			if (method.toString().equalsIgnoreCase(str)) {
+				return method;
+			}
+		}
+		return SOCKETS;
+	}
+}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/BungeeMySQL.java

@@ -1,6 +1,7 @@
 package com.Ben12345rocks.VotingPlugin.bungee;
 
 import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -47,6 +48,7 @@ public class BungeeMySQL {
 		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;
 		}
@@ -60,7 +62,7 @@ public class BungeeMySQL {
 			name = tablePrefix + tableName;
 		}
 		mysql = new com.Ben12345rocks.AdvancedCore.UserStorage.mysql.api.MySQL(maxThreads);
-		if (!mysql.connect(hostName, "" + port, user, pass, database, useSSL, lifeTime)) {
+		if (!mysql.connect(hostName, "" + port, user, pass, database, useSSL, lifeTime, str)) {
 
 		}
 		try {
@@ -131,33 +133,25 @@ public class BungeeMySQL {
 	public String getUUID(String playerName) {
 		String query = "SELECT uuid FROM " + getName() + " WHERE " + "PlayerName" + "='" + playerName + "';";
 		try {
-			Query sql = new Query(mysql, query);
+			ResultSet rs = null;
 
-			ResultSet rs = sql.executeQuery();
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement(query);
+
+			rs = sql.executeQuery();
+			/*
+			 * Query sql = new Query(mysql, query);
+			 * ResultSet rs = sql.executeQuery();
+			 */
 			rs.next();
 			String uuid = rs.getString("uuid");
 			if (uuid != null && !uuid.isEmpty()) {
+				sql.close();
+				conn.close();
 				return uuid;
 			}
-		} catch (SQLException e) {
-			e.printStackTrace();
-		} catch (ArrayIndexOutOfBoundsException e) {
-		}
-		return null;
-	}
-
-	public String getProxyVotes(String uuid, String server) {
-		checkColumn("Proxy_" + server, DataType.STRING);
-		String query = "SELECT Proxy_" + server + " FROM " + getName() + " WHERE " + "uuid" + "='" + uuid + "';";
-		try {
-			Query sql = new Query(mysql, query);
-
-			ResultSet rs = sql.executeQuery();
-			rs.next();
-			String str = rs.getString("Proxy_" + server);
-			if (str != null && !str.isEmpty()) {
-				return str;
-			}
+			sql.close();
+			conn.close();
 		} catch (SQLException e) {
 			e.printStackTrace();
 		} catch (ArrayIndexOutOfBoundsException e) {
@@ -191,17 +185,27 @@ public class BungeeMySQL {
 	}
 
 	public boolean containsKeyQuery(String index) {
-		String sql = "SELECT uuid FROM " + getName() + ";";
+		String sqlStr = "SELECT uuid FROM " + getName() + ";";
 		try {
-			Query query = new Query(mysql, sql);
+			ResultSet rs = null;
 
-			ResultSet rs = query.executeQuery();
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement(sqlStr);
+
+			rs = sql.executeQuery();
+			/*
+			 * Query query = new Query(mysql, sql);
+			 * ResultSet rs = query.executeQuery();
+			 */
 			while (rs.next()) {
 				if (rs.getString("uuid").equals(index)) {
+					sql.close();
+					conn.close();
 					return true;
 				}
 			}
-
+			sql.close();
+			conn.close();
 		} catch (SQLException ex) {
 			ex.printStackTrace();
 		}
@@ -218,9 +222,16 @@ public class BungeeMySQL {
 	public ArrayList<String> getColumnsQueury() {
 		ArrayList<String> columns = new ArrayList<String>();
 		try {
-			Query query = new Query(mysql, "SELECT * FROM " + getName() + ";");
+			ResultSet rs = null;
 
-			ResultSet rs = query.executeQuery();
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement("SELECT * FROM " + getName() + ";");
+
+			rs = sql.executeQuery();
+			/*
+			 * Query query = new Query(mysql, "SELECT * FROM " + getName() + ";");
+			 * ResultSet rs = query.executeQuery();
+			 */
 
 			ResultSetMetaData metadata = rs.getMetaData();
 			int columnCount = 0;
@@ -231,10 +242,13 @@ public class BungeeMySQL {
 					String columnName = metadata.getColumnName(i);
 					columns.add(columnName);
 				}
+				sql.close();
+				conn.close();
 				return columns;
 			}
-
-		} catch (SQLException e) {
+			sql.close();
+			conn.close();
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
 		return columns;
@@ -243,29 +257,40 @@ public class BungeeMySQL {
 
 	public ArrayList<Column> getExactQuery(Column column) {
 		ArrayList<Column> result = new ArrayList<>();
-		String query = "SELECT * FROM " + getName() + " WHERE `" + column.getName() + "`=?" + ";";
+		String query = "SELECT * FROM " + getName() + " WHERE `" + column.getName() + "`='"
+				+ column.getValue().toString() + "';";
 
 		try {
-			Query sql = new Query(mysql, query);
+			ResultSet rs = null;
 
-			sql.setParameter(1, column.getValue().toString());
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement(query);
 
-			ResultSet rs = sql.executeQuery();
-			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);
+			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);
 				}
-				// System.out.println(i + " " +
-				// rs.getMetaData().getColumnLabel(i));
-				rCol.setValue(rs.getString(i));
-				// System.out.println(rCol.getValue());
-				result.add(rCol);
 			}
+			sql.close();
+			conn.close();
 			return result;
 		} catch (SQLException e) {
 			e.printStackTrace();
@@ -298,16 +323,26 @@ public class BungeeMySQL {
 
 	public ArrayList<Column> getRowsNameQuery() {
 		ArrayList<Column> result = new ArrayList<Column>();
-		String sql = "SELECT PlayerName FROM " + getName() + ";";
+		String sqlStr = "SELECT PlayerName FROM " + getName() + ";";
 
 		try {
-			Query query = new Query(mysql, sql);
-			ResultSet rs = query.executeQuery();
+			ResultSet rs = null;
+
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement(sqlStr);
+
+			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) {
 		}
 
@@ -316,16 +351,26 @@ public class BungeeMySQL {
 
 	public ArrayList<Column> getRowsQuery() {
 		ArrayList<Column> result = new ArrayList<Column>();
-		String sql = "SELECT uuid FROM " + getName() + ";";
+		String sqlStr = "SELECT uuid FROM " + getName() + ";";
 
 		try {
-			Query query = new Query(mysql, sql);
-			ResultSet rs = query.executeQuery();
+			ResultSet rs = null;
+
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement(sqlStr);
+
+			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);
 			}
+			sql.close();
+			conn.close();
 		} catch (SQLException e) {
 			return null;
 		}
@@ -419,4 +464,4 @@ public class BungeeMySQL {
 		}
 
 	}
-}
+}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/Config.java

@@ -59,6 +59,10 @@ public class Config {
 		return getData().getBoolean("SendToOnlineServer");
 	}
 
+	public String getBungeeMethod() {
+		return getData().getString("BungeeMethod", "SOCKETS");
+	}
+
 	public String getBungeeHost() {
 		return getData().getString("BungeeServer.Host", "");
 	}
@@ -79,6 +83,10 @@ public class Config {
 		return getData().getBoolean("Broadcast", false);
 	}
 
+	public boolean getDebug() {
+		return getData().getBoolean("Debug", false);
+	}
+
 	public String getFallBack() {
 		return getData().getString("FallBackServer", "");
 	}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/OfflineBungeeVote.java

@@ -0,0 +1,23 @@
+package com.Ben12345rocks.VotingPlugin.bungee;
+
+import lombok.Getter;
+
+public class OfflineBungeeVote {
+
+	@Getter
+	private String playerName;
+	@Getter
+	private String uuid;
+	@Getter
+	private String service;
+	@Getter
+	private long time;
+
+	public OfflineBungeeVote(String playerName, String uuid, String service, long time) {
+		this.playerName = playerName;
+		this.uuid = uuid;
+		this.service = service;
+		this.time = time;
+	}
+
+}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/VoteCache.java

@@ -0,0 +1,99 @@
+package com.Ben12345rocks.VotingPlugin.bungee;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+
+import lombok.Getter;
+import net.md_5.bungee.config.Configuration;
+import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.config.YamlConfiguration;
+
+public class VoteCache {
+	private Bungee bungee;
+	@Getter
+	private Configuration data;
+
+	public VoteCache(Bungee bungee) {
+		this.bungee = bungee;
+	}
+
+	public void load() {
+		if (!bungee.getDataFolder().exists())
+			bungee.getDataFolder().mkdir();
+
+		File file = new File(bungee.getDataFolder(), "votecache.yml");
+
+		if (!file.exists()) {
+			try {
+				file.createNewFile();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		try {
+			data = ConfigurationProvider.getProvider(YamlConfiguration.class)
+					.load(new File(bungee.getDataFolder(), "votecache.yml"));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void save() {
+		try {
+			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
+					new File(bungee.getDataFolder(), "votecache.yml"));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public Collection<String> getServers() {
+		return getData().getSection("VoteCache").getKeys();
+	}
+
+	public Collection<String> getPlayers() {
+		return getData().getSection("OnlineCache").getKeys();
+	}
+
+	public Configuration getServerVotes(String server, String num) {
+		return getData().getSection("VoteCache." + server + "." + num);
+	}
+
+	public Configuration getOnlineVotes(String name, String num) {
+		return getData().getSection("OnlineCache." + name + "." + num);
+	}
+
+	public Collection<String> getServerVotes(String server) {
+		return getData().getSection("VoteCache." + server).getKeys();
+	}
+
+	public Collection<String> getOnlineVotes(String name) {
+		return getData().getSection("OnlineCache." + name).getKeys();
+	}
+
+	public void addVote(String server, int num, OfflineBungeeVote voteData) {
+		Configuration section = getData().getSection("VoteCache." + server + "." + num);
+		section.set("Name", voteData.getPlayerName());
+		section.set("Service", voteData.getService());
+		section.set("UUID", voteData.getUuid());
+		section.set("Time", voteData.getTime());
+		save();
+	}
+
+	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
+		Configuration section = getData().getSection("OnlineCache." + player + "." + num);
+		section.set("Name", voteData.getPlayerName());
+		section.set("Service", voteData.getService());
+		section.set("UUID", voteData.getUuid());
+		section.set("Time", voteData.getTime());
+		save();
+	}
+
+	public void clearData() {
+		getData().set("VoteCache", null);
+		getData().set("OnlineCache", null);
+		save();
+	}
+
+}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/VotingPluginBungeeCommand.java

@@ -24,10 +24,21 @@ public class VotingPluginBungeeCommand extends Command {
 					if (args.length >= 2) {
 						String user = args[1];
 						String site = args[2];
-						bungee.saveVote(user, site);
+						bungee.vote(user, site);
 						sender.sendMessage(new TextComponent("Sending vote"));
 					}
 				}
+				if (args[0].equalsIgnoreCase("status")) {
+					sender.sendMessage(new TextComponent("Checking status, waiting for response, check console, only for socket method"));
+					bungee.status(sender);
+				}
+				if (args[0].equalsIgnoreCase("help")) {
+					TextComponent[] msg = new TextComponent[3];
+					msg[0] = new TextComponent("&avotingpluginbungee reload - Reload plugin");
+					msg[1] = new TextComponent("&avotingpluginbungee vote (player) (servicesite) - Send bungee vote");
+					msg[2] = new TextComponent("&avotingplugin status - Check socket connection status");
+					sender.sendMessage(msg);
+				}
 			}
 		} else {
 			sender.sendMessage(new TextComponent("You do not have permission to do this!"));