Update version number to 6.11.2

VotingPlugin/Resources/Config.yml

@@ -379,6 +379,10 @@ StoreTopVoters:
 # Requires restart
 PerSiteCoolDownEvents: false
 
+# Queue votes during a time change (doesn't apply to bungee voting)
+# Votes will be given when time change is completed
+QueueVotesDuringTimeChange: false
+
 # If true vanished players are treated as if they are offline
 TreatVanishAsOffline: false
 

VotingPlugin/Resources/VoteSites.yml

@@ -2,6 +2,7 @@ VoteSites:
   # VoteSite key
   # Used for saving data for votesites
   # Use a short name if you can
+  # No spaces or dots
   ExampleVoteSite:
     # Enable voteSite
     # If false, votesite will not be loaded by plugin

VotingPlugin/Resources/bungeeconfig.yml

@@ -73,6 +73,11 @@ SendVotesToAllServers: true
 BlockedServers:
 - hub
 
+
+# Similar to BlockServers
+# If a server is listed then blockedservers is ignored
+WhiteListedServers: []
+
 # What type of bungee setup
 # Requires restart and set on all servers
 # https://github.com/BenCodez/VotingPlugin/wiki/Bungeecoord-Setups
@@ -133,34 +138,34 @@ VoteParty:
 # Votes will be forwarded when specific player is online
 WaitForUserOnline: false
 
-# ----------------------------
-# SOCKET Settings
-# ONLY for SOCKET method
-# ----------------------------
-# Options available here:
-# https://github.com/BenCodez/VotingPlugin/wiki/Bungee-Setup-SOCKETS
-
 
 # ----------------------------
-# Redis setup
+# Redis/multi proxy setup
 # Experimental
-# Primary server for redis needs votifier
-# Set socket host on each proxy and redissockets on primary redis only
-# All servers on pluginmessaging
+# Primary server  needs votifier and config option enabled
+# Set socket host on each proxy and primary server set sub proxies
+# All servers should be on pluginmessaging or sockets setup
 # ----------------------------
 
 # Support for redis
 # experimental
-RedisSupport: false
+MultiProxySupport: false
 
-# Enable on primary server with votifier
+# Enable on primary proxy server with votifier
 PrimaryServer: false
 
-RedisSocketHost:
+# If enabled, player will only get 1 reward on a server on the network
+# Must be enabled on all proxies for this to work
+# Must also disable sendtoallservers
+MultiProxyOneGlobalReward: false
+
+# Set this for each proxy
+MultiProxySocketHost:
   Host: 0.0.0.0
   Port: 1234
 
-RedisServers:
+# Set other sub proxies here
+MultiProxyServers:
   secondproxy:
     Host: 0.0.0.0
     Port: 1235

VotingPlugin/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>votingplugin</artifactId>
-	<version>6.11</version>
+	<version>6.11.2</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>

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

@@ -315,18 +315,30 @@ public class BungeeHandler implements Listener {
 						if (args.size() > 10) {
 							num = Integer.valueOf(args.get(10));
 						}
+						int numberOfVotes = 1;
+						if (args.size() > 11) {
+							numberOfVotes = Integer.valueOf(args.get(11));
+						}
 
 						if (!bungeeBroadcast) {
 							if (!plugin.getBungeeSettings().isBungeeBroadcast()
 									&& !plugin.getBungeeSettings().isDisableBroadcast()) {
 								if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-									VoteSite site = plugin.getVoteSite(service, true);
-									if (site != null) {
-										site.broadcastVote(user, false);
-										broadcast = false;
+									if (plugin.getConfigFile().isFormatOnlyOneOfflineBroadcast() && !wasOnline) {
+										if (num == 1) {
+											user.offlineBroadcast(user, plugin.getBungeeSettings().isUseBungeecoord(),
+													numberOfVotes);
+										}
 									} else {
-										plugin.getLogger().warning("No votesite for " + service);
+										VoteSite site = plugin.getVoteSite(service, true);
+										if (site != null) {
+											site.broadcastVote(user, false);
+											broadcast = false;
+										} else {
+											plugin.getLogger().warning("No votesite for " + service);
+										}
 									}
+
 								}
 							}
 						} else {
@@ -395,18 +407,30 @@ public class BungeeHandler implements Listener {
 							num = Integer.valueOf(args.get(10));
 						}
 
+						int numberOfVotes = 1;
+						if (args.size() > 11) {
+							numberOfVotes = Integer.valueOf(args.get(11));
+						}
+
 						if (!bungeeBroadcast) {
 							if (!plugin.getBungeeSettings().isBungeeBroadcast()
 									&& !plugin.getBungeeSettings().isDisableBroadcast()) {
-								if (Boolean.valueOf(args.get(4))
-										|| plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-									VoteSite site = plugin.getVoteSite(service, true);
-									if (site != null) {
-										site.broadcastVote(user, false);
-										broadcast = false;
+								if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
+									if (plugin.getConfigFile().isFormatOnlyOneOfflineBroadcast() && !wasOnline) {
+										if (num == 1) {
+											user.offlineBroadcast(user, plugin.getBungeeSettings().isUseBungeecoord(),
+													numberOfVotes);
+										}
 									} else {
-										plugin.getLogger().warning("No votesite for " + service);
+										VoteSite site = plugin.getVoteSite(service, true);
+										if (site != null) {
+											site.broadcastVote(user, false);
+											broadcast = false;
+										} else {
+											plugin.getLogger().warning("No votesite for " + service);
+										}
 									}
+
 								}
 							}
 						} else {

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

@@ -211,7 +211,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	private boolean ymlError = false;
 
 	@Getter
-	private ScheduledExecutorService voteTimer = Executors.newScheduledThreadPool(1);
+	private ScheduledExecutorService voteTimer;
 
 	@Getter
 	private UserManager votingPluginUserManager;
@@ -1001,6 +1001,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		new VotingPluginMetrics().load(plugin);
 	}
 
+	private void loadVoteTimer() {
+		voteTimer = Executors.newSingleThreadScheduledExecutor();
+	}
+
 	@Getter
 	private TimeQueueHandler timeQueueHandler;
 
@@ -1008,6 +1012,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	public void onPostLoad() {
 		loadVersionFile();
 		getOptions().setServer(bungeeSettings.getServer());
+
+		loadVoteTimer();
+
 		if (bungeeSettings.isUseBungeecoord()) {
 			bungeeHandler = new BungeeHandler(this);
 			bungeeHandler.load();
@@ -1254,6 +1261,13 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 				debug(e);
 			}
 		}
+		voteTimer.shutdown();
+		try {
+			voteTimer.awaitTermination(10, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		voteTimer.shutdownNow();
 		if (timeQueueHandler != null) {
 			timeQueueHandler.save();
 		}
@@ -1344,8 +1358,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	}
 
 	private void reloadPlugin(boolean userStorage) {
-		setUpdate(true);
-
 		configFile.reloadData();
 		configFile.loadValues();
 
@@ -1377,14 +1389,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		voteReminding.loadRemindChecking();
 		coolDownCheck.checkEnabled();
-
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				update();
-			}
-		});
+		setUpdate(true);
 	}
 
 	private void setupFiles() {
@@ -1486,7 +1491,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 												voteToday.put(user.getTopVoterPlayer(), times);
 											}
 										}
-										if (!extraBackgroundUpdate) {
+										if (extraBackgroundUpdate) {
 											if (user.isOnline()) {
 												user.offVote();
 											}
@@ -1518,13 +1523,15 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 								tempTopVoter = null;
 
+								checkFirstTimeLoaded();
+
 								time1 = ((System.currentTimeMillis() - time1) / 1000);
 								long totalTime = ((System.currentTimeMillis() - startTime) / 1000);
 								plugin.debug("Background task finished. Final processing took " + time1
 										+ " seconds. Total time: " + totalTime + " seconds");
+								plugin.getUserManager().getDataManager().clearNonNeededCachedUsers();
 								plugin.extraDebug("Current cached users: "
 										+ plugin.getUserManager().getDataManager().getUserDataCache().keySet().size());
-								checkFirstTimeLoaded();
 							} catch (Exception ex) {
 								if (plugin != null) {
 									plugin.getLogger().info("Looks like something went wrong");
@@ -1544,6 +1551,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	public void checkFirstTimeLoaded() {
 		if (!firstTimeLoaded) {
+
 			if (getGui().isChestVoteTopUseSkull()) {
 				int maxToLoad = 200;
 				for (TopVoter top : topVoter.keySet()) {

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

@@ -29,6 +29,10 @@ public class Config {
 		return getData().getStringList("BlockedServers");
 	}
 
+	public List<String> getWhiteListedServers() {
+		return getData().getStringList("WhiteListedServers");
+	}
+
 	public boolean getBroadcast() {
 		return getData().getBoolean("Broadcast", false);
 	}
@@ -53,10 +57,6 @@ public class Config {
 		return getData().getBoolean("GlobalData.UseMainMySQL", true);
 	}
 
-	public boolean getRedisSupport() {
-		return getData().getBoolean("RedisSupport", false);
-	}
-
 	public String getBungeeHost() {
 		return getData().getString("BungeeServer.Host", "");
 	}
@@ -73,18 +73,38 @@ public class Config {
 		return getData().getInt("BungeeServer.Port", 1297);
 	}
 
-	public int getRedisSocketHostPort() {
-		return getData().getInt("RedisSocketHost.Port", 1297);
-	}
-
-	public String getRedisSocketHostHost() {
-		return getData().getString("RedisSocketHost.Host", "");
-	}
-
 	public boolean getDebug() {
 		return getData().getBoolean("Debug", false);
 	}
 
+	public boolean getMultiProxySupport() {
+		return getData().getBoolean("MultiProxySupport", false);
+	}
+
+	public int getMultiProxySocketHostPort() {
+		return getData().getInt("MultiProxySocketHost.Port", 1297);
+	}
+
+	public String getMultiProxySocketHostHost() {
+		return getData().getString("MultiProxySocketHost.Host", "");
+	}
+
+	public boolean getMultiProxyOneGlobalReward() {
+		return getData().getBoolean("MultiProxyOneGlobalReward", false);
+	}
+
+	public Configuration getMultiProxyServersConfiguration(String s) {
+		return getData().getSection("MultiProxyServers." + s);
+	}
+
+	public Collection<String> getMultiProxyServers() {
+		return getData().getSection("MultiProxyServers").getKeys();
+	}
+
+	public boolean getPrimaryServer() {
+		return getData().getBoolean("PrimaryServer", false);
+	}
+
 	public String getFallBack() {
 		return getData().getString("FallBackServer", "");
 	}
@@ -101,14 +121,6 @@ public class Config {
 		return getData().getSection("SpigotServers." + s);
 	}
 
-	public Configuration getRedisServersConfiguration(String s) {
-		return getData().getSection("RedisServers." + s);
-	}
-
-	public Collection<String> getRedisServers() {
-		return getData().getSection("RedisServers").getKeys();
-	}
-
 	public Collection<String> getSpigotServers() {
 		return getData().getSection("SpigotServers").getKeys();
 	}
@@ -117,10 +129,6 @@ public class Config {
 		return getData().getBoolean("WaitForUserOnline", false);
 	}
 
-	public boolean getPrimaryServer() {
-		return getData().getBoolean("PrimaryServer", false);
-	}
-
 	public boolean getVotePartyEnabled() {
 		return getData().getBoolean("VoteParty.Enabled", false);
 	}

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

@@ -1,49 +0,0 @@
-package com.bencodez.votingplugin.bungee;
-
-import com.imaginarycode.minecraft.redisbungee.RedisBungeeAPI;
-import com.imaginarycode.minecraft.redisbungee.events.PlayerChangedServerNetworkEvent;
-import com.imaginarycode.minecraft.redisbungee.events.PlayerJoinedNetworkEvent;
-
-import lombok.Getter;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.event.EventHandler;
-
-@Deprecated
-public class RedisBungee implements Listener {
-	@Getter
-	private boolean enabled;
-	private VotingPluginBungee plugin;
-
-	public RedisBungee(VotingPluginBungee plugin) {
-		this.plugin = plugin;
-		if (plugin.getConfig().getRedisSupport()) {
-			plugin.getProxy().getPluginManager().registerListener(plugin, this);
-			plugin.getLogger().info("Loaded expiremental redis support");
-			enabled = true;
-		} else {
-			enabled = false;
-		}
-	}
-
-	@EventHandler
-	public void playerJoinedNetworkEvent(PlayerJoinedNetworkEvent event) {
-		plugin.login(plugin.getProxy().getPlayer(event.getUuid()));
-	}
-
-	@EventHandler
-	public void playerChangedServerNetworkEventt(PlayerChangedServerNetworkEvent event) {
-		plugin.login(plugin.getProxy().getPlayer(event.getUuid()));
-	}
-
-	public boolean isOnline(ProxiedPlayer p) {
-		return RedisBungeeAPI.getRedisBungeeApi().isPlayerOnline(p.getUniqueId());
-	}
-
-	public void destroy() {
-		if (!enabled) {
-			return;
-		}
-		plugin.getProxy().getPluginManager().unregisterListener(this);
-	}
-}

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

@@ -19,9 +19,11 @@ import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Queue;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -74,7 +76,9 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 	private HashMap<String, ClientHandler> clientHandles;
 
-	private HashMap<String, ClientHandler> redisClientHandles;
+	private HashMap<String, ClientHandler> multiproxyClientHandles;
+
+	private SocketHandler multiproxySocketHandler;
 
 	@Getter
 	private Config config;
@@ -91,8 +95,6 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 	private SocketHandler socketHandler;
 
-	private SocketHandler redisSocketHandler;
-
 	private VoteCache voteCacheFile;
 
 	private boolean votifierEnabled = true;
@@ -115,11 +117,12 @@ public class VotingPluginBungee extends Plugin implements Listener {
 					ArrayList<OfflineBungeeVote> newSet = new ArrayList<OfflineBungeeVote>();
 					if (!c.isEmpty()) {
 						int num = 1;
+						int numberOfVotes = c.size();
 						for (OfflineBungeeVote cache : c) {
 							boolean toSend = true;
 							if (getConfig().getWaitForUserOnline()) {
 								ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(cache.getUuid()));
-								if (isOnline(p)) {
+								if (!isOnline(p)) {
 									toSend = false;
 								} else if (p != null && p.isConnected()
 										&& !p.getServer().getInfo().getName().equals(server)) {
@@ -133,7 +136,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 										"" + cache.isRealVote(), cache.getText(),
 										"" + getConfig().getBungeeManageTotals(),
 										"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(),
-										"" + num);
+										"" + num, "" + numberOfVotes);
 								num++;
 							} else {
 								debug("Not sending vote because user isn't on server " + server + ": "
@@ -158,14 +161,19 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				}
 				if (!config.getBlockedServers().contains(server)) {
 					int num = 1;
+					int numberOfVotes = c.size();
 					for (OfflineBungeeVote cache : c) {
 						sendPluginMessageServer(server, "VoteOnline", cache.getPlayerName(), cache.getUuid(),
 								cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
 								"" + cache.isRealVote(), cache.getText(), "" + getConfig().getBungeeManageTotals(),
-								"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "" + num);
+								"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "" + num,
+								"" + numberOfVotes);
 						num++;
 					}
 					cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
+					if (getConfig().getMultiProxySupport() && getConfig().getMultiProxyOneGlobalReward()) {
+						sendMultiProxyServerMessage("ClearVote", player.getName(), uuid);
+					}
 				}
 			}
 		}
@@ -288,10 +296,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		};
 
 		ArrayList<String> servers = new ArrayList<String>();
-		for (String s : getProxy().getServers().keySet()) {
-			if (!config.getBlockedServers().contains(s)) {
-				servers.add(s);
-			}
+		for (String s : getAvailableAllServers()) {
+			servers.add(s);
 		}
 
 		if (config.getGlobalDataEnabled()) {
@@ -321,6 +327,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 								debug2(text);
 							}
 						}, servers) {
+
 					@Override
 					public void onTimeChangedFinished(TimeType type) {
 						getMysql().wipeColumnData(TopVoter.of(type).getColumnName());
@@ -328,14 +335,12 @@ public class VotingPluginBungee extends Plugin implements Listener {
 						if (!config.getGlobalDataEnabled()) {
 							return;
 						}
-						for (String s : getProxy().getServers().keySet()) {
-							if (!config.getBlockedServers().contains(s)) {
-								getGlobalDataHandler().setBoolean(s, "ForceUpdate", true);
-								if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-									sendPluginMessageServer(s, "BungeeTimeChange", "");
-								} else if (method.equals(BungeeMethod.SOCKETS)) {
-									sendServerMessage(s, "BungeeTimeChange");
-								}
+						for (String s : getAvailableAllServers()) {
+							getGlobalDataHandler().setBoolean(s, "ForceUpdate", true);
+							if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+								sendPluginMessageServer(s, "BungeeTimeChange", "");
+							} else if (method.equals(BungeeMethod.SOCKETS)) {
+								sendServerMessage(s, "BungeeTimeChange");
 							}
 						}
 
@@ -374,6 +379,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 						debug2(text);
 					}
 				}, servers) {
+
 					@Override
 					public void onTimeChangedFinished(TimeType type) {
 						getMysql().wipeColumnData(TopVoter.of(type).getColumnName());
@@ -381,14 +387,12 @@ public class VotingPluginBungee extends Plugin implements Listener {
 						if (!config.getGlobalDataEnabled()) {
 							return;
 						}
-						for (String s : getProxy().getServers().keySet()) {
-							if (!config.getBlockedServers().contains(s)) {
-								getGlobalDataHandler().setBoolean(s, "ForceUpdate", true);
-								if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-									sendPluginMessageServer(s, "BungeeTimeChange", "");
-								} else if (method.equals(BungeeMethod.SOCKETS)) {
-									sendServerMessage(s, "BungeeTimeChange");
-								}
+						for (String s : getAvailableAllServers()) {
+							getGlobalDataHandler().setBoolean(s, "ForceUpdate", true);
+							if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+								sendPluginMessageServer(s, "BungeeTimeChange", "");
+							} else if (method.equals(BungeeMethod.SOCKETS)) {
+								sendServerMessage(s, "BungeeTimeChange");
 							}
 						}
 
@@ -525,16 +529,16 @@ public class VotingPluginBungee extends Plugin implements Listener {
 			Class.forName("com.vexsoftware.votifier.bungee.events.VotifierEvent");
 		} catch (ClassNotFoundException e) {
 			votifierEnabled = false;
-			getLogger().warning("Votifier event not found, not loading votifier event");
 		}
 		if (votifierEnabled) {
 			try {
 				voteEventBungee = new VoteEventBungee(this);
 				getProxy().getPluginManager().registerListener(this, voteEventBungee);
-				getProxy().getPluginManager().registerListener(this, this);
 			} catch (Exception e) {
+				votifierEnabled = false;
 			}
 		}
+		getProxy().getPluginManager().registerListener(this, this);
 
 		config = new Config(this);
 		config.load();
@@ -571,39 +575,37 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				if (!config.getGlobalDataEnabled()) {
 					return;
 				}
-				for (String s : getProxy().getServers().keySet()) {
-					if (!config.getBlockedServers().contains(s)) {
-						if (getGlobalDataHandler().getGlobalMysql().containsKey(s)) {
-							String lastOnlineStr = getGlobalDataHandler().getString(s, "LastOnline");
-							long lastOnline = 0;
-							try {
-								lastOnline = Long.valueOf(lastOnlineStr);
-							} catch (NumberFormatException e) {
-								e.printStackTrace();
-							}
-
-							if (LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli()
-									- lastOnline < 1000 * 60 * 60 * 12) {
-								// server has been online within the 12 hours
-								HashMap<String, DataValue> dataToSet = new HashMap<String, DataValue>();
-								dataToSet.put("LastUpdated", new DataValueString(
-										"" + LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli()));
-								dataToSet.put("FinishedProcessing", new DataValueBoolean(false));
-								dataToSet.put(type.toString(), new DataValueBoolean(true));
-								getGlobalDataHandler().setData(s, dataToSet);
-								if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-									sendPluginMessageServer(s, "BungeeTimeChange", "");
-								} else if (method.equals(BungeeMethod.SOCKETS)) {
-									sendServerMessage(s, "BungeeTimeChange");
-								}
-							} else {
-								getLogger().warning("Server " + s + " hasn't been online recently");
-							}
-						} else {
-							getLogger().warning("Server " + s + " global data handler disabled?");
+				for (String s : getAvailableAllServers()) {
+					if (getGlobalDataHandler().getGlobalMysql().containsKey(s)) {
+						String lastOnlineStr = getGlobalDataHandler().getString(s, "LastOnline");
+						long lastOnline = 0;
+						try {
+							lastOnline = Long.valueOf(lastOnlineStr);
+						} catch (NumberFormatException e) {
+							e.printStackTrace();
 						}
 
+						if (LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli() - lastOnline < 1000
+								* 60 * 60 * 12) {
+							// server has been online within the 12 hours
+							HashMap<String, DataValue> dataToSet = new HashMap<String, DataValue>();
+							dataToSet.put("LastUpdated", new DataValueString(
+									"" + LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli()));
+							dataToSet.put("FinishedProcessing", new DataValueBoolean(false));
+							dataToSet.put(type.toString(), new DataValueBoolean(true));
+							getGlobalDataHandler().setData(s, dataToSet);
+							if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+								sendPluginMessageServer(s, "BungeeTimeChange", "");
+							} else if (method.equals(BungeeMethod.SOCKETS)) {
+								sendServerMessage(s, "BungeeTimeChange");
+							}
+						} else {
+							getLogger().warning("Server " + s + " hasn't been online recently");
+						}
+					} else {
+						getLogger().warning("Server " + s + " global data handler disabled?");
 					}
+
 				}
 				globalDataHandler.onTimeChange(type);
 			}
@@ -752,7 +754,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 							checkOnlineVotes(getProxy().getPlayer(UUID.fromString(player)), player, null);
 						}
 					}
-				}, 15l, 30l, TimeUnit.SECONDS);
+				}, 60l, 60l, TimeUnit.SECONDS);
 
 				getProxy().getScheduler().schedule(this, new Runnable() {
 
@@ -820,13 +822,14 @@ public class VotingPluginBungee extends Plugin implements Listener {
 			votePartyVotes = voteCacheFile.getVotePartyCurrentVotes();
 		}
 
-		if (getConfig().getRedisSupport()) {
+		if (getConfig().getMultiProxySupport()) {
 			if (encryptionHandler == null) {
 				encryptionHandler = new EncryptionHandler(new File(getDataFolder(), "secretkey.key"));
 			}
 
-			redisSocketHandler = new SocketHandler(getDescription().getVersion(), config.getRedisSocketHostHost(),
-					config.getRedisSocketHostPort(), encryptionHandler, config.getDebug()) {
+			multiproxySocketHandler = new SocketHandler(getDescription().getVersion(),
+					config.getMultiProxySocketHostHost(), config.getMultiProxySocketHostPort(), encryptionHandler,
+					config.getDebug()) {
 
 				@Override
 				public void log(String str) {
@@ -834,15 +837,22 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				}
 			};
 
-			redisSocketHandler.add(new SocketReceiver() {
+			multiproxySocketHandler.add(new SocketReceiver() {
 
 				@Override
 				public void onReceive(String[] data) {
+					if (data.length > 0) {
+						if (data[0].equalsIgnoreCase("Status")) {
+							getLogger().info("Multi-proxy status message received");
+						} else if (data[0].equalsIgnoreCase("ClearVote")) {
+							cachedOnlineVotes.remove(data[2]);
+						}
+					}
 					if (data.length > 8) {
 						if (data[0].equalsIgnoreCase("Vote")) {
-							// todo
-							// sendRedisServerMessage("Vote", uuid, player, service, "" + votePartyVotes,""
-							// + currentVotePartyVotesRequired, "" + time, "" + realVote, text.toString());
+							vote(data[2], data[3], Boolean.valueOf(data[7]), true, 0, new BungeeMessageData(data[8]),
+									data[1]);
+						} else if (data[0].equalsIgnoreCase("VoteOnline")) {
 							vote(data[2], data[3], Boolean.valueOf(data[7]), true, 0, new BungeeMessageData(data[8]),
 									data[1]);
 						}
@@ -851,14 +861,22 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				}
 			});
 
-			clientHandles = new HashMap<String, ClientHandler>();
+			multiproxyClientHandles = new HashMap<String, ClientHandler>();
 			for (
 
-			String s : config.getRedisServers()) {
-				Configuration d = config.getRedisServersConfiguration(s);
-				redisClientHandles.put(s, new ClientHandler(d.getString("Host", ""), d.getInt("Port", 1234),
+			String s : config.getMultiProxyServers()) {
+				Configuration d = config.getMultiProxyServersConfiguration(s);
+				multiproxyClientHandles.put(s, new ClientHandler(d.getString("Host", ""), d.getInt("Port", 1234),
 						encryptionHandler, config.getDebug()));
 			}
+
+			getLogger().info("Loaded multi-proxy support");
+		}
+
+		if (!votifierEnabled) {
+			if (!(getConfig().getMultiProxySupport() && !getConfig().getPrimaryServer())) {
+				getLogger().warning("Votifier event not found, not loading votifier event");
+			}
 		}
 
 		BStatsMetricsBungee metrics = new BStatsMetricsBungee(this, 9453);
@@ -888,6 +906,9 @@ public class VotingPluginBungee extends Plugin implements Listener {
 					() -> "" + getConfig().getGlobalDataUseMainMySQL()));
 		}
 
+		metrics.addCustomChart(new BStatsMetricsBungee.SimplePie("multi_proxy_support_enabled",
+				() -> "" + getConfig().getMultiProxySupport()));
+
 		if (!buildNumber.equals("NOTSET")) {
 			metrics.addCustomChart(new BStatsMetricsBungee.SimplePie("dev_build_number", () -> "" + buildNumber));
 		}
@@ -924,20 +945,21 @@ public class VotingPluginBungee extends Plugin implements Listener {
 	}
 
 	public void login(ProxiedPlayer p) {
-		if (isOnline(p)) {
-			if (p.getServer() != null && p.getServer().getInfo() != null) {
-				final String server = p.getServer().getInfo().getName();
-				final ProxiedPlayer proixedPlayer = p;
-				getProxy().getScheduler().runAsync(this, new Runnable() {
+		if (p != null && p.getServer() != null && p.getServer().getInfo() != null) {
+			final String server = p.getServer().getInfo().getName();
+			final ProxiedPlayer proixedPlayer = p;
+			getProxy().getScheduler().schedule(this, new Runnable() {
 
-					@Override
-					public void run() {
+				@Override
+				public void run() {
+					if (isOnline(p)) {
 						checkCachedVotes(server);
 						checkOnlineVotes(proixedPlayer, proixedPlayer.getUniqueId().toString(), server);
 					}
-				});
-			}
+				}
+			}, 1, TimeUnit.SECONDS);
 		}
+
 	}
 
 	@EventHandler
@@ -970,7 +992,12 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				return;
 			} else if (subchannel.equalsIgnoreCase("login")) {
 				String player = in.readUTF();
-				debug("Login: " + player);
+				String uuid = in.readUTF();
+				String server = "";
+				if (size > 2) {
+					server = in.readUTF();
+				}
+				debug("Login: " + player + "/" + uuid + " " + server);
 				ProxiedPlayer p = getProxy().getPlayer(player);
 				login(p);
 				return;
@@ -981,7 +1008,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				for (int i = 0; i < size; i++) {
 					out.writeUTF(in.readUTF());
 				}
-				for (String send : getProxy().getServers().keySet()) {
+				for (String send : getAvailableAllServers()) {
 					if (getProxy().getServers().get(send).getPlayers().size() > 0) {
 						getProxy().getServers().get(send).sendData("vp:vp".toLowerCase(), outstream.toByteArray());
 					}
@@ -1054,8 +1081,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		}
 	}
 
-	public void sendRedisServerMessage(String... messageData) {
-		for (ClientHandler h : redisClientHandles.values()) {
+	public void sendMultiProxyServerMessage(String... messageData) {
+		for (ClientHandler h : multiproxyClientHandles.values()) {
 			h.sendMessage(messageData);
 		}
 	}
@@ -1103,18 +1130,14 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		if (method.equals(BungeeMethod.SOCKETS)) {
 			sendServerMessage("status");
 		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-			for (String s : getProxy().getServers().keySet()) {
-				if (!config.getBlockedServers().contains(s)) {
-					ServerInfo info = getProxy().getServerInfo(s);
-					if (info.getPlayers().isEmpty()) {
-						getLogger().info("No players on server " + s + " to send test status message");
-					} else {
-						// send
-						getLogger().info("Sending request for status message on " + s);
-						sendPluginMessageServer(s, "Status", s);
-					}
+			for (String s : getAvailableAllServers()) {
+				ServerInfo info = getProxy().getServerInfo(s);
+				if (info.getPlayers().isEmpty()) {
+					getLogger().info("No players on server " + s + " to send test status message");
 				} else {
-					getLogger().info("Ignoring blocked server " + s);
+					// send
+					getLogger().info("Sending request for status message on " + s);
+					sendPluginMessageServer(s, "Status", s);
 				}
 			}
 		}
@@ -1179,7 +1202,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 			player = getProperName(uuid, player);
 
-			if (!getConfig().getPrimaryServer()) {
+			if (getConfig().getPrimaryServer() || !getConfig().getMultiProxySupport()) {
 				addVoteParty();
 				if (getConfig().getBungeeManageTotals()) {
 
@@ -1222,49 +1245,49 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				time = queueTime;
 			}
 
+			ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
 			if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
 
 				if (config.getSendVotesToAllServers()) {
-					for (String s : getProxy().getServers().keySet()) {
-						if (!config.getBlockedServers().contains(s)) {
-							ServerInfo info = getProxy().getServerInfo(s);
-							boolean forceCache = false;
-							ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
-							if (!isOnline(p) && getConfig().getWaitForUserOnline()) {
-								forceCache = true;
-								debug("Forcing vote to cache");
-							}
-							if (config.getBroadcast()) {
-								sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
-							}
-							if (info.getPlayers().isEmpty() || forceCache) {
-								// 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, realVote, text.toString()));
-								cachedVotes.put(s, list);
-
-								debug("Caching vote for " + player + " on " + service + " for " + s);
-
-							} else {
-								// send
-								sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
-										Boolean.TRUE.toString(), "" + realVote, text.toString(),
-										"" + getConfig().getBungeeManageTotals(),
-										"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "1");
-							}
-
+					for (String s : getAvailableAllServers()) {
+						ServerInfo info = getProxy().getServerInfo(s);
+						boolean forceCache = false;
+						if (!isOnline(p) && getConfig().getWaitForUserOnline()) {
+							forceCache = true;
+							debug("Forcing vote to cache");
 						}
+						if (config.getBroadcast()) {
+							sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
+						}
+						if (info.getPlayers().isEmpty() || forceCache) {
+							// 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, realVote, text.toString()));
+							cachedVotes.put(s, list);
+
+							debug("Caching vote for " + player + " on " + service + " for " + s);
+
+						} else {
+							// send
+							sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
+									Boolean.TRUE.toString(), "" + realVote, text.toString(),
+									"" + getConfig().getBungeeManageTotals(),
+									"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "1", "1");
+						}
+
 					}
 				} else {
-					ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
 					if (isOnline(p) && !config.getBlockedServers().contains(p.getServer().getInfo().getName())) {
 						sendPluginMessageServer(p.getServer().getInfo().getName(), "VoteOnline", player, uuid, service,
 								"" + time, Boolean.TRUE.toString(), "" + realVote, text.toString(),
 								"" + getConfig().getBungeeManageTotals(), "" + BungeeVersion.getPluginMessageVersion(),
-								"" + config.getBroadcast(), "1");
+								"" + config.getBroadcast(), "1", "1");
+						if (getConfig().getMultiProxySupport() && getConfig().getMultiProxyOneGlobalReward()) {
+							sendMultiProxyServerMessage("ClearVote", player, uuid);
+						}
 					} else {
 						if (!cachedOnlineVotes.containsKey(uuid)) {
 							cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
@@ -1277,7 +1300,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 						cachedOnlineVotes.put(uuid, list);
 						debug("Caching online vote for " + player + " on " + service);
 					}
-					for (String s : getProxy().getServers().keySet()) {
+					for (String s : getAvailableAllServers()) {
 						if (config.getBroadcast()) {
 							sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
 						}
@@ -1289,9 +1312,22 @@ public class VotingPluginBungee extends Plugin implements Listener {
 			} else if (method.equals(BungeeMethod.SOCKETS)) {
 				sendSocketVote(player, service, text);
 			}
-			if (getConfig().getRedisSupport() && getConfig().getPrimaryServer()) {
-				sendRedisServerMessage("Vote", uuid, player, service, "" + votePartyVotes,
-						"" + currentVotePartyVotesRequired, "" + time, "" + realVote, text.toString());
+			if (getConfig().getMultiProxySupport() && getConfig().getPrimaryServer()) {
+				if (!getConfig().getMultiProxyOneGlobalReward()) {
+					debug("Seending global proxy vote message");
+					sendMultiProxyServerMessage("Vote", uuid, player, service, "" + votePartyVotes,
+							"" + currentVotePartyVotesRequired, "" + time, "" + realVote, text.toString());
+				} else {
+					// check if reward should've already been given
+					if (!(isOnline(p) && !config.getBlockedServers().contains(p.getServer().getInfo().getName()))) {
+						debug("Sending global proxy voteonline message");
+						sendMultiProxyServerMessage("VoteOnline", uuid, player, service, "" + votePartyVotes,
+								"" + currentVotePartyVotesRequired, "" + time, "" + realVote, text.toString());
+					} else {
+						debug("Not sending global proxy message for voteonline, player already got reward");
+					}
+				}
+
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -1299,6 +1335,21 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 	}
 
+	public Set<String> getAvailableAllServers() {
+		Set<String> servers = new HashSet<String>();
+		if (config.getWhiteListedServers().isEmpty()) {
+			for (String s : getProxy().getServers().keySet()) {
+				if (!config.getBlockedServers().contains(s)) {
+					servers.add(s);
+				}
+			}
+		} else {
+			servers.addAll(config.getWhiteListedServers());
+		}
+
+		return servers;
+	}
+
 	private int votePartyVotes = 0;
 	private int currentVotePartyVotesRequired = 0;
 

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

@@ -54,6 +54,10 @@ public class VotingPluginBungeeCommand extends Command {
 								new TextComponent("&aNot using socket/pluginmessage method, command unavailable"));
 					}
 				}
+				if (args[0].equalsIgnoreCase("multiproxystatus")) {
+					bungee.sendMultiProxyServerMessage("Status");
+					sender.sendMessage(new TextComponent("&aSending status message"));
+				}
 				if (args[0].equalsIgnoreCase("help")) {
 					TextComponent[] msg = new TextComponent[4];
 					msg[0] = new TextComponent("&avotingpluginbungee reload - Reload plugin");

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

@@ -25,6 +25,10 @@ public class Config extends VelocityYMLFile {
 		return getStringList(getNode("BlockedServers"), new ArrayList<String>());
 	}
 
+	public List<String> getWhiteListedServers() {
+		return getStringList(getNode("WhiteListedServers"), new ArrayList<String>());
+	}
+
 	public boolean getBroadcast() {
 		return getBoolean(getNode("Broadcast"), false);
 	}
@@ -41,10 +45,6 @@ public class Config extends VelocityYMLFile {
 		return getBoolean(getNode("GlobalData", "UseMainMySQL"), true);
 	}
 
-	public String getBungeeHost() {
-		return getString(getNode("BungeeServer", "Host"), "");
-	}
-
 	public boolean getBungeeManageTotals() {
 		return getBoolean(getNode("BungeeManageTotals"), true);
 	}
@@ -53,6 +53,10 @@ public class Config extends VelocityYMLFile {
 		return getString(getNode("BungeeMethod"), "PLUGINMESSAGING");
 	}
 
+	public String getBungeeHost() {
+		return getString(getNode("BungeeServer", "Host"), "");
+	}
+
 	public int getBungeePort() {
 		return getInt(getNode("BungeeServer", "Port"), 1297);
 	}
@@ -120,4 +124,41 @@ public class Config extends VelocityYMLFile {
 	public boolean getWaitForUserOnline() {
 		return getBoolean(getNode("WaitForUserOnline"), false);
 	}
+
+	public boolean getMultiProxySupport() {
+		return getBoolean(getNode("MultiProxySupport"), false);
+	}
+
+	public boolean getMultiProxyOneGlobalReward() {
+		return getBoolean(getNode("MultiProxyOneGlobalReward"), false);
+	}
+
+	public boolean getGeyserSupport() {
+		return getBoolean(getNode("GeyserSupport"), false);
+	}
+
+	public boolean getPrimaryServer() {
+		return getBoolean(getNode("PrimaryServer"), false);
+	}
+
+	public String getGeyserPrefix() {
+		return getString(getNode("GeyserPrefix"), "*");
+	}
+
+	public ConfigurationNode getMultiProxyServers(String s) {
+		return getNode("MultiProxyServers", s);
+	}
+
+	public @NonNull Collection<? extends ConfigurationNode> getMultiProxyServers() {
+		return getNode("MultiProxyServers").getChildrenMap().values();
+	}
+
+	public String getMultiProxySocketHostHost() {
+		return getString(getNode("MultiProxySocketHost", "Host"), "");
+	}
+
+	public int getMultiProxySocketHostPort() {
+		return getInt(getNode("MultiProxySocketHost", "Port"), 1297);
+	}
+
 }

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

@@ -0,0 +1,32 @@
+package com.bencodez.votingplugin.bungee.velocity;
+
+import com.velocitypowered.api.event.Subscribe;
+import com.vexsoftware.votifier.velocity.event.VotifierEvent;
+
+public class VoteEventVelocity {
+	private VotingPluginVelocity plugin;
+
+	public VoteEventVelocity(VotingPluginVelocity plugin) {
+		this.plugin = plugin;
+	}
+	
+	@Subscribe
+	public void onVotifierEvent(VotifierEvent event) {
+		final String serviceSiteVote = event.getVote().getServiceName();
+		final String name = event.getVote().getUsername();
+		plugin.getTimer().execute(new Runnable() {
+
+			@Override
+			public void run() {
+				String serviceSite = serviceSiteVote;
+				plugin.getLogger().info("Vote received " + name + " from service site " + serviceSite);
+				if (serviceSite.isEmpty()) {
+					serviceSite = "Empty";
+				}
+
+				plugin.vote(name, serviceSite, true, false, 0, null, null);
+			}
+		});
+
+	}
+}

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

@@ -24,9 +24,11 @@ import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Queue;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -69,7 +71,6 @@ import com.google.inject.Inject;
 import com.velocitypowered.api.command.CommandMeta;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.PluginMessageEvent;
-import com.velocitypowered.api.event.player.ServerConnectedEvent;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
 import com.velocitypowered.api.plugin.Dependency;
@@ -80,7 +81,6 @@ import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.proxy.messages.ChannelIdentifier;
 import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
-import com.vexsoftware.votifier.velocity.event.VotifierEvent;
 
 import lombok.Getter;
 import ninja.leaping.configurate.ConfigurationNode;
@@ -119,6 +119,7 @@ public class VotingPluginVelocity {
 
 	private VoteCache voteCacheFile;
 
+	@Getter
 	private ScheduledExecutorService timer;
 
 	private ConcurrentHashMap<UUID, String> uuidPlayerNameCache = new ConcurrentHashMap<UUID, String>();
@@ -131,6 +132,10 @@ public class VotingPluginVelocity {
 	@Getter
 	private GlobalDataHandlerProxy globalDataHandler;
 
+	private HashMap<String, ClientHandler> multiproxyClientHandles;
+
+	private SocketHandler multiproxySocketHandler;
+
 	@Inject
 	public VotingPluginVelocity(ProxyServer server, Logger logger, Metrics.Factory metricsFactory,
 			@DataDirectory Path dataDirectory) {
@@ -149,6 +154,7 @@ public class VotingPluginVelocity {
 				ArrayList<OfflineBungeeVote> newSet = new ArrayList<OfflineBungeeVote>();
 				if (!c.isEmpty()) {
 					int num = 1;
+					int numberOfVotes = c.size();
 					for (OfflineBungeeVote cache : c) {
 						boolean toSend = true;
 						if (getConfig().getWaitForUserOnline()) {
@@ -169,7 +175,8 @@ public class VotingPluginVelocity {
 							sendPluginMessageServer(serverToCheck, "Vote", cache.getPlayerName(), cache.getUuid(),
 									cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
 									"" + cache.isRealVote(), cache.getText(), "" + getConfig().getBungeeManageTotals(),
-									"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "" + num);
+									"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "" + num,
+									"" + numberOfVotes);
 							num++;
 						} else {
 							debug("Not sending vote because user isn't on server " + serverToCheck + ": "
@@ -193,14 +200,19 @@ public class VotingPluginVelocity {
 				}
 				if (!config.getBlockedServers().contains(serverToCheck.getServerInfo().getName())) {
 					int num = 1;
+					int numberOfVotes = c.size();
 					for (OfflineBungeeVote cache : c) {
 						sendPluginMessageServer(serverToCheck, "VoteOnline", cache.getPlayerName(), cache.getUuid(),
 								cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
 								"" + cache.isRealVote(), cache.getText(), "" + getConfig().getBungeeManageTotals(),
-								"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "" + num);
+								"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "" + num,
+								"" + numberOfVotes);
 						num++;
 					}
 					cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
+					if (getConfig().getMultiProxySupport() && getConfig().getMultiProxyOneGlobalReward()) {
+						sendMultiProxyServerMessage("ClearVote", player.getUsername(), uuid);
+					}
 				}
 			}
 		}
@@ -314,10 +326,8 @@ public class VotingPluginVelocity {
 		};
 
 		ArrayList<String> servers = new ArrayList<String>();
-		for (RegisteredServer s : server.getAllServers()) {
-			if (!config.getBlockedServers().contains(s.getServerInfo().getName())) {
-				servers.add(s.getServerInfo().getName());
-			}
+		for (RegisteredServer s : getAvailableAllServers()) {
+			servers.add(s.getServerInfo().getName());
 		}
 
 		if (config.getGlobalDataEnabled()) {
@@ -347,18 +357,17 @@ public class VotingPluginVelocity {
 								debug2(text);
 							}
 						}, servers) {
+
 					@Override
 					public void onTimeChangedFinished(TimeType type) {
 						getMysql().wipeColumnData(TopVoter.of(type).getColumnName());
 
-						for (RegisteredServer s : server.getAllServers()) {
-							if (!config.getBlockedServers().contains(s.getServerInfo().getName())) {
-								getGlobalDataHandler().setBoolean(s.getServerInfo().getName(), "ForceUpdate", true);
-								if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-									sendPluginMessageServer(s, "BungeeTimeChange", "");
-								} else if (method.equals(BungeeMethod.SOCKETS)) {
-									sendServerMessage(s.getServerInfo().getName(), "BungeeTimeChange");
-								}
+						for (RegisteredServer s : getAvailableAllServers()) {
+							getGlobalDataHandler().setBoolean(s.getServerInfo().getName(), "ForceUpdate", true);
+							if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+								sendPluginMessageServer(s, "BungeeTimeChange", "");
+							} else if (method.equals(BungeeMethod.SOCKETS)) {
+								sendServerMessage(s.getServerInfo().getName(), "BungeeTimeChange");
 							}
 						}
 
@@ -396,19 +405,19 @@ public class VotingPluginVelocity {
 								debug2(text);
 							}
 						}, servers) {
+
 					@Override
 					public void onTimeChangedFinished(TimeType type) {
 						getMysql().wipeColumnData(TopVoter.of(type).getColumnName());
 
-						for (RegisteredServer s : server.getAllServers()) {
-							if (!config.getBlockedServers().contains(s.getServerInfo().getName())) {
-								getGlobalDataHandler().setBoolean(s.getServerInfo().getName(), "ForceUpdate", true);
-								if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-									sendPluginMessageServer(s, "BungeeTimeChange", "");
-								} else if (method.equals(BungeeMethod.SOCKETS)) {
-									sendServerMessage(s.getServerInfo().getName(), "BungeeTimeChange");
-								}
+						for (RegisteredServer s : getAvailableAllServers()) {
+							getGlobalDataHandler().setBoolean(s.getServerInfo().getName(), "ForceUpdate", true);
+							if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+								sendPluginMessageServer(s, "BungeeTimeChange", "");
+							} else if (method.equals(BungeeMethod.SOCKETS)) {
+								sendServerMessage(s.getServerInfo().getName(), "BungeeTimeChange");
 							}
+
 						}
 
 						processQueue();
@@ -418,6 +427,7 @@ public class VotingPluginVelocity {
 					public void onTimeChangedFailed(String server, TimeType type) {
 						getGlobalDataHandler().setBoolean(server, type.toString(), false);
 					}
+
 				};
 			}
 			getGlobalDataHandler().getGlobalMysql().alterColumnType("IgnoreTime", "VARCHAR(5)");
@@ -475,7 +485,8 @@ public class VotingPluginVelocity {
 				} else if (subchannel.equalsIgnoreCase("login")) {
 					String player = in.readUTF();
 					debug("Login: " + player);
-					if (server.getPlayer(player).isPresent() && !getGlobalDataHandler().isTimeChangedHappened()) {
+					if (server.getPlayer(player).isPresent()
+							&& (getGlobalDataHandler() == null || !getGlobalDataHandler().isTimeChangedHappened())) {
 						Player p = server.getPlayer(player).get();
 						if (p.getCurrentServer().isPresent()) {
 							final RegisteredServer server = p.getCurrentServer().get().getServer();
@@ -500,8 +511,7 @@ public class VotingPluginVelocity {
 					for (int i = 0; i < size; i++) {
 						out.writeUTF(in.readUTF());
 					}
-					for (RegisteredServer send : server.getAllServers()) {
-
+					for (RegisteredServer send : getAvailableAllServers()) {
 						if (send.getPlayersConnected().size() > 0) {
 							send.sendPluginMessage(CHANNEL, outstream.toByteArray());
 						}
@@ -604,41 +614,39 @@ public class VotingPluginVelocity {
 				if (!config.getGlobalDataEnabled()) {
 					return;
 				}
-				for (RegisteredServer s : server.getAllServers()) {
-					if (!config.getBlockedServers().contains(s.getServerInfo().getName())) {
+				for (RegisteredServer s : getAvailableAllServers()) {
 
-						if (getGlobalDataHandler().getGlobalMysql().containsKey(s.getServerInfo().getName())) {
-							String lastOnlineStr = getGlobalDataHandler().getString(s.getServerInfo().getName(),
-									"LastOnline");
-							long lastOnline = 0;
-							try {
-								lastOnline = Long.valueOf(lastOnlineStr);
-							} catch (NumberFormatException e) {
-								e.printStackTrace();
-							}
-
-							if (LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli()
-									- lastOnline < 1000 * 60 * 60 * 12) {
-								// server has been online within the 12 hours
-								HashMap<String, DataValue> dataToSet = new HashMap<String, DataValue>();
-								dataToSet.put("LastUpdated", new DataValueString(
-										"" + LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli()));
-								dataToSet.put("FinishedProcessing", new DataValueBoolean(false));
-								dataToSet.put(type.toString(), new DataValueBoolean(true));
-								getGlobalDataHandler().setData(s.getServerInfo().getName(), dataToSet);
-								if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-									sendPluginMessageServer(s, "BungeeTimeChange", "");
-								} else if (method.equals(BungeeMethod.SOCKETS)) {
-									sendServerMessageServer(s.getServerInfo().getName(), "BungeeTimeChange");
-								}
-							} else {
-								logger.warn("Server " + s + " hasn't been online recently");
-							}
-						} else {
-							logger.warn("Server " + s + " global data handler disabled?");
+					if (getGlobalDataHandler().getGlobalMysql().containsKey(s.getServerInfo().getName())) {
+						String lastOnlineStr = getGlobalDataHandler().getString(s.getServerInfo().getName(),
+								"LastOnline");
+						long lastOnline = 0;
+						try {
+							lastOnline = Long.valueOf(lastOnlineStr);
+						} catch (NumberFormatException e) {
+							e.printStackTrace();
 						}
 
+						if (LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli() - lastOnline < 1000
+								* 60 * 60 * 12) {
+							// server has been online within the 12 hours
+							HashMap<String, DataValue> dataToSet = new HashMap<String, DataValue>();
+							dataToSet.put("LastUpdated", new DataValueString(
+									"" + LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli()));
+							dataToSet.put("FinishedProcessing", new DataValueBoolean(false));
+							dataToSet.put(type.toString(), new DataValueBoolean(true));
+							getGlobalDataHandler().setData(s.getServerInfo().getName(), dataToSet);
+							if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+								sendPluginMessageServer(s, "BungeeTimeChange", "");
+							} else if (method.equals(BungeeMethod.SOCKETS)) {
+								sendServerMessageServer(s.getServerInfo().getName(), "BungeeTimeChange");
+							}
+						} else {
+							logger.warn("Server " + s + " hasn't been online recently");
+						}
+					} else {
+						logger.warn("Server " + s + " global data handler disabled?");
 					}
+
 				}
 			}
 
@@ -718,6 +726,19 @@ public class VotingPluginVelocity {
 				.aliases("vpb").build();
 
 		server.getCommandManager().register(meta, new VotingPluginVelocityCommand(this));
+		try {
+			Class.forName("com.vexsoftware.votifier.velocity.event.VotifierEvent");
+		} catch (ClassNotFoundException e) {
+			votifierEnabled = false;
+		}
+		if (votifierEnabled) {
+			try {
+				server.getEventManager().register(this, new VoteEventVelocity(this));
+			} catch (Exception e) {
+				e.printStackTrace();
+				votifierEnabled = false;
+			}
+		}
 
 		if (mysqlLoaded) {
 			uuidPlayerNameCache = mysql.getRowsUUIDNameQuery();
@@ -778,7 +799,7 @@ public class VotingPluginVelocity {
 				voteCacheFile.clearData();
 
 				server.getScheduler().buildTask(this, () -> {
-					if (!getGlobalDataHandler().isTimeChangedHappened()) {
+					if (getGlobalDataHandler() == null || !getGlobalDataHandler().isTimeChangedHappened()) {
 						for (RegisteredServer server : cachedVotes.keySet()) {
 							checkCachedVotes(server);
 						}
@@ -789,7 +810,7 @@ public class VotingPluginVelocity {
 							}
 						}
 					}
-				}).delay(15L, TimeUnit.SECONDS).repeat(30l, TimeUnit.SECONDS).schedule();
+				}).delay(60, TimeUnit.SECONDS).repeat(60, TimeUnit.SECONDS).schedule();
 
 				server.getScheduler().buildTask(this, () -> {
 					if (nonVotedPlayersCache != null) {
@@ -853,6 +874,58 @@ public class VotingPluginVelocity {
 			currentVotePartyVotesRequired = getConfig().getVotePartyVotesRequired()
 					+ voteCacheFile.getVotePartyInreaseVotesRequired();
 			votePartyVotes = voteCacheFile.getVotePartyCurrentVotes();
+
+			if (getConfig().getMultiProxySupport()) {
+				if (encryptionHandler == null) {
+					encryptionHandler = new EncryptionHandler(new File(dataDirectory.toFile(), "secretkey.key"));
+				}
+
+				multiproxySocketHandler = new SocketHandler(
+						server.getPluginManager().getPlugin("votingplugin").get().getDescription().getVersion().get(),
+						config.getMultiProxySocketHostHost(), config.getMultiProxySocketHostPort(), encryptionHandler,
+						config.getDebug()) {
+
+					@Override
+					public void log(String str) {
+						getLogger().info(str);
+					}
+				};
+
+				multiproxySocketHandler.add(new SocketReceiver() {
+
+					@Override
+					public void onReceive(String[] data) {
+						if (data.length > 0) {
+							if (data[0].equalsIgnoreCase("Status")) {
+								getLogger().info("Multi-proxy status message received");
+							} else if (data[0].equalsIgnoreCase("ClearVote")) {
+								cachedOnlineVotes.remove(data[2]);
+							}
+						}
+						if (data.length > 8) {
+							if (data[0].equalsIgnoreCase("Vote")) {
+								vote(data[2], data[3], Boolean.valueOf(data[7]), true, 0,
+										new BungeeMessageData(data[8]), data[1]);
+							} else if (data[0].equalsIgnoreCase("VoteOnline")) {
+								vote(data[2], data[3], Boolean.valueOf(data[7]), true, 0,
+										new BungeeMessageData(data[8]), data[1]);
+							}
+						}
+
+					}
+				});
+
+				multiproxyClientHandles = new HashMap<String, ClientHandler>();
+
+				for (ConfigurationNode s : config.getMultiProxyServers()) {
+					ConfigurationNode d = config.getMultiProxyServers(s.getKey().toString());
+					multiproxyClientHandles.put(s.getKey().toString(),
+							new ClientHandler(d.getNode("Host").getString("0.0.0.0"), d.getNode("Port").getInt(1298),
+									encryptionHandler, config.getDebug()));
+				}
+
+				getLogger().info("Loaded multi-proxy support");
+			}
 		}
 
 		try {
@@ -865,6 +938,12 @@ public class VotingPluginVelocity {
 			e.printStackTrace();
 		}
 
+		if (!votifierEnabled) {
+			if (!(getConfig().getMultiProxySupport() && !getConfig().getPrimaryServer())) {
+				getLogger().warn("Votifier event not found, not loading votifier event");
+			}
+		}
+
 		Metrics metrics = metricsFactory.make(this, 11547);
 
 		metrics.addCustomChart(new SimplePie("bungee_method", () -> getConfig().getBungeeMethod().toString()));
@@ -887,6 +966,9 @@ public class VotingPluginVelocity {
 					new SimplePie("globaldata_usemainmysql", () -> "" + getConfig().getGlobalDataUseMainMySQL()));
 		}
 
+		metrics.addCustomChart(
+				new SimplePie("multi_proxy_support_enabled", () -> "" + getConfig().getMultiProxySupport()));
+
 		if (!buildNumber.equals("NOTSET")) {
 			metrics.addCustomChart(new SimplePie("dev_build_number", () -> "" + buildNumber));
 		}
@@ -949,26 +1031,6 @@ public class VotingPluginVelocity {
 		}
 	}
 
-	@Subscribe
-	public void onVotifierEvent(VotifierEvent event) {
-		final String serviceSiteVote = event.getVote().getServiceName();
-		final String name = event.getVote().getUsername();
-		timer.execute(new Runnable() {
-
-			@Override
-			public void run() {
-				String serviceSite = serviceSiteVote;
-				logger.info("Vote received " + name + " from service site " + serviceSite);
-				if (serviceSite.isEmpty()) {
-					serviceSite = "Empty";
-				}
-
-				vote(name, serviceSite, true, false, 0);
-			}
-		});
-
-	}
-
 	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),
@@ -987,12 +1049,6 @@ public class VotingPluginVelocity {
 		return new UUID(mostSigBits, leastSigBits);
 	}
 
-	@Subscribe
-	public void playerServerConnected(ServerConnectedEvent event) {
-		checkCachedVotes(event.getServer());
-		checkOnlineVotes(event.getPlayer(), event.getPlayer().getUniqueId().toString(), event.getServer());
-	}
-
 	public void reload(boolean loadMySQL) {
 		config.reload();
 		currentVotePartyVotesRequired = getConfig().getVotePartyVotesRequired()
@@ -1076,18 +1132,15 @@ public class VotingPluginVelocity {
 		if (method.equals(BungeeMethod.SOCKETS)) {
 			sendServerMessage("status");
 		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-			for (RegisteredServer s : server.getAllServers()) {
-				if (!config.getBlockedServers().contains(s.getServerInfo().getName())) {
-					if (s.getPlayersConnected().size() == 0) {
-						getLogger().info("No players on server " + s + " to send test status message");
-					} else {
-						// send
-						getLogger().info("Sending request for status message on " + s);
-						sendPluginMessageServer(s, "Status", s.getServerInfo().getName());
-					}
+			for (RegisteredServer s : getAvailableAllServers()) {
+				if (s.getPlayersConnected().size() == 0) {
+					getLogger().info("No players on server " + s + " to send test status message");
 				} else {
-					getLogger().info("Ignoring blocked server " + s);
+					// send
+					getLogger().info("Sending request for status message on " + s);
+					sendPluginMessageServer(s, "Status", s.getServerInfo().getName());
 				}
+
 			}
 		}
 	}
@@ -1098,11 +1151,12 @@ public class VotingPluginVelocity {
 	public void processQueue() {
 		while (getTimeChangeQueue().size() > 0) {
 			VoteTimeQueue vote = getTimeChangeQueue().remove();
-			vote(vote.getName(), vote.getService(), true, false, vote.getTime());
+			vote(vote.getName(), vote.getService(), true, false, vote.getTime(), null, null);
 		}
 	}
 
-	public synchronized void vote(String player, String service, boolean realVote, boolean timeQueue, long queuedTime) {
+	public synchronized void vote(String player, String service, boolean realVote, boolean timeQueue, long queuedTime,
+			BungeeMessageData text, String uuid) {
 		try {
 			if (player == null || player.isEmpty()) {
 				logger.info("No name from vote on " + service);
@@ -1121,7 +1175,19 @@ public class VotingPluginVelocity {
 				}
 			}
 
-			String uuid = getUUID(player);
+			if (uuid == null || uuid.isEmpty()) {
+				uuid = getUUID(player);
+			}
+
+			if (uuid.isEmpty()) {
+				if (config.getGeyserSupport()) {
+					if (!player.startsWith(config.getGeyserPrefix())) {
+						uuid = getUUID(config.getGeyserPrefix() + player);
+						player = config.getGeyserPrefix() + player;
+					}
+				}
+			}
+
 			if (uuid.isEmpty()) {
 				if (config.getAllowUnJoined()) {
 					debug("Fetching UUID online, since allowunjoined is enabled");
@@ -1148,108 +1214,95 @@ public class VotingPluginVelocity {
 
 			player = getProperName(uuid, player);
 
-			BungeeMessageData text = null;
+			if (getConfig().getPrimaryServer() || !getConfig().getMultiProxySupport()) {
+				addVoteParty();
+				if (getConfig().getBungeeManageTotals()) {
 
-			addVoteParty();
+					if (mysql == null) {
+						logger.error("Mysql is not loaded correctly, stopping vote processing");
+						return;
+					}
 
-			if (getConfig().getBungeeManageTotals()) {
+					if (!mysql.getUuids().contains(uuid)) {
+						mysql.update(uuid, "PlayerName", new DataValueString(player));
+					}
 
-				if (mysql == null) {
-					logger.error("Mysql is not loaded correctly, stopping vote processing");
-					return;
+					ArrayList<Column> data = mysql.getExactQuery(new Column("uuid", new DataValueString(uuid)));
+
+					int allTimeTotal = getValue(data, "AllTimeTotal", 1);
+					int monthTotal = getValue(data, "MonthTotal", 1);
+					int weeklyTotal = getValue(data, "WeeklyTotal", 1);
+					int dailyTotal = getValue(data, "DailyTotal", 1);
+					int points = getValue(data, "Points", getConfig().getPointsOnVote());
+					int milestoneCount = getValue(data, "MilestoneCount", 1);
+					text = new BungeeMessageData(allTimeTotal, monthTotal, weeklyTotal, dailyTotal, points,
+							milestoneCount, votePartyVotes, currentVotePartyVotesRequired);
+					ArrayList<Column> update = new ArrayList<Column>();
+					update.add(new Column("AllTimeTotal", new DataValueInt(allTimeTotal)));
+					update.add(new Column("MonthTotal", new DataValueInt(monthTotal)));
+					update.add(new Column("WeeklyTotal", new DataValueInt(weeklyTotal)));
+					update.add(new Column("DailyTotal", new DataValueInt(dailyTotal)));
+					update.add(new Column("Points", new DataValueInt(points)));
+					update.add(new Column("MilestoneCount", new DataValueInt(milestoneCount)));
+					debug("Setting totals " + text.toString());
+					mysql.update(uuid, update);
+				} else {
+					text = new BungeeMessageData(0, 0, 0, 0, 0, 0, votePartyVotes, currentVotePartyVotesRequired);
 				}
-
-				if (!mysql.getUuids().contains(uuid)) {
-					mysql.update(uuid, "PlayerName", new DataValueString(player));
-				}
-
-				ArrayList<Column> data = mysql.getExactQuery(new Column("uuid", new DataValueString(uuid)));
-
-				int allTimeTotal = getValue(data, "AllTimeTotal", 1);
-				int monthTotal = getValue(data, "MonthTotal", 1);
-				int weeklyTotal = getValue(data, "WeeklyTotal", 1);
-				int dailyTotal = getValue(data, "DailyTotal", 1);
-				int points = getValue(data, "Points", getConfig().getPointsOnVote());
-				int milestoneCount = getValue(data, "MilestoneCount", 1);
-				text = new BungeeMessageData(allTimeTotal, monthTotal, weeklyTotal, dailyTotal, points, milestoneCount,
-						votePartyVotes, currentVotePartyVotesRequired);
-				ArrayList<Column> update = new ArrayList<Column>();
-				update.add(new Column("AllTimeTotal", new DataValueInt(allTimeTotal)));
-				update.add(new Column("MonthTotal", new DataValueInt(monthTotal)));
-				update.add(new Column("WeeklyTotal", new DataValueInt(weeklyTotal)));
-				update.add(new Column("DailyTotal", new DataValueInt(dailyTotal)));
-				update.add(new Column("Points", new DataValueInt(points)));
-				update.add(new Column("MilestoneCount", new DataValueInt(milestoneCount)));
-				debug("Setting totals " + text.toString());
-				mysql.update(uuid, update);
-			} else {
-				text = new BungeeMessageData(0, 0, 0, 0, 0, 0, votePartyVotes, currentVotePartyVotesRequired);
 			}
 
-			/*
-			 * String text = mysqlUpdate(data, uuid, "AllTimeTotal", 1) + "//" +
-			 * mysqlUpdate(data, uuid, "MonthTotal", 1) + "//" + mysqlUpdate(data, uuid,
-			 * "WeeklyTotal", 1) + "//" + mysqlUpdate(data, uuid, "DailyTotal", 1) + "//" +
-			 * mysqlUpdate(data, uuid, "Points", 1) + "//" + mysqlUpdate(data, uuid,
-			 * "MilestoneCount", 1);
-			 */
-
 			long time = LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
 			if (queuedTime != 0) {
 				time = queuedTime;
 			}
 
+			Player p = null;
+			if (server.getPlayer(UUID.fromString(uuid)).isPresent()) {
+				p = server.getPlayer(UUID.fromString(uuid)).get();
+			}
 			if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
 
 				if (config.getSendVotesToAllServers()) {
-					for (RegisteredServer s : server.getAllServers()) {
-						if (!config.getBlockedServers().contains(s.getServerInfo().getName())) {
-							boolean forceCache = false;
-							Player p = null;
-							if (server.getPlayer(UUID.fromString(uuid)).isPresent()) {
-								p = server.getPlayer(UUID.fromString(uuid)).get();
+					for (RegisteredServer s : getAvailableAllServers()) {
+						boolean forceCache = false;
+						if ((!isOnline(p) && getConfig().getWaitForUserOnline())
+								|| (getGlobalDataHandler() != null && getGlobalDataHandler().isTimeChangedHappened())) {
+							forceCache = true;
+							debug("Forcing vote to cache");
+						}
+						if (s.getPlayersConnected().isEmpty() || forceCache) {
+							// cache
+							if (!cachedVotes.containsKey(s)) {
+								cachedVotes.put(s, new ArrayList<OfflineBungeeVote>());
 							}
-							if (((p == null || !p.isActive()) && getConfig().getWaitForUserOnline())
-									|| getGlobalDataHandler().isTimeChangedHappened()) {
-								forceCache = true;
-								debug("Forcing vote to cache");
-							}
-							if (s.getPlayersConnected().isEmpty() || forceCache) {
-								// 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, realVote, text.toString()));
-								cachedVotes.put(s, list);
+							ArrayList<OfflineBungeeVote> list = cachedVotes.get(s);
+							list.add(new OfflineBungeeVote(player, uuid, service, time, realVote, text.toString()));
+							cachedVotes.put(s, list);
 
-								debug("Caching vote for " + player + " on " + service + " for " + s);
+							debug("Caching vote for " + player + " on " + service + " for " + s);
 
-							} else {
-								// send
-								sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
-										Boolean.TRUE.toString(), "" + realVote, text.toString(),
-										"" + getConfig().getBungeeManageTotals(),
-										"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "1");
-							}
-							if (config.getBroadcast()) {
-								sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
-							}
+						} else {
+							// send
+							sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
+									Boolean.TRUE.toString(), "" + realVote, text.toString(),
+									"" + getConfig().getBungeeManageTotals(),
+									"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "1", "1");
+						}
+						if (config.getBroadcast()) {
+							sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
 						}
 					}
 				} else {
-					Player p = null;
-					if (server.getPlayer(UUID.fromString(uuid)).isPresent()) {
-						p = server.getPlayer(UUID.fromString(uuid)).get();
-					}
-					if (p != null && p.isActive()
-							&& !config.getBlockedServers()
-									.contains(p.getCurrentServer().get().getServerInfo().getName())
-							&& !getGlobalDataHandler().isTimeChangedHappened()) {
+
+					if (isOnline(p) && !config.getBlockedServers()
+							.contains(p.getCurrentServer().get().getServerInfo().getName())) {
 						sendPluginMessageServer(p.getCurrentServer().get().getServer(), "VoteOnline", player, uuid,
 								service, "" + time, Boolean.TRUE.toString(), "" + realVote, text.toString(),
 								"" + getConfig().getBungeeManageTotals(), "" + BungeeVersion.getPluginMessageVersion(),
-								"" + config.getBroadcast(), "1");
+								"" + config.getBroadcast(), "1", "1");
+						if (getConfig().getMultiProxySupport() && getConfig().getMultiProxyOneGlobalReward()) {
+							sendMultiProxyServerMessage("ClearVote", player, uuid);
+						}
 					} else {
 						if (!cachedOnlineVotes.containsKey(uuid)) {
 							cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
@@ -1263,7 +1316,7 @@ public class VotingPluginVelocity {
 						debug("Caching online vote for " + player + " on " + service);
 					}
 
-					for (RegisteredServer s : server.getAllServers()) {
+					for (RegisteredServer s : getAvailableAllServers()) {
 						sendPluginMessageServer(s, "VoteUpdate", uuid, "" + votePartyVotes,
 								"" + currentVotePartyVotesRequired);
 						if (config.getBroadcast()) {
@@ -1274,13 +1327,66 @@ public class VotingPluginVelocity {
 			} else if (method.equals(BungeeMethod.SOCKETS)) {
 				sendSocketVote(player, service, text);
 			}
+
+			if (getConfig().getMultiProxySupport() && getConfig().getPrimaryServer()) {
+				if (!getConfig().getMultiProxyOneGlobalReward()) {
+					debug("Sending global proxy vote message");
+					sendMultiProxyServerMessage("Vote", uuid, player, service, "" + votePartyVotes,
+							"" + currentVotePartyVotesRequired, "" + time, "" + realVote, text.toString());
+				} else {
+					// check if reward should've already been given
+					if (!(isOnline(p) && !config.getBlockedServers()
+							.contains(p.getCurrentServer().get().getServerInfo().getName()))) {
+						debug("Seending global proxy voteonline message");
+						sendMultiProxyServerMessage("VoteOnline", uuid, player, service, "" + votePartyVotes,
+								"" + currentVotePartyVotesRequired, "" + time, "" + realVote, text.toString());
+					} else {
+						debug("Not sending global proxy message for voteonline, player already got reward");
+					}
+				}
+
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
 
+	public Set<RegisteredServer> getAvailableAllServers() {
+		Set<RegisteredServer> servers = new HashSet<RegisteredServer>();
+		if (config.getWhiteListedServers().isEmpty()) {
+			for (RegisteredServer s : server.getAllServers()) {
+				if (!config.getBlockedServers().contains(s.getServerInfo().getName())) {
+					servers.add(s);
+				}
+			}
+		} else {
+			for (RegisteredServer s : server.getAllServers()) {
+				if (config.getWhiteListedServers().contains(s.getServerInfo().getName())) {
+					servers.add(s);
+				}
+			}
+		}
+
+		return servers;
+	}
+
+	public boolean isOnline(Player p) {
+		if (p != null) {
+			return p.isActive();
+		}
+
+		return false;
+	}
+
+	public void sendMultiProxyServerMessage(String... messageData) {
+		for (ClientHandler h : multiproxyClientHandles.values()) {
+			h.sendMessage(messageData);
+		}
+	}
+
 	private int votePartyVotes = 0;
 	private int currentVotePartyVotesRequired = 0;
+	private boolean votifierEnabled = true;
 
 	public void addCurrentVotePartyVotes(int amount) {
 		votePartyVotes += amount;
@@ -1326,7 +1432,7 @@ public class VotingPluginVelocity {
 
 	public Collection<RegisteredServer> getVotePartyServers() {
 		if (getConfig().getVotePartySendToAllServers()) {
-			return server.getAllServers();
+			return getAvailableAllServers();
 		}
 		Collection<RegisteredServer> list = new ArrayList<RegisteredServer>();
 		for (String server : getConfig().getVotePartyServersToSend()) {

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

@@ -34,7 +34,7 @@ public class VotingPluginVelocityCommand implements SimpleCommand {
 				if (args.length >= 2) {
 					String user = args[1];
 					String site = args[2];
-					plugin.vote(user, site, false, true, 0);
+					plugin.vote(user, site, false, true, 0, null, null);
 					source.sendMessage(Component.text("Sending vote").color(NamedTextColor.AQUA));
 				}
 			}
@@ -60,6 +60,10 @@ public class VotingPluginVelocityCommand implements SimpleCommand {
 							.color(NamedTextColor.AQUA));
 				}
 			}
+			if (args[0].equalsIgnoreCase("multiproxystatus")) {
+				plugin.sendMultiProxyServerMessage("Status");
+				source.sendMessage(Component.text("Sending status message").color(NamedTextColor.AQUA));
+			}
 			if (args[0].equalsIgnoreCase("help")) {
 				String[] msg = new String[4];
 				msg[0] = "votingpluginbungee reload - Reload plugin";

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

@@ -868,15 +868,22 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				sendMessage(sender, "&cTriggering vote for all voting sites...");
 				for (VoteSite site : plugin.getVoteSites()) {
-					PlayerVoteEvent voteEvent = new PlayerVoteEvent(site, args[1], site.getServiceSite(), false);
-					if (voteEvent.getVoteSite() != null) {
-						if (!voteEvent.getVoteSite().isVaidServiceSite()) {
-							sendMessage(sender,
-									"&cPossible issue with service site, has the server gotten the vote from "
-											+ voteEvent.getServiceSite() + "?");
+					plugin.getVoteTimer().submit(new Runnable() {
+
+						@Override
+						public void run() {
+							PlayerVoteEvent voteEvent = new PlayerVoteEvent(site, args[1], site.getServiceSite(),
+									false);
+							if (voteEvent.getVoteSite() != null) {
+								if (!voteEvent.getVoteSite().isVaidServiceSite()) {
+									sendMessage(sender,
+											"&cPossible issue with service site, has the server gotten the vote from "
+													+ voteEvent.getServiceSite() + "?");
+								}
+							}
+							plugin.getServer().getPluginManager().callEvent(voteEvent);
 						}
-					}
-					plugin.getServer().getPluginManager().callEvent(voteEvent);
+					});
 				}
 
 				if (plugin.isYmlError()) {
@@ -893,17 +900,24 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[2], true), args[1], args[2],
 						false);
-				sendMessage(sender, "&cTriggering vote...");
 				if (voteEvent.getVoteSite() != null) {
 					if (!voteEvent.getVoteSite().isVaidServiceSite()) {
 						sendMessage(sender, "&cPossible issue with service site, has the server gotten the vote from "
 								+ voteEvent.getServiceSite() + "?");
 					}
-				}
-				plugin.getServer().getPluginManager().callEvent(voteEvent);
+					sendMessage(sender, "&cTriggering vote...");
 
-				if (plugin.isYmlError()) {
-					sendMessage(sender, "&3Detected yml error, please check server log for details");
+					plugin.getVoteTimer().submit(new Runnable() {
+
+						@Override
+						public void run() {
+							plugin.getServer().getPluginManager().callEvent(voteEvent);
+						}
+					});
+
+					if (plugin.isYmlError()) {
+						sendMessage(sender, "&3Detected yml error, please check server log for details");
+					}
 				}
 
 			}
@@ -926,7 +940,13 @@ public class CommandLoader {
 												+ voteEvent.getServiceSite() + "?");
 							}
 						}
-						plugin.getServer().getPluginManager().callEvent(voteEvent);
+						plugin.getVoteTimer().submit(new Runnable() {
+
+							@Override
+							public void run() {
+								plugin.getServer().getPluginManager().callEvent(voteEvent);
+							}
+						});
 
 						if (plugin.isYmlError()) {
 							sendMessage(sender, "&3Detected yml error, please check server log for details");
@@ -1216,7 +1236,7 @@ public class CommandLoader {
 
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "Test", "(Player)", "(sitename)", "(number)" },
-						"VotingPlugin.Commands.AdminVote.Test|" + adminPerm, "Test voting times") {
+						"VotingPlugin.Commands.AdminVote.Test|" + adminPerm, "Test voting speed, for debug") {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
@@ -1227,9 +1247,22 @@ public class CommandLoader {
 					}
 				});
 
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "TestSpam", "(Player)", "(sitename)", "(number)" },
+						"VotingPlugin.Commands.AdminVote.TestSpam|" + adminPerm, "Test voting spam speed, for debug") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						VoteTester.getInstance().testSpam(Integer.parseInt(args[3]), args[1], args[2]);
+						if (isPlayer(sender)) {
+							sendMessage(sender, "&cSee console for details");
+						}
+					}
+				});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "TestReward", "(Player)", "(reward)", "(number)" },
-						"VotingPlugin.Commands.AdminVote.TestReward|" + adminPerm, "Test reward times") {
+						"VotingPlugin.Commands.AdminVote.TestReward|" + adminPerm, "Test reward speed, for debug") {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
@@ -1258,7 +1291,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						plugin.getVoteParty().giveRewards(plugin.getBungeeSettings().isUseBungeecoord());
+						plugin.getVoteParty().giveRewards(null, plugin.getBungeeSettings().isUseBungeecoord());
 					}
 				});
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/AdminGUI.java

@@ -251,7 +251,13 @@ public class AdminGUI {
 						if (ob != null) {
 							VoteSite site = (VoteSite) ob;
 							PlayerVoteEvent voteEvent = new PlayerVoteEvent(site, value, site.getServiceSite(), false);
-							plugin.getServer().getPluginManager().callEvent(voteEvent);
+							plugin.getVoteTimer().submit(new Runnable() {
+
+								@Override
+								public void run() {
+									plugin.getServer().getPluginManager().callEvent(voteEvent);
+								}
+							});
 						}
 					}
 				}, ArrayUtils.getInstance().convert(playerNames)).usingMethod(InputMethod.INVENTORY)

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

@@ -37,6 +37,10 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean perSiteCoolDownEvents = false;
 
+	@ConfigDataBoolean(path = "QueueVotesDuringTimeChange")
+	@Getter
+	private boolean queueVotesDuringTimeChange = false;
+
 	@ConfigDataBoolean(path = "AllowUnjoined")
 	@Getter
 	private boolean allowUnjoined = false;

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

@@ -49,7 +49,8 @@ public class PlayerJoinEvent implements Listener {
 
 		if (plugin.getBungeeSettings().isUseBungeecoord()
 				&& plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
-			plugin.getPluginMessaging().sendPluginMessage("Login", user.getPlayerName(), user.getUUID());
+			plugin.getPluginMessaging().sendPluginMessage("Login", user.getPlayerName(), user.getUUID(),
+					plugin.getBungeeSettings().getServer());
 		}
 	}
 

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

@@ -3,10 +3,9 @@ package com.bencodez.votingplugin.listeners;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -27,8 +26,6 @@ import com.bencodez.votingplugin.user.VotingPluginUser;
  */
 public class PlayerVoteListener implements Listener {
 
-	private static Object object = new Object();
-
 	private VotingPluginMain plugin;
 
 	/**
@@ -48,9 +45,11 @@ public class PlayerVoteListener implements Listener {
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onplayerVote(PlayerVoteEvent event) {
 		if (!plugin.isEnabled()) {
+			plugin.getLogger().warning("Plugin disabled, ignoring vote");
 			return;
 		}
 		String playerName = event.getPlayer();
+		plugin.debug("Processing PlayerVoteEvent: " + playerName + "/" + event.getServiceSite());
 		if (!PlayerUtils.getInstance().isValidUser(playerName, plugin.getConfigFile().isAllowUnJoinedCheckServer())) {
 			if (!plugin.getConfigFile().isAllowUnjoined()) {
 				plugin.getLogger().warning("Player " + playerName
@@ -63,7 +62,7 @@ public class PlayerVoteListener implements Listener {
 		}
 
 		if (playerName.isEmpty()) {
-			plugin.getLogger().warning("Empty player name for vote");
+			plugin.getLogger().warning("Empty player name from vote, ignoring");
 			return;
 		}
 
@@ -106,7 +105,13 @@ public class PlayerVoteListener implements Listener {
 		if (event.getVotingPluginUser() != null) {
 			user = event.getVotingPluginUser();
 		} else {
-			user = UserManager.getInstance().getVotingPluginUser(playerName);
+			Player p = Bukkit.getPlayerExact(playerName);
+			if (p != null) {
+				// player online
+				user = UserManager.getInstance().getVotingPluginUser(p);
+			} else {
+				user = UserManager.getInstance().getVotingPluginUser(playerName);
+			}
 		}
 
 		if (voteSite.isWaitUntilVoteDelay() && !user.canVoteSite(voteSite)) {
@@ -114,131 +119,119 @@ public class PlayerVoteListener implements Listener {
 			return;
 		}
 
-		synchronized (object) {
-			if (!plugin.isEnabled()) {
-				return;
-			}
-			// reupdate cache
-			user.clearCache();
-			user.cache();
+		final String uuid = user.getUUID();
 
-			user.updateName(true);
+		// reupdate cache
+		user.clearCache();
+		user.cache();
 
-			// vote party
-			plugin.getVoteParty().vote(user, event.isRealVote(), event.isForceBungee());
+		user.updateName(true);
 
-			if (event.isBroadcast() && !plugin.getBungeeSettings().isDisableBroadcast()) {
-				// broadcast vote if enabled in config
-				if (plugin.getConfigFile().isBroadcastVotesEnabled()
-						&& (plugin.getBungeeSettings().isBungeeBroadcast() || !event.isBungee())) {
-					if (!plugin.getConfigFile().getFormatBroadcastWhenOnline() || user.isOnline()) {
-						voteSite.broadcastVote(user);
-					}
+		// vote party
+		plugin.getVoteParty().vote(user, event.isRealVote(), event.isForceBungee());
+
+		if (event.isBroadcast() && !plugin.getBungeeSettings().isDisableBroadcast()) {
+			// broadcast vote if enabled in config
+			if (plugin.getConfigFile().isBroadcastVotesEnabled()
+					&& (plugin.getBungeeSettings().isBungeeBroadcast() || !event.isBungee())) {
+				if (!plugin.getConfigFile().getFormatBroadcastWhenOnline() || user.isOnline()) {
+					voteSite.broadcastVote(user);
 				}
 			}
+		}
 
-			if (plugin.getBroadcastHandler() != null) {
-				plugin.getBroadcastHandler().onVote(playerName);
+		if (plugin.getBroadcastHandler() != null) {
+			plugin.getBroadcastHandler().onVote(playerName);
+		}
+
+		// update last vote time
+		if (event.getTime() != 0) {
+			user.setTime(voteSite, event.getTime());
+		} else {
+			user.setTime(voteSite);
+		}
+
+		// try logging to file
+		if (plugin.getConfigFile().isLogVotesToFile()) {
+			try {
+				plugin.logVote(LocalDateTime.now().atZone(ZoneId.systemDefault()).toLocalDateTime(), playerName,
+						voteSite.getKey());
+			} catch (Exception e) {
+				e.printStackTrace();
 			}
+		}
 
-			// update last vote time
-			if (event.getTime() != 0) {
-				user.setTime(voteSite, event.getTime());
-			} else {
-				user.setTime(voteSite);
+		// check first vote rewards
+		plugin.getSpecialRewards().checkFirstVote(user, event.isForceBungee());
+		plugin.getSpecialRewards().checkFirstVoteToday(user, event.isForceBungee());
+
+		if (user.isReminded() && plugin.getConfigFile().getVoteRemindingRemindOnlyOnce()) {
+			user.setReminded(false);
+		}
+
+		// check if player has voted on all sites in one day
+		if (((user.isOnline() || voteSite.isGiveOffline()) && plugin.getOptions().isProcessRewards())
+				|| event.isBungee()) {
+			boolean online = true;
+			if (event.isBungee()) {
+				online = event.isWasOnline();
 			}
-
-			// try logging to file
-			if (plugin.getConfigFile().isLogVotesToFile()) {
-				try {
-					plugin.logVote(LocalDateTime.now().atZone(ZoneId.systemDefault()).toLocalDateTime(), playerName,
-							voteSite.getKey());
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
+			user.playerVote(voteSite, online, false, event.isForceBungee());
+			if (event.getVoteNumber() == 1) {
+				user.sendVoteEffects(online);
 			}
-
-			// check first vote rewards
-			plugin.getSpecialRewards().checkFirstVote(user, event.isForceBungee());
-			plugin.getSpecialRewards().checkFirstVoteToday(user, event.isForceBungee());
-
-			if (user.isReminded() && plugin.getConfigFile().getVoteRemindingRemindOnlyOnce()) {
-				user.setReminded(false);
+			if (plugin.getConfigFile().isCloseInventoryOnVote()) {
+				user.closeInv();
 			}
+		} else {
+			user.addOfflineVote(voteSite.getKey());
+			plugin.debug("Offline vote set for " + playerName + " (" + user.getUUID() + ") on " + voteSite.getKey());
+		}
 
-			// check if player has voted on all sites in one day
-			if (((user.isOnline() || voteSite.isGiveOffline()) && plugin.getOptions().isProcessRewards())
-					|| event.isBungee()) {
-				boolean online = true;
-				if (event.isBungee()) {
-					online = event.isWasOnline();
-				}
-				user.playerVote(voteSite, online, false, event.isForceBungee());
-				if (event.getVoteNumber() == 1) {
-					user.sendVoteEffects(online);
-				}
-				if (plugin.getConfigFile().isCloseInventoryOnVote()) {
-					user.closeInv();
-				}
-			} else {
-				user.addOfflineVote(voteSite.getKey());
-				plugin.debug(
-						"Offline vote set for " + playerName + " (" + user.getUUID() + ") on " + voteSite.getKey());
+		// add to total votes
+		if ((plugin.getConfigFile().isCountFakeVotes() || event.isRealVote()) && event.isAddTotals()) {
+			if (plugin.getConfigFile().isAddTotals()) {
+				user.addTotal();
+				user.addTotalDaily();
+				user.addTotalWeekly();
 			}
+			user.addPoints();
+		}
+		user.checkDayVoteStreak(event.isForceBungee());
 
-			// add to total votes
-			if ((plugin.getConfigFile().isCountFakeVotes() || event.isRealVote()) && event.isAddTotals()) {
-				if (plugin.getConfigFile().isAddTotals()) {
-					user.addTotal();
-					user.addTotalDaily();
-					user.addTotalWeekly();
-				}
-				user.addPoints();
-			}
-			user.checkDayVoteStreak(event.isForceBungee());
+		// other rewards
+		plugin.getSpecialRewards().checkAllSites(user, event.isForceBungee());
+		plugin.getSpecialRewards().checkAlmostAllSites(user, event.isForceBungee());
+		plugin.getSpecialRewards().checkCumualativeVotes(user, event.getBungeeTextTotals(), event.isForceBungee());
+		plugin.getSpecialRewards().checkMilestone(user, event.getBungeeTextTotals(), event.isForceBungee());
+		plugin.getCoolDownCheck().vote(user, voteSite);
 
-			// other rewards
-			plugin.getSpecialRewards().checkAllSites(user, event.isForceBungee());
-			plugin.getSpecialRewards().checkAlmostAllSites(user, event.isForceBungee());
-			plugin.getSpecialRewards().checkCumualativeVotes(user, event.getBungeeTextTotals(), event.isForceBungee());
-			plugin.getSpecialRewards().checkMilestone(user, event.getBungeeTextTotals(), event.isForceBungee());
-			plugin.getCoolDownCheck().vote(user, voteSite);
+		if (plugin.getBungeeSettings().isUseBungeecoord()) {
+			if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.MYSQL)) {
 
-			final String uuid = user.getUUID();
-			if (plugin.getBungeeSettings().isUseBungeecoord()) {
-				if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.MYSQL)) {
+				Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
 
-					Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
-
-						@Override
-						public void run() {
-							if (Bukkit.getOnlinePlayers().size() > 0) {
-								plugin.getPluginMessaging().sendPluginMessage("VoteUpdate", uuid);
-							}
+					@Override
+					public void run() {
+						if (Bukkit.getOnlinePlayers().size() > 0) {
+							plugin.getPluginMessaging().sendPluginMessage("VoteUpdate", uuid);
 						}
-					}, 40);
-				}
-			}
-
-			PlayerPostVoteEvent postVoteEvent = new PlayerPostVoteEvent(voteSite, user, event.isRealVote(),
-					event.isForceBungee());
-			plugin.getServer().getPluginManager().callEvent(postVoteEvent);
-
-			plugin.getTimer().schedule(new Runnable() {
-
-				@Override
-				public void run() {
-					VotingPluginUser user = plugin.getVotingPluginUserManager()
-							.getVotingPluginUser(UUID.fromString(uuid));
-					if (!user.isOnline()) {
-						user.clearCache();
 					}
-				}
-			}, 5, TimeUnit.SECONDS);
+				}, 40);
+			}
+		}
 
+		PlayerPostVoteEvent postVoteEvent = new PlayerPostVoteEvent(voteSite, user, event.isRealVote(),
+				event.isForceBungee());
+		plugin.getServer().getPluginManager().callEvent(postVoteEvent);
+
+		if (!user.isOnline()) {
+			user.clearCache();
 		}
 
 		plugin.setUpdate(true);
+
+		plugin.extraDebug("Finished vote processing: " + playerName + "/" + uuid);
 	}
 
 }

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

@@ -64,61 +64,66 @@ public class VotiferEvent implements Listener {
 		plugin.debug("VoteSite: " + voteSite);
 		plugin.debug("IP: " + IP);
 
-		plugin.getVoteTimer().execute(new Runnable() {
+		plugin.getVoteTimer().submit(new Runnable() {
 
 			@Override
 			public void run() {
-				plugin.getServerData().addServiceSite(voteSite);
-				if (plugin.getBungeeSettings().isUseBungeecoord() && !plugin.getBungeeSettings().isVotifierBypass()
-						&& (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)
-								|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.SOCKETS))) {
-					plugin.getLogger().severe(
-							"Ignoring vote from votifier since pluginmessaging or socket bungee method is enabled, this means you aren't setup correctly for those methods, please check: https://github.com/BenCodez/VotingPlugin/wiki/Bungeecord-Setups");
-					return;
-				}
-				String voteSiteNameStr = plugin.getVoteSiteName(false, voteSite);
+				try {
+					plugin.getServerData().addServiceSite(voteSite);
+					if (plugin.getBungeeSettings().isUseBungeecoord() && !plugin.getBungeeSettings().isVotifierBypass()
+							&& (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)
+									|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.SOCKETS))) {
+						plugin.getLogger().severe(
+								"Ignoring vote from votifier since pluginmessaging or socket bungee method is enabled, this means you aren't setup correctly for those methods, please check: https://github.com/BenCodez/VotingPlugin/wiki/Bungeecord-Setups");
+						return;
+					}
+					String voteSiteNameStr = plugin.getVoteSiteName(false, voteSite);
 
-				ArrayList<String> sites = plugin.getConfigVoteSites().getVoteSitesNames(false);
-				boolean createSite = false;
-				if (sites != null) {
-					if (!ArrayUtils.getInstance().containsIgnoreCase(sites, voteSiteNameStr)) {
+					ArrayList<String> sites = plugin.getConfigVoteSites().getVoteSitesNames(false);
+					boolean createSite = false;
+					if (sites != null) {
+						if (!ArrayUtils.getInstance().containsIgnoreCase(sites, voteSiteNameStr)) {
+							createSite = true;
+						}
+					} else {
 						createSite = true;
 					}
-				} else {
-					createSite = true;
-				}
 
-				if (plugin.getConfigFile().isAutoCreateVoteSites() && createSite) {
-					plugin.getLogger().warning("VoteSite with service site '" + voteSiteNameStr
-							+ "' does not exist, attempting to generate...");
-					plugin.getConfigVoteSites().generateVoteSite(voteSiteNameStr);
+					if (plugin.getConfigFile().isAutoCreateVoteSites() && createSite) {
+						plugin.getLogger().warning("VoteSite with service site '" + voteSiteNameStr
+								+ "' does not exist, attempting to generate...");
+						plugin.getConfigVoteSites().generateVoteSite(voteSiteNameStr);
 
-					plugin.getLogger().info("Current known service sites: "
-							+ ArrayUtils.getInstance().makeStringList(plugin.getServerData().getServiceSites()));
-				}
+						plugin.getLogger().info("Current known service sites: "
+								+ ArrayUtils.getInstance().makeStringList(plugin.getServerData().getServiceSites()));
+					}
 
-				if (plugin.getTimeChecker().isProcessing()) {
-					// time change in progress
-					plugin.debug("Adding vote to time queue " + voteUsername + "/" + voteSite);
-					plugin.getTimeQueueHandler().addVote(voteUsername, voteSite);
+					if (plugin.getTimeChecker().isActiveProcessing()
+							&& plugin.getConfigFile().isQueueVotesDuringTimeChange()) {
+						// time change in progress
+						plugin.debug("Adding vote to time queue " + voteUsername + "/" + voteSite);
+						plugin.getTimeQueueHandler().addVote(voteUsername, voteSite);
 
-					return;
-				}
+						return;
+					}
 
-				String voteSiteName = plugin.getVoteSiteName(true, voteSite);
+					String voteSiteName = plugin.getVoteSiteName(true, voteSite);
 
-				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName, true), voteUsername,
-						voteSite, true);
-				plugin.getServer().getPluginManager().callEvent(voteEvent);
+					PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName, true),
+							voteUsername, voteSite, true);
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
 
-				if (voteEvent.isCancelled()) {
-					plugin.debug("Vote cancelled");
-					return;
+					if (voteEvent.isCancelled()) {
+						plugin.debug("Vote cancelled");
+						return;
+					}
+				} catch (Exception e) {
+					plugin.getLogger().severe("Error occured during vote processing");
+					e.printStackTrace();
 				}
 
 			}
 		});
-
 	}
 
 }

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

@@ -172,7 +172,8 @@ public class VoteSite {
 	}
 
 	public String getVoteURL(boolean json) {
-		if (!plugin.getConfigFile().isFormatCommandsVoteForceLinks() || !json) {
+		if (!plugin.getConfigFile().isFormatCommandsVoteForceLinks() || !json
+				|| StringParser.getInstance().containsJson(voteURL)) {
 			return voteURL;
 		} else {
 			if (!voteURL.startsWith("http")) {

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

@@ -2,6 +2,8 @@ package com.bencodez.votingplugin.test;
 
 import java.util.ArrayList;
 
+import org.bukkit.Bukkit;
+
 import com.bencodez.advancedcore.api.rewards.Reward;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
@@ -20,55 +22,95 @@ public class VoteTester {
 	private VotingPluginMain plugin = VotingPluginMain.plugin;
 
 	public void testRewards(int amount, String name, String rewardName) {
-		long time1 = System.currentTimeMillis();
-		ArrayList<Long> timesPerReward = new ArrayList<Long>();
-		VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(name);
-		Reward reward = plugin.getRewardHandler().getReward(rewardName);
-		int rewardsGiven = 0;
-		for (int i = 0; i < amount; i++) {
-			long start1 = System.currentTimeMillis();
-			if (reward.canGiveReward(user, new RewardOptions())) {
-				rewardsGiven++;
-				plugin.getRewardHandler().giveReward(user, reward, new RewardOptions().setIgnoreRequirements(true));
+		plugin.getVoteTimer().submit(new Runnable() {
+
+			@Override
+			public void run() {
+				long time1 = System.currentTimeMillis();
+				ArrayList<Long> timesPerReward = new ArrayList<Long>();
+				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(name);
+				Reward reward = plugin.getRewardHandler().getReward(rewardName);
+				int rewardsGiven = 0;
+				for (int i = 0; i < amount; i++) {
+					long start1 = System.currentTimeMillis();
+					if (reward.canGiveReward(user, new RewardOptions())) {
+						rewardsGiven++;
+						plugin.getRewardHandler().giveReward(user, reward,
+								new RewardOptions().setIgnoreRequirements(true));
+					}
+					long start2 = System.currentTimeMillis();
+					timesPerReward.add(start2 - start1);
+				}
+				long time2 = System.currentTimeMillis();
+				long time = time2 - time1;
+				long timeTotal = 0;
+				for (Long t : timesPerReward) {
+					timeTotal += t.longValue();
+				}
+				long timePerRewardAvg = timeTotal / timesPerReward.size();
+				VotingPluginMain.plugin.getLogger()
+						.info("Time to process rewards (" + amount + "): " + time + " ms, average per reward "
+								+ timePerRewardAvg + " ms. " + VotingPluginMain.plugin.getStorageType() + ", "
+								+ UserManager.getInstance().getAllUUIDs().size() + " users. " + rewardsGiven
+								+ " rewards given");
 			}
-			long start2 = System.currentTimeMillis();
-			timesPerReward.add(start2 - start1);
-		}
-		long time2 = System.currentTimeMillis();
-		long time = time2 - time1;
-		long timeTotal = 0;
-		for (Long t : timesPerReward) {
-			timeTotal += t.longValue();
-		}
-		long timePerRewardAvg = timeTotal / timesPerReward.size();
-		VotingPluginMain.plugin.getLogger().info("Time to process rewards (" + amount + "): " + time
-				+ " ms, average per reward " + timePerRewardAvg + " ms. " + VotingPluginMain.plugin.getStorageType()
-				+ ", " + UserManager.getInstance().getAllUUIDs().size() + " users. " + rewardsGiven + " rewards given");
+
+		});
+
 	}
 
 	public void testVotes(int amount, String name, String site) {
-		long time1 = System.currentTimeMillis();
-		ArrayList<Long> timesPerVote = new ArrayList<Long>();
+		plugin.getVoteTimer().submit(new Runnable() {
+
+			@Override
+			public void run() {
+				long time1 = System.currentTimeMillis();
+				ArrayList<Long> timesPerVote = new ArrayList<Long>();
+				for (int i = 0; i < amount; i++) {
+					long start1 = System.currentTimeMillis();
+					PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(site, false), name,
+							plugin.getVoteSiteServiceSite(site), false);
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
+					long start2 = System.currentTimeMillis();
+					timesPerVote.add(start2 - start1);
+				}
+				long time2 = System.currentTimeMillis();
+				long time = time2 - time1;
+				long timeTotal = 0;
+				for (Long t : timesPerVote) {
+					timeTotal += t.longValue();
+				}
+				long timePerVoteAvg = timeTotal / timesPerVote.size();
+				VotingPluginMain.plugin.getLogger()
+						.info("Time to process votes (" + amount + "): " + time + " ms, average per vote "
+								+ timePerVoteAvg + " ms. " + VotingPluginMain.plugin.getStorageType() + ", "
+								+ UserManager.getInstance().getAllUUIDs().size() + " users. "
+								+ VotingPluginMain.plugin.getVoteSites().size() + " votesites");
+			}
+
+		});
+
+	}
+
+	public void testSpam(int amount, String name, String site) {
 		for (int i = 0; i < amount; i++) {
-			long start1 = System.currentTimeMillis();
-			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(site, false), name,
-					plugin.getVoteSiteServiceSite(site), false);
-			plugin.getServer().getPluginManager().callEvent(voteEvent);
-			long start2 = System.currentTimeMillis();
-			timesPerVote.add(start2 - start1);
+			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getVoteTimer().submit(new Runnable() {
+
+						@Override
+						public void run() {
+							PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(site, false), name,
+									plugin.getVoteSiteServiceSite(site), false);
+							plugin.getServer().getPluginManager().callEvent(voteEvent);
+						}
+					});
+				}
+			});
+
 		}
-		long time2 = System.currentTimeMillis();
-		long time = time2 - time1;
-		long timeTotal = 0;
-		for (Long t : timesPerVote) {
-			timeTotal += t.longValue();
-		}
-		long timePerVoteAvg = timeTotal / timesPerVote.size();
-		VotingPluginMain.plugin.getLogger()
-				.info("Time to process votes (" + amount + "): " + time + " ms, average per vote " + timePerVoteAvg
-						+ " ms. " + VotingPluginMain.plugin.getStorageType() + ", "
-						+ UserManager.getInstance().getAllUUIDs().size() + " users. "
-						+ VotingPluginMain.plugin.getVoteSites().size() + " votesites");
 	}
 
 }

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

@@ -97,7 +97,7 @@ public class UserManager {
 	}
 
 	public VotingPluginUser getVotingPluginUser(Player player) {
-		return getVotingPluginUser(player.getName());
+		return getVotingPluginUser(player.getUniqueId(), player.getName());
 	}
 
 	@SuppressWarnings("deprecation")

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

@@ -693,11 +693,15 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	}
 
 	public void loginRewards() {
-		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(), "LoginRewards").send(this);
+		if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(), "LoginRewards")) {
+			new RewardBuilder(plugin.getSpecialRewardsConfig().getData(), "LoginRewards").send(this);
+		}
 	}
 
 	public void logoutRewards() {
-		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(), "LogoutRewards").send(this);
+		if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(), "LogoutRewards")) {
+			new RewardBuilder(plugin.getSpecialRewardsConfig().getData(), "LogoutRewards").send(this);
+		}
 	}
 
 	/**
@@ -711,7 +715,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 
 		Player player = getPlayer();
 		if (player != null) {
-			plugin.extraDebug("Checking offline vote site votes for " + player.getName());
+			plugin.extraDebug("Checking offline votes for " + player.getName());
 
 			boolean topVoterIngorePerm = player.hasPermission("VotingPlugin.TopVoter.Ignore");
 			if (isTopVoterIgnore() != topVoterIngorePerm) {

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

@@ -59,7 +59,7 @@ public class VoteParty implements Listener {
 		}
 	}
 
-	public void check(boolean forceBungee) {
+	public void check(VotingPluginUser user, boolean forceBungee) {
 		if (getTotalVotes() < getVotesRequired()) {
 			return;
 		}
@@ -81,7 +81,7 @@ public class VoteParty implements Listener {
 			return;
 		}
 
-		giveRewards(forceBungee);
+		giveRewards(user, forceBungee);
 
 		if (plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRquired() > 0) {
 			plugin.getServerData().setVotePartyExtraRequired(plugin.getServerData().getVotePartyExtraRequired()
@@ -186,7 +186,7 @@ public class VoteParty implements Listener {
 				.setServer(useBungee).send(user);
 	}
 
-	public void giveRewards(boolean forceBungee) {
+	public void giveRewards(VotingPluginUser orgUser, boolean forceBungee) {
 		MiscUtils.getInstance().broadcast(plugin.getSpecialRewardsConfig().getVotePartyBroadcast());
 
 		for (final String cmd : plugin.getSpecialRewardsConfig().getVotePartyCommands()) {
@@ -204,8 +204,14 @@ public class VoteParty implements Listener {
 			plugin.debug("Trying to give all players vote party");
 			ArrayList<String> alreadyGotten = new ArrayList<String>();
 			for (Player p : Bukkit.getOnlinePlayers()) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(p);
-				user.dontCache();
+				VotingPluginUser user;
+				if (orgUser != null && orgUser.getJavaUUID().equals(p.getUniqueId())) {
+					user = orgUser;
+				} else {
+					user = UserManager.getInstance().getVotingPluginUser(p);
+					user.dontCache();
+				}
+
 				if (!plugin.getSpecialRewardsConfig().isVotePartyGiveOnlinePlayersOnly() || user.isOnline()) {
 					giveReward(user, forceBungee);
 				}
@@ -213,8 +219,14 @@ public class VoteParty implements Listener {
 			}
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				if (!alreadyGotten.contains(uuid)) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-					user.dontCache();
+					VotingPluginUser user;
+					if (orgUser != null && orgUser.getJavaUUID().toString().equals(uuid)) {
+						user = orgUser;
+					} else {
+						user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+						user.dontCache();
+					}
+
 					if (!plugin.getSpecialRewardsConfig().isVotePartyGiveOnlinePlayersOnly() || user.isOnline()) {
 						giveReward(user, forceBungee);
 					}
@@ -224,8 +236,13 @@ public class VoteParty implements Listener {
 			plugin.debug("Trying to give all voted players vote party");
 			plugin.debug(ArrayUtils.getInstance().makeStringList(getVotedUsers()));
 			for (String uuid : getVotedUsers()) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-				user.dontCache();
+				VotingPluginUser user;
+				if (orgUser != null && orgUser.getJavaUUID().toString().equals(uuid)) {
+					user = orgUser;
+				} else {
+					user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					user.dontCache();
+				}
 				if (!plugin.getSpecialRewardsConfig().isVotePartyGiveOnlinePlayersOnly() || user.isOnline()) {
 					giveReward(user, forceBungee);
 				}
@@ -303,7 +320,7 @@ public class VoteParty implements Listener {
 				if (plugin.getSpecialRewardsConfig().getVotePartyCountOfflineVotes() || user.isOnline()) {
 					addTotal(user);
 					addVotePlayer(user);
-					check(forceBungee);
+					check(user, forceBungee);
 				}
 			}
 		}