Update version number to 6.15

Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3 in /VotingPlugin

VotingPlugin/Resources/BungeeSettings.yml

@@ -14,8 +14,16 @@ UseBungeecord: false
 # SOCKETS
 # PLUGINMESSAGING (Recommended)
 # MYSQL
+# REDIS
 BungeeMethod: PLUGINMESSAGING
 
+# Use Redis for between server communication, set BungeeMethod to REDIS to use this
+Redis:
+  Host: localhost
+  Port: 6379
+  Username: ''
+  Password: ''
+
 # Enables more debug messages for communication between servers
 # Use /votingpluginbungee status for testing communication
 BungeeDebug: false

VotingPlugin/Resources/GUI.yml

@@ -335,6 +335,8 @@ CHEST:
       Cost: 3
       # Permission required, leave blank for no permission
       Permission: ''
+      # Hide if player doesn't have permission (only if permission is set)
+      HideOnNoPermission: true
       # Whether or not to keep GUI open after purchase
       CloseGUI: true
       # Require confirmation on purchase, overrides global option above

VotingPlugin/Resources/VoteSites.yml

@@ -118,7 +118,7 @@ VoteSites:
           Messages:
             Player: 'You got unlucky'
             
-      # Give 1 diamond
+      # Give 1 diamond regardless of above
       Items:
         item1:
           Material: DIAMOND

VotingPlugin/Resources/bungeeconfig.yml

@@ -19,10 +19,6 @@ Prefix: ''
 #Attempt to use mariadb driver
 #UseMariaDB: false
 
-# Online mode for UUIDS
-# Offline mode setups are not fully tested and are not supported currently
-OnlineMode: true
-
 
 ####################################################################################
 # Global mysql data handle for between server commmunications
@@ -86,8 +82,16 @@ WhiteListedServers: []
 # SOCKETS 
 # PLUGINMESSAGING (Recommended)
 # MYSQL
+# REDIS
 BungeeMethod: PLUGINMESSAGING
 
+# Use Redis for between server communication, set BungeeMethod to REDIS to use this
+Redis:
+  Host: localhost
+  Port: 6379
+  Username: ''
+  Password: ''
+
 # If false, votes will be checked if user is a valid player that has joined to server
 # Works for PLUGINMESSAGING and SOCKETS methods only
 # This requires spigot servers AllowUnJoined to be set to true in Config.yml
@@ -140,6 +144,9 @@ VoteParty:
   BungeeCommands: []
   Broadcast: '&aVote party has been reached!'
   
+# Online mode for UUIDS
+# Offline mode setups are not fully tested and are not supported currently
+OnlineMode: true
 
 ##########################################
 # PLUGINMESSAGING Settings

VotingPlugin/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>${version.art}</artifactId>
-	<version>6.14.2</version>
+	<version>6.15</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -221,7 +221,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.20.2-R0.1-SNAPSHOT</version>
+			<version>1.20.4-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -415,7 +415,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.6.2</version>
+						<version>3.6.3</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -465,7 +465,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.6.2</version>
+						<version>3.6.3</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>

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

@@ -14,6 +14,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 
+import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.misc.encryption.EncryptionHandler;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
@@ -22,9 +23,13 @@ import com.bencodez.advancedcore.api.user.UserStorage;
 import com.bencodez.advancedcore.api.user.usercache.value.DataValue;
 import com.bencodez.advancedcore.api.user.usercache.value.DataValueBoolean;
 import com.bencodez.advancedcore.api.user.userstorage.mysql.api.config.MysqlConfigSpigot;
+import com.bencodez.advancedcore.bungeeapi.GlobalMessage.GlobalMessageHandler;
+import com.bencodez.advancedcore.bungeeapi.GlobalMessage.GlobalMessageListener;
 import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalDataHandler;
 import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalMySQL;
 import com.bencodez.advancedcore.bungeeapi.pluginmessage.PluginMessageHandler;
+import com.bencodez.advancedcore.bungeeapi.redis.RedisHandler;
+import com.bencodez.advancedcore.bungeeapi.redis.RedisListener;
 import com.bencodez.advancedcore.bungeeapi.sockets.ClientHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
@@ -61,6 +66,14 @@ public class BungeeHandler implements Listener {
 	@Getter
 	private ScheduledExecutorService timer;
 
+	@Getter
+	private RedisHandler redisHandler;
+
+	@Getter
+	private GlobalMessageHandler globalMessageHandler;
+
+	private Thread redisThread;
+
 	public BungeeHandler(VotingPluginMain plugin) {
 		this.plugin = plugin;
 	}
@@ -261,9 +274,361 @@ public class BungeeHandler implements Listener {
 
 		loadGlobalMysql();
 
+		globalMessageHandler = new GlobalMessageHandler() {
+
+			@Override
+			public void sendMessage(String subChannel, String... messageData) {
+				if (method.equals(BungeeMethod.MYSQL)) {
+					plugin.getPluginMessaging().sendPluginMessage(subChannel, messageData);
+				} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+					plugin.getPluginMessaging().sendPluginMessage(subChannel, messageData);
+				} else if (method.equals(BungeeMethod.SOCKETS)) {
+					ArrayList<String> list = new ArrayList<String>();
+					list.add(subChannel);
+					list.addAll(ArrayUtils.getInstance().convert(messageData));
+					sendData(ArrayUtils.getInstance().convert(list));
+				} else if (method.equals(BungeeMethod.REDIS)) {
+					ArrayList<String> list = new ArrayList<String>();
+					list.add(subChannel);
+					list.addAll(ArrayUtils.getInstance().convert(messageData));
+					redisHandler.sendMessage("VotingPlugin", ArrayUtils.getInstance().convert(list));
+				}
+			}
+		};
+
+		globalMessageHandler.addListener(new GlobalMessageListener("Vote") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				if (args.size() > 8) {
+					int bungeeVersion = Integer.parseInt(args.get(8));
+					if (bungeeVersion != BungeeVersion.getPluginMessageVersion()) {
+						plugin.getLogger().warning("Incompatible version with bungee, please update all servers" + bungeeVersion + ":" + BungeeVersion.getPluginMessageVersion());
+						return;
+					}
+
+					String player = args.get(0);
+					String uuid = args.get(1);
+					String service = args.get(2);
+					long time = Long.parseLong(args.get(3));
+					plugin.debug("pluginmessaging vote received from " + player + "/" + uuid + " on " + service);
+					VotingPluginUser user = plugin.getVotingPluginUserManager()
+							.getVotingPluginUser(UUID.fromString(uuid), player);
+
+					boolean wasOnline = Boolean.valueOf(args.get(4));
+
+					BungeeMessageData text = new BungeeMessageData(args.get(6));
+
+					bungeeVotePartyCurrent = text.getVotePartyCurrent();
+					bungeeVotePartyRequired = text.getVotePartyRequired();
+					plugin.getPlaceholders().onBungeeVotePartyUpdate();
+					plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
+					plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
+
+					boolean setTotals = Boolean.valueOf(args.get(7));
+
+					user.cache();
+
+					boolean broadcast = true;
+					boolean bungeeBroadcast = false;
+
+					if (args.size() > 9) {
+						bungeeBroadcast = Boolean.valueOf(args.get(9));
+					}
+
+					int num = 1;
+					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()) {
+								if (plugin.getConfigFile().isFormatOnlyOneOfflineBroadcast() && !wasOnline) {
+									if (num == 1) {
+										user.offlineBroadcast(user, plugin.getBungeeSettings().isUseBungeecoord(),
+												numberOfVotes);
+									}
+								} else {
+									VoteSite site = plugin.getVoteSite(service, true);
+									if (site != null) {
+										site.broadcastVote(user, false);
+										broadcast = false;
+									} else {
+										plugin.getLogger().warning("No votesite for " + service);
+									}
+								}
+
+							}
+						}
+					} else {
+						broadcast = false;
+					}
+
+					user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline, broadcast, num);
+					if (plugin.getBungeeSettings().isPerServerPoints()) {
+						user.addPoints(plugin.getConfigFile().getPointsOnVote());
+					}
+
+					plugin.getSpecialRewards().bungeeAllSitesCheck(user, numberOfVotes, num);
+
+					if (Boolean.valueOf(args.get(5))) {
+						plugin.getServerData().addServiceSite(service);
+					}
+				} else {
+					plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
+				}
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener("VoteOnline") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				if (args.size() > 8) {
+					int bungeeVersion = Integer.parseInt(args.get(8));
+					if (bungeeVersion != BungeeVersion.getPluginMessageVersion()) {
+						plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
+						return;
+					}
+					String player = args.get(0);
+					String uuid = args.get(1);
+					String service = args.get(2);
+					long time = Long.parseLong(args.get(3));
+					BungeeMessageData text = new BungeeMessageData(args.get(6));
+
+					bungeeVotePartyCurrent = text.getVotePartyCurrent();
+					bungeeVotePartyRequired = text.getVotePartyRequired();
+					plugin.getPlaceholders().onBungeeVotePartyUpdate();
+					plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
+					plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
+
+					plugin.debug("pluginmessaging voteonline received from " + player + "/" + uuid + " on " + service);
+					VotingPluginUser user = plugin.getVotingPluginUserManager()
+							.getVotingPluginUser(UUID.fromString(uuid), player);
+					user.cache();
+
+					if (plugin.getBungeeSettings().isPerServerPoints()) {
+						user.addPoints(plugin.getConfigFile().getPointsOnVote());
+					}
+
+					boolean setTotals = Boolean.valueOf(args.get(7));
+
+					boolean wasOnline = Boolean.valueOf(args.get(4));
+
+					boolean broadcast = true;
+					boolean bungeeBroadcast = false;
+
+					if (args.size() > 9) {
+						bungeeBroadcast = Boolean.valueOf(args.get(9));
+					}
+
+					int num = 1;
+					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()) {
+								if (plugin.getConfigFile().isFormatOnlyOneOfflineBroadcast() && !wasOnline) {
+									if (num == 1) {
+										user.offlineBroadcast(user, plugin.getBungeeSettings().isUseBungeecoord(),
+												numberOfVotes);
+									}
+								} else {
+									VoteSite site = plugin.getVoteSite(service, true);
+									if (site != null) {
+										site.broadcastVote(user, false);
+										broadcast = false;
+									} else {
+										plugin.getLogger().warning("No votesite for " + service);
+									}
+								}
+
+							}
+						}
+					} else {
+						broadcast = false;
+					}
+
+					user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline, broadcast, num);
+					if (plugin.getBungeeSettings().isPerServerPoints()) {
+						user.addPoints(plugin.getConfigFile().getPointsOnVote());
+					}
+
+					plugin.getSpecialRewards().bungeeAllSitesCheck(user, numberOfVotes, num);
+
+					if (Boolean.valueOf(args.get(5))) {
+						plugin.getServerData().addServiceSite(service);
+					}
+				} else {
+					plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
+				}
+
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener("VoteUpdate") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				String player = args.get(0);
+				plugin.debug("pluginmessaging voteupdate received for " + player);
+				VotingPluginUser user = plugin.getVotingPluginUserManager()
+						.getVotingPluginUser(UUID.fromString(player));
+				user.cache();
+
+				user.offVote();
+
+				if (args.size() > 2) {
+					bungeeVotePartyCurrent = Integer.parseInt(args.get(1));
+					bungeeVotePartyRequired = Integer.parseInt(args.get(2));
+					plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
+					plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
+				}
+
+				plugin.setUpdate(true);
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener("BungeeTimeChange") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				checkGlobalData();
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener("VoteBroadcast") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				if (args.size() > 2) {
+					String uuid = args.get(0);
+					String service = args.get(2);
+					VotingPluginUser user = plugin.getVotingPluginUserManager()
+							.getVotingPluginUser(UUID.fromString(uuid), args.get(1));
+					VoteSite site = plugin.getVoteSite(service, true);
+					if (site != null) {
+						site.broadcastVote(user, false);
+					} else {
+						plugin.getLogger().warning("No votesite for " + service);
+					}
+				}
+			}
+		});
+		globalMessageHandler.addListener(new GlobalMessageListener("VoteBroadcastOffline") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				if (args.size() > 2) {
+					String uuid = args.get(0);
+					String votes = args.get(2);
+					VotingPluginUser user = plugin.getVotingPluginUserManager()
+							.getVotingPluginUser(UUID.fromString(uuid), args.get(1));
+					user.offlineBroadcast(user, false, Integer.parseInt(votes));
+				}
+			}
+		});
+		globalMessageHandler.addListener(new GlobalMessageListener("Status") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				String server = args.get(0);
+				sendMessage(globalMessageHandler, "statusokay", server);
+			}
+		});
+		globalMessageHandler.addListener(new GlobalMessageListener("ServerName") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				String server = args.get(0);
+				if (!plugin.getOptions().getServer().equals(server)) {
+					plugin.getLogger().warning("Server name doesn't match in BungeeSettings.yml, should be " + server);
+				}
+			}
+		});
+		globalMessageHandler.addListener(new GlobalMessageListener("VotePartyBungee") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				for (final String cmd : plugin.getBungeeSettings().getBungeeVotePartyGlobalCommands()) {
+					plugin.getBukkitScheduler().runTask(plugin, new Runnable() {
+
+						@Override
+						public void run() {
+							Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), cmd);
+						}
+
+					});
+				}
+				for (Player p : Bukkit.getOnlinePlayers()) {
+					new RewardBuilder(plugin.getBungeeSettings().getData(), "BungeeVotePartyRewards").send(p);
+				}
+			}
+		});
+		globalMessageHandler.addListener(new GlobalMessageListener("VotePartyBroadcast") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				String broadcast = args.get(0);
+				MiscUtils.getInstance().broadcast(broadcast);
+			}
+		});
+
 		if (method.equals(BungeeMethod.MYSQL)) {
 			plugin.registerBungeeChannels("vp:vp");
+		} else if (method.equals(BungeeMethod.REDIS)) {
+			redisHandler = new RedisHandler(plugin.getBungeeSettings().getRedisHost(),
+					plugin.getBungeeSettings().getRedisPort(), plugin.getBungeeSettings().getRedisPassword(),
+					plugin.getBungeeSettings().getRedisPassword()) {
+
+				@Override
+				protected void onMessage(String channel, String[] message) {
+					plugin.getLogger().info(channel
+							+ ArrayUtils.getInstance().makeStringList(ArrayUtils.getInstance().convert(message)));
+					if (message.length > 0) {
+						ArrayList<String> list = new ArrayList<String>();
+						for (int i = 1; i < message.length; i++) {
+							list.add(message[i]);
+						}
+						globalMessageHandler.onMessage(message[0], list);
+					}
+				}
+
+				@Override
+				public void debug(String message) {
+					if (plugin.getBungeeSettings().isBungeeDebug()) {
+						plugin.debug(message);
+					}
+				}
+			};
+			redisThread = new Thread(new Runnable() {
+
+				@Override
+				public void run() {
+					if (plugin.isEnabled()) {
+						redisHandler.loadListener(new RedisListener(redisHandler,
+								"VotingPlugin_" + plugin.getBungeeSettings().getServer()));
+					}
+				}
+			});
+			redisThread.start();
+
 		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+
 			plugin.registerBungeeChannels("vp:vp");
 
 			bungeeVotePartyCurrent = plugin.getServerData().getBungeeVotePartyCurrent();
@@ -274,279 +639,71 @@ public class BungeeHandler implements Listener {
 			plugin.getPluginMessaging().add(new PluginMessageHandler("Vote") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					if (args.size() > 8) {
-						int bungeeVersion = Integer.parseInt(args.get(8));
-						if (bungeeVersion != BungeeVersion.getPluginMessageVersion()) {
-							plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
-							return;
-						}
-
-						String player = args.get(0);
-						String uuid = args.get(1);
-						String service = args.get(2);
-						long time = Long.parseLong(args.get(3));
-						plugin.debug("pluginmessaging vote received from " + player + "/" + uuid + " on " + service);
-						VotingPluginUser user = plugin.getVotingPluginUserManager()
-								.getVotingPluginUser(UUID.fromString(uuid), player);
-
-						boolean wasOnline = Boolean.valueOf(args.get(4));
-
-						BungeeMessageData text = new BungeeMessageData(args.get(6));
-
-						bungeeVotePartyCurrent = text.getVotePartyCurrent();
-						bungeeVotePartyRequired = text.getVotePartyRequired();
-						plugin.getPlaceholders().onBungeeVotePartyUpdate();
-						plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
-						plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
-
-						boolean setTotals = Boolean.valueOf(args.get(7));
-
-						user.cache();
-
-						boolean broadcast = true;
-						boolean bungeeBroadcast = false;
-
-						if (args.size() > 9) {
-							bungeeBroadcast = Boolean.valueOf(args.get(9));
-						}
-
-						int num = 1;
-						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()) {
-									if (plugin.getConfigFile().isFormatOnlyOneOfflineBroadcast() && !wasOnline) {
-										if (num == 1) {
-											user.offlineBroadcast(user, plugin.getBungeeSettings().isUseBungeecoord(),
-													numberOfVotes);
-										}
-									} else {
-										VoteSite site = plugin.getVoteSite(service, true);
-										if (site != null) {
-											site.broadcastVote(user, false);
-											broadcast = false;
-										} else {
-											plugin.getLogger().warning("No votesite for " + service);
-										}
-									}
-
-								}
-							}
-						} else {
-							broadcast = false;
-						}
-
-						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline, broadcast, num);
-						if (plugin.getBungeeSettings().isPerServerPoints()) {
-							user.addPoints(plugin.getConfigFile().getPointsOnVote());
-						}
-
-						plugin.getSpecialRewards().bungeeAllSitesCheck(user, numberOfVotes, num);
-
-						if (Boolean.valueOf(args.get(5))) {
-							plugin.getServerData().addServiceSite(service);
-						}
-					} else {
-						plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
-					}
-
+					globalMessageHandler.onMessage("Vote", args);
 				}
 			});
 
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteOnline") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					if (args.size() > 8) {
-						int bungeeVersion = Integer.parseInt(args.get(8));
-						if (bungeeVersion != BungeeVersion.getPluginMessageVersion()) {
-							plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
-							return;
-						}
-						String player = args.get(0);
-						String uuid = args.get(1);
-						String service = args.get(2);
-						long time = Long.parseLong(args.get(3));
-						BungeeMessageData text = new BungeeMessageData(args.get(6));
-
-						bungeeVotePartyCurrent = text.getVotePartyCurrent();
-						bungeeVotePartyRequired = text.getVotePartyRequired();
-						plugin.getPlaceholders().onBungeeVotePartyUpdate();
-						plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
-						plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
-
-						plugin.debug(
-								"pluginmessaging voteonline received from " + player + "/" + uuid + " on " + service);
-						VotingPluginUser user = plugin.getVotingPluginUserManager()
-								.getVotingPluginUser(UUID.fromString(uuid), player);
-						user.cache();
-
-						if (plugin.getBungeeSettings().isPerServerPoints()) {
-							user.addPoints(plugin.getConfigFile().getPointsOnVote());
-						}
-
-						boolean setTotals = Boolean.valueOf(args.get(7));
-
-						boolean wasOnline = Boolean.valueOf(args.get(4));
-
-						boolean broadcast = true;
-						boolean bungeeBroadcast = false;
-
-						if (args.size() > 9) {
-							bungeeBroadcast = Boolean.valueOf(args.get(9));
-						}
-
-						int num = 1;
-						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()) {
-									if (plugin.getConfigFile().isFormatOnlyOneOfflineBroadcast() && !wasOnline) {
-										if (num == 1) {
-											user.offlineBroadcast(user, plugin.getBungeeSettings().isUseBungeecoord(),
-													numberOfVotes);
-										}
-									} else {
-										VoteSite site = plugin.getVoteSite(service, true);
-										if (site != null) {
-											site.broadcastVote(user, false);
-											broadcast = false;
-										} else {
-											plugin.getLogger().warning("No votesite for " + service);
-										}
-									}
-
-								}
-							}
-						} else {
-							broadcast = false;
-						}
-
-						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline, broadcast, num);
-						if (plugin.getBungeeSettings().isPerServerPoints()) {
-							user.addPoints(plugin.getConfigFile().getPointsOnVote());
-						}
-
-						plugin.getSpecialRewards().bungeeAllSitesCheck(user, numberOfVotes, num);
-
-						if (Boolean.valueOf(args.get(5))) {
-							plugin.getServerData().addServiceSite(service);
-						}
-					} else {
-						plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
-					}
+					globalMessageHandler.onMessage("VoteOnline", args);
 				}
 			});
 
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteUpdate") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					String player = args.get(0);
-					plugin.debug("pluginmessaging voteupdate received for " + player);
-					VotingPluginUser user = plugin.getVotingPluginUserManager()
-							.getVotingPluginUser(UUID.fromString(player));
-					user.cache();
-
-					user.offVote();
-
-					if (args.size() > 2) {
-						bungeeVotePartyCurrent = Integer.parseInt(args.get(1));
-						bungeeVotePartyRequired = Integer.parseInt(args.get(2));
-						plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
-						plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
-					}
-
-					plugin.setUpdate(true);
+					globalMessageHandler.onMessage("VoteUpdate", args);
 				}
 			});
 
 			plugin.getPluginMessaging().add(new PluginMessageHandler("BungeeTimeChange") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					checkGlobalData();
+					globalMessageHandler.onMessage("BungeeTimeChange", args);
+
 				}
 			});
 
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteBroadcast") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					if (args.size() > 2) {
-						String uuid = args.get(0);
-						String service = args.get(2);
-						VotingPluginUser user = plugin.getVotingPluginUserManager()
-								.getVotingPluginUser(UUID.fromString(uuid), args.get(1));
-						VoteSite site = plugin.getVoteSite(service, true);
-						if (site != null) {
-							site.broadcastVote(user, false);
-						} else {
-							plugin.getLogger().warning("No votesite for " + service);
-						}
-					}
+					globalMessageHandler.onMessage("VoteBroadcast", args);
 				}
 			});
 
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteBroadcastOffline") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					if (args.size() > 2) {
-						String uuid = args.get(0);
-						String votes = args.get(2);
-						VotingPluginUser user = plugin.getVotingPluginUserManager()
-								.getVotingPluginUser(UUID.fromString(uuid), args.get(1));
-						user.offlineBroadcast(user, false, Integer.parseInt(votes));
-					}
+					globalMessageHandler.onMessage("VoteBroadcastOffline", args);
 				}
 			});
 
 			plugin.getPluginMessaging().add(new PluginMessageHandler("Status") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					String server = args.get(0);
-					plugin.getPluginMessaging().sendPluginMessage("statusokay", server);
+					globalMessageHandler.onMessage("Status", args);
+				}
+			});
 
+			plugin.getPluginMessaging().add(new PluginMessageHandler("ServerName") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					globalMessageHandler.onMessage("ServerName", args);
 				}
 			});
 
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VotePartyBungee") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					for (final String cmd : plugin.getBungeeSettings().getBungeeVotePartyGlobalCommands()) {
-						plugin.getBukkitScheduler().runTask(plugin, new Runnable() {
-
-							@Override
-							public void run() {
-								Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), cmd);
-							}
-
-						});
-					}
-					for (Player p : Bukkit.getOnlinePlayers()) {
-						new RewardBuilder(plugin.getBungeeSettings().getData(), "BungeeVotePartyRewards").send(p);
-					}
+					globalMessageHandler.onMessage("VotePartyBungee", args);
 				}
 			});
 
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VotePartyBroadcast") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					String broadcast = args.get(0);
-					MiscUtils.getInstance().broadcast(broadcast);
+					globalMessageHandler.onMessage("VotePartyBroadcast", args);
 				}
 			});
 

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

@@ -1057,6 +1057,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		checkUpdate.startUp();
 		voteReminding = new VoteReminding(this);
 		voteReminding.loadRemindChecking();
+		voteReminding.loadReminds();
 		specialRewards = new SpecialRewards(this);
 		signs = new Signs(this);
 
@@ -1292,6 +1293,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		if (timeQueueHandler != null) {
 			timeQueueHandler.save();
 		}
+		getVoteReminding().saveReminds();
 		getSigns().storeSigns();
 		HandlerList.unregisterAll(plugin);
 		plugin = null;

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

@@ -1,7 +1,7 @@
 package com.bencodez.votingplugin.bungee;
 
 public enum BungeeMethod {
-	MYSQL, PLUGINMESSAGING, SOCKETS;
+	MYSQL, PLUGINMESSAGING, SOCKETS, REDIS;
 
 	public static BungeeMethod getByName(String str) {
 		for (BungeeMethod method : values()) {
@@ -9,6 +9,6 @@ public enum BungeeMethod {
 				return method;
 			}
 		}
-		return SOCKETS;
+		return PLUGINMESSAGING;
 	}
 }

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

@@ -20,6 +20,24 @@ public class Config {
 	public Config(VotingPluginBungee bungee) {
 		this.bungee = bungee;
 	}
+	
+	public String getRedisHost() {
+		return getData().getString("Redis.Host", "");
+	}
+	
+	public int getRedisPort() {
+		return getData().getInt("Redis.Port", 6379);
+	}
+	
+	public String getRedisUsername() {
+		return getData().getString("Redis.Username", "");
+	}
+	
+	
+	public String getRedisPassword() {
+		return getData().getString("Redis.Password", "");
+	}
+	
 
 	public boolean getAllowUnJoined() {
 		return getData().getBoolean("AllowUnJoined", false);

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

@@ -44,6 +44,8 @@ import com.bencodez.advancedcore.api.user.userstorage.mysql.api.config.MysqlConf
 import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalDataHandlerProxy;
 import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalMySQL;
 import com.bencodez.advancedcore.bungeeapi.mysql.BungeeMySQL;
+import com.bencodez.advancedcore.bungeeapi.redis.RedisHandler;
+import com.bencodez.advancedcore.bungeeapi.redis.RedisListener;
 import com.bencodez.advancedcore.bungeeapi.sockets.ClientHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
@@ -110,6 +112,9 @@ public class VotingPluginBungee extends Plugin implements Listener {
 	@Getter
 	private GlobalDataHandlerProxy globalDataHandler;
 
+	@Getter
+	private RedisHandler redisHandler;
+
 	public synchronized void checkCachedVotes(String server) {
 		if (getProxy().getServerInfo(server) != null) {
 			if (!getProxy().getServerInfo(server).getPlayers().isEmpty()) {
@@ -132,7 +137,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 							}
 							if (toSend) {
-								sendPluginMessageServer(server, "Vote", cache.getPlayerName(), cache.getUuid(),
+								sendMessageServer(server, "Vote", cache.getPlayerName(), cache.getUuid(),
 										cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
 										"" + cache.isRealVote(), cache.getText(),
 										"" + getConfig().getBungeeManageTotals(),
@@ -164,7 +169,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 					int num = 1;
 					int numberOfVotes = c.size();
 					for (OfflineBungeeVote cache : c) {
-						sendPluginMessageServer(server, "VoteOnline", cache.getPlayerName(), cache.getUuid(),
+						sendMessageServer(server, "VoteOnline", cache.getPlayerName(), cache.getUuid(),
 								cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
 								"" + cache.isRealVote(), cache.getText(), "" + getConfig().getBungeeManageTotals(),
 								"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "" + num,
@@ -850,6 +855,43 @@ public class VotingPluginBungee extends Plugin implements Listener {
 								encryptionHandler, config.getDebug()));
 					}
 				}
+			} else if (method.equals(BungeeMethod.REDIS)) {
+				redisHandler = new RedisHandler(config.getRedisHost(), config.getRedisPort(), config.getRedisUsername(),
+						config.getRedisPassword()) {
+
+					@Override
+					protected void onMessage(String channel, String[] message) {
+						if (message.length > 0) {
+							if (message[0].equalsIgnoreCase("statusokay")) {
+								String server = message[1];
+								getLogger().info("Status okay for " + server);
+							} else if (message[0].equalsIgnoreCase("login")) {
+								String player = message[1];
+								String uuid = message[2];
+								String server = "";
+								if (message.length > 3) {
+									server = message[3];
+								}
+								debug("Login: " + player + "/" + uuid + " " + server);
+								ProxiedPlayer p = getProxy().getPlayer(player);
+								login(p);
+							}
+						}
+					}
+
+					@Override
+					public void debug(String message) {
+						debug2(message);
+					}
+				};
+				getProxy().getScheduler().runAsync(this, new Runnable() {
+
+					@Override
+					public void run() {
+						redisHandler.loadListener(new RedisListener(redisHandler, "VotingPlugin"));
+					}
+				});
+
 			}
 			currentVotePartyVotesRequired = getConfig().getVotePartyVotesRequired()
 					+ voteCacheFile.getVotePartyInreaseVotesRequired();
@@ -905,6 +947,17 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		if (!buildNumber.equals("NOTSET")) {
 			getLogger().info("Detected using dev build number: " + buildNumber);
 		}
+		sendServerNameMessage();
+
+	}
+
+	public void sendServerNameMessage() {
+		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			for (String s : getAvailableAllServers()) {
+				sendPluginMessageServer(s, "ServerName", s);
+			}
+		}
+
 	}
 
 	public void loadMultiProxySupport() {
@@ -1110,6 +1163,21 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		loadMultiProxySupport();
 	}
 
+	public void sendMessageServer(String server, String channel, String... messageData) {
+		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			sendPluginMessageServer(server, channel, messageData);
+		} else if (method.equals(BungeeMethod.REDIS)) {
+			sendRedisMessageServer(server, channel, messageData);
+		}
+	}
+
+	public void sendRedisMessageServer(String server, String channel, String... messageData) {
+		ArrayList<String> list = new ArrayList<String>();
+		list.add(channel);
+		list.addAll(ArrayUtils.getInstance().convert(messageData));
+		redisHandler.sendMessage("VotingPlugin_" + server, ArrayUtils.getInstance().convert(list));
+	}
+
 	public void sendPluginMessageServer(String server, String channel, String... messageData) {
 		ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
 		DataOutputStream out = new DataOutputStream(byteOutStream);
@@ -1185,7 +1253,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 	public void status(CommandSender sender) {
 		if (method.equals(BungeeMethod.SOCKETS)) {
 			sendServerMessage("status");
-		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+		} else if (method.equals(BungeeMethod.PLUGINMESSAGING) || method.equals(BungeeMethod.REDIS)) {
 			for (String s : getAvailableAllServers()) {
 				ServerInfo info = getProxy().getServerInfo(s);
 				if (info.getPlayers().isEmpty()) {
@@ -1193,7 +1261,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				} else {
 					// send
 					getLogger().info("Sending request for status message on " + s);
-					sendPluginMessageServer(s, "Status", s);
+					sendMessageServer(s, "Status", s);
 				}
 			}
 		}
@@ -1306,7 +1374,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 			}
 
 			ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
-			if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			if (method.equals(BungeeMethod.PLUGINMESSAGING) || method.equals(BungeeMethod.REDIS)) {
 
 				if (config.getSendVotesToAllServers()) {
 					for (String s : getAvailableAllServers()) {
@@ -1317,7 +1385,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 							debug("Forcing vote to cache");
 						}
 						if (config.getBroadcast()) {
-							sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
+							sendMessageServer(s, "VoteBroadcast", uuid, player, service);
 						}
 						if (info.getPlayers().isEmpty() || forceCache) {
 							// cache
@@ -1332,16 +1400,15 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 						} else {
 							// send
-							sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
-									Boolean.TRUE.toString(), "" + realVote, text.toString(),
-									"" + getConfig().getBungeeManageTotals(),
+							sendMessageServer(s, "Vote", player, uuid, service, "" + time, Boolean.TRUE.toString(),
+									"" + realVote, text.toString(), "" + getConfig().getBungeeManageTotals(),
 									"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "1", "1");
 						}
 
 					}
 				} else {
 					if (isOnline(p) && getAvailableAllServers().contains(p.getServer().getInfo().getName())) {
-						sendPluginMessageServer(p.getServer().getInfo().getName(), "VoteOnline", player, uuid, service,
+						sendMessageServer(p.getServer().getInfo().getName(), "VoteOnline", player, uuid, service,
 								"" + time, Boolean.TRUE.toString(), "" + realVote, text.toString(),
 								"" + getConfig().getBungeeManageTotals(), "" + BungeeVersion.getPluginMessageVersion(),
 								"" + config.getBroadcast(), "1", "1");
@@ -1362,9 +1429,9 @@ public class VotingPluginBungee extends Plugin implements Listener {
 					}
 					for (String s : getAvailableAllServers()) {
 						if (config.getBroadcast()) {
-							sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
+							sendMessageServer(s, "VoteBroadcast", uuid, player, service);
 						}
-						sendPluginMessageServer(s, "VoteUpdate", uuid, "" + votePartyVotes,
+						sendMessageServer(s, "VoteUpdate", uuid, "" + votePartyVotes,
 								"" + currentVotePartyVotesRequired);
 
 					}

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

@@ -49,9 +49,15 @@ public class VotingPluginBungeeCommand extends Command {
 						sender.sendMessage(new TextComponent(
 								"&aChecking status, waiting for response, check console, method: plugin messaging"));
 						bungee.status(sender);
+						bungee.sendServerNameMessage();
+					} else if (bungee.getMethod().equals(BungeeMethod.REDIS)) {
+						sender.sendMessage(new TextComponent(
+								"&aChecking status, waiting for response, check console, method: redis"));
+						bungee.status(sender);
+						bungee.sendServerNameMessage();
 					} else {
 						sender.sendMessage(
-								new TextComponent("&aNot using socket/pluginmessage method, command unavailable"));
+								new TextComponent("&aNot using socket/pluginmessage/redis method, command unavailable"));
 					}
 				}
 				if (args[0].equalsIgnoreCase("multiproxystatus")) {

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

@@ -52,6 +52,22 @@ public class Config extends VelocityYMLFile {
 	public String getBungeeMethod() {
 		return getString(getNode("BungeeMethod"), "PLUGINMESSAGING");
 	}
+	
+	public String getRedisHost() {
+		return getString(getNode("Redis", "Host"), "");
+	}
+
+	public int getRedisPort() {
+		return getInt(getNode("Redis", "Port"), 6379);
+	}
+	
+	public String getRedisUsername() {
+		return getString(getNode("Redis", "Username"), "");
+	}
+	
+	public String getRedisPassword() {
+		return getString(getNode("Redis", "Password"), "");
+	}
 
 	public String getBungeeHost() {
 		return getString(getNode("BungeeServer", "Host"), "");

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

@@ -20,7 +20,7 @@ public class NonVotedPlayersCache extends VelocityJSONFile {
 		}
 	}
 
-	private void addPlayer(String uuid, String playerName) {
+	public void addPlayer(String uuid, String playerName) {
 		getNode("NonVotedPlayers", playerName, "UUID").setValue(uuid);
 		getNode("NonVotedPlayers", playerName, "LastTime").setValue(System.currentTimeMillis());
 		save();

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

@@ -55,6 +55,8 @@ import com.bencodez.advancedcore.api.user.userstorage.mysql.api.config.MysqlConf
 import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalDataHandlerProxy;
 import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalMySQL;
 import com.bencodez.advancedcore.bungeeapi.mysql.VelocityMySQL;
+import com.bencodez.advancedcore.bungeeapi.redis.RedisHandler;
+import com.bencodez.advancedcore.bungeeapi.redis.RedisListener;
 import com.bencodez.advancedcore.bungeeapi.sockets.ClientHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
@@ -138,6 +140,9 @@ public class VotingPluginVelocity {
 
 	private SocketHandler multiproxySocketHandler;
 
+	@Getter
+	private RedisHandler redisHandler;
+
 	@Inject
 	public VotingPluginVelocity(ProxyServer server, Logger logger, Metrics.Factory metricsFactory,
 			@DataDirectory Path dataDirectory) {
@@ -174,7 +179,7 @@ public class VotingPluginVelocity {
 
 						}
 						if (toSend) {
-							sendPluginMessageServer(serverToCheck, "Vote", cache.getPlayerName(), cache.getUuid(),
+							sendMessageServer(serverToCheck, "Vote", cache.getPlayerName(), cache.getUuid(),
 									cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
 									"" + cache.isRealVote(), cache.getText(), "" + getConfig().getBungeeManageTotals(),
 									"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "" + num,
@@ -204,7 +209,7 @@ public class VotingPluginVelocity {
 					int num = 1;
 					int numberOfVotes = c.size();
 					for (OfflineBungeeVote cache : c) {
-						sendPluginMessageServer(serverToCheck, "VoteOnline", cache.getPlayerName(), cache.getUuid(),
+						sendMessageServer(serverToCheck, "VoteOnline", cache.getPlayerName(), cache.getUuid(),
 								cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
 								"" + cache.isRealVote(), cache.getText(), "" + getConfig().getBungeeManageTotals(),
 								"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "" + num,
@@ -507,6 +512,7 @@ public class VotingPluginVelocity {
 								public void run() {
 									checkCachedVotes(server);
 									checkOnlineVotes(p1, p.getUniqueId().toString(), server);
+									multiProxyLogin(p1);
 								}
 							});
 
@@ -928,6 +934,57 @@ public class VotingPluginVelocity {
 								d.getNode("Port").getInt(1298), encryptionHandler, config.getDebug()));
 					}
 				}
+			} else if (method.equals(BungeeMethod.REDIS)) {
+				redisHandler = new RedisHandler(config.getRedisHost(), config.getRedisPort(), config.getRedisUsername(),
+						config.getRedisPassword()) {
+
+					@Override
+					protected void onMessage(String channel, String[] message) {
+						if (message.length > 0) {
+							if (message[0].equalsIgnoreCase("statusokay")) {
+								String server = message[1];
+								getLogger().info("Status okay for " + server);
+							} else if (message[0].equalsIgnoreCase("login")) {
+								String player = message[1];
+								String uuid = message[2];
+								String serverName = "";
+								if (message.length > 3) {
+									serverName = message[3];
+								}
+								debug("Login: " + player + "/" + uuid + " " + serverName);
+								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();
+										final Player p1 = p;
+										timer.execute(new Runnable() {
+
+											@Override
+											public void run() {
+												checkCachedVotes(server);
+												checkOnlineVotes(p1, p.getUniqueId().toString(), server);
+												multiProxyLogin(p1);
+											}
+										});
+
+									}
+								}
+								return;
+							}
+						}
+					}
+
+					@Override
+					public void debug(String message) {
+						debug2(message);
+					}
+				};
+
+				server.getScheduler().buildTask(this, () -> {
+					redisHandler.loadListener(new RedisListener(redisHandler, "VotingPlugin"));
+				}).schedule();
+
 			}
 
 			currentVotePartyVotesRequired = getConfig().getVotePartyVotesRequired()
@@ -987,6 +1044,16 @@ public class VotingPluginVelocity {
 		if (!buildNumber.equals("NOTSET")) {
 			logger.info("Detected using dev build number: " + buildNumber);
 		}
+		sendServerNameMessage();
+	}
+
+	public void sendServerNameMessage() {
+		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			for (RegisteredServer s : getAvailableAllServers()) {
+				sendPluginMessageServer(s, "ServerName", s.getServerInfo().getName());
+			}
+		}
+
 	}
 
 	public void loadMultiProxySupport() {
@@ -1019,6 +1086,8 @@ public class VotingPluginVelocity {
 							getLogger().info("Multi-proxy status message received");
 						} else if (data[0].equalsIgnoreCase("ClearVote")) {
 							cachedOnlineVotes.remove(data[2]);
+						} else if (data[0].equalsIgnoreCase("login")) {
+							nonVotedPlayersCache.addPlayer(data[1], data[2]);
 						}
 					}
 					if (data.length > 8) {
@@ -1130,6 +1199,21 @@ public class VotingPluginVelocity {
 		loadMultiProxySupport();
 	}
 
+	public void sendMessageServer(RegisteredServer s, String channel, String... messageData) {
+		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			sendPluginMessageServer(s, channel, messageData);
+		} else if (method.equals(BungeeMethod.REDIS)) {
+			sendRedisMessageServer(s, channel, messageData);
+		}
+	}
+
+	public void sendRedisMessageServer(RegisteredServer s, String channel, String... messageData) {
+		ArrayList<String> list = new ArrayList<String>();
+		list.add(channel);
+		list.addAll(ArrayUtils.getInstance().convert(messageData));
+		redisHandler.sendMessage("VotingPlugin_" + s.getServerInfo().getName(), ArrayUtils.getInstance().convert(list));
+	}
+
 	public void sendPluginMessageServer(RegisteredServer s, String channel, String... messageData) {
 		ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
 		DataOutputStream out = new DataOutputStream(byteOutStream);
@@ -1332,7 +1416,7 @@ public class VotingPluginVelocity {
 			if (server.getPlayer(UUID.fromString(uuid)).isPresent()) {
 				p = server.getPlayer(UUID.fromString(uuid)).get();
 			}
-			if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			if (method.equals(BungeeMethod.PLUGINMESSAGING) || method.equals(BungeeMethod.REDIS)) {
 
 				if (config.getSendVotesToAllServers()) {
 					for (RegisteredServer s : getAvailableAllServers()) {
@@ -1355,9 +1439,8 @@ public class VotingPluginVelocity {
 
 						} else {
 							// send
-							sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
-									Boolean.TRUE.toString(), "" + realVote, text.toString(),
-									"" + getConfig().getBungeeManageTotals(),
+							sendMessageServer(s, "Vote", player, uuid, service, "" + time, Boolean.TRUE.toString(),
+									"" + realVote, text.toString(), "" + getConfig().getBungeeManageTotals(),
 									"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "1", "1");
 						}
 						if (config.getBroadcast()) {
@@ -1367,8 +1450,8 @@ public class VotingPluginVelocity {
 				} else {
 
 					if (isOnline(p) && isInAvailableServers(p.getCurrentServer().get().getServerInfo().getName())) {
-						sendPluginMessageServer(p.getCurrentServer().get().getServer(), "VoteOnline", player, uuid,
-								service, "" + time, Boolean.TRUE.toString(), "" + realVote, text.toString(),
+						sendMessageServer(p.getCurrentServer().get().getServer(), "VoteOnline", player, uuid, service,
+								"" + time, Boolean.TRUE.toString(), "" + realVote, text.toString(),
 								"" + getConfig().getBungeeManageTotals(), "" + BungeeVersion.getPluginMessageVersion(),
 								"" + config.getBroadcast(), "1", "1");
 						if (getConfig().getMultiProxySupport() && getConfig().getMultiProxyOneGlobalReward()) {
@@ -1388,10 +1471,10 @@ public class VotingPluginVelocity {
 					}
 
 					for (RegisteredServer s : getAvailableAllServers()) {
-						sendPluginMessageServer(s, "VoteUpdate", uuid, "" + votePartyVotes,
+						sendMessageServer(s, "VoteUpdate", uuid, "" + votePartyVotes,
 								"" + currentVotePartyVotesRequired);
 						if (config.getBroadcast()) {
-							sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
+							sendMessageServer(s, "VoteBroadcast", uuid, player, service);
 						}
 					}
 				}
@@ -1422,6 +1505,18 @@ public class VotingPluginVelocity {
 		}
 	}
 
+	public void multiProxyLogin(Player p) {
+		if (!config.getMultiProxySupport()) {
+			return;
+		}
+		if (config.getPrimaryServer()) {
+			return;
+		}
+		if (!config.getAllowUnJoined()) {
+			sendMultiProxyServerMessage("Login", p.getUniqueId().toString(), p.getUsername());
+		}
+	}
+
 	public boolean isInAvailableServers(String server) {
 		for (RegisteredServer s : getAvailableAllServers()) {
 			if (s.getServerInfo().getName().equalsIgnoreCase(server)) {

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

@@ -55,6 +55,13 @@ public class VotingPluginVelocityCommand implements SimpleCommand {
 							.text("Checking status, waiting for response, check console, method: pluginmessaging")
 							.color(NamedTextColor.AQUA));
 					plugin.status();
+					plugin.sendServerNameMessage();
+				} else if (plugin.getMethod().equals(BungeeMethod.REDIS)) {
+					source.sendMessage(
+							Component.text("Checking status, waiting for response, check console, method: redis")
+									.color(NamedTextColor.AQUA));
+					plugin.status();
+					plugin.sendServerNameMessage();
 				} else {
 					source.sendMessage(Component.text("Not using socket/pluginmessage method, command unavailable")
 							.color(NamedTextColor.AQUA));
@@ -62,6 +69,7 @@ public class VotingPluginVelocityCommand implements SimpleCommand {
 			}
 			if (args[0].equalsIgnoreCase("multiproxystatus")) {
 				plugin.sendMultiProxyServerMessage("Status");
+
 				source.sendMessage(Component.text("Sending status message").color(NamedTextColor.AQUA));
 			}
 			if (args[0].equalsIgnoreCase("help")) {

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

@@ -2049,6 +2049,8 @@ public class CommandLoader {
 					value = !plugin.getVoteReminding().getRemindersEnabled().get(p.getUniqueId());
 				}
 				plugin.getVoteReminding().getRemindersEnabled().put(p.getUniqueId(), value);
+				plugin.getPlaceholders().onUpdate(
+						plugin.getVotingPluginUserManager().getVotingPluginUser(p.getUniqueId(), p.getName()), true);
 
 				if (value) {
 					sendMessage(sender, plugin.getConfigFile().getFormatCommandsVoteToggleRemindersEnabled());

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

@@ -86,7 +86,8 @@ public class VoteShop extends GUIHandler {
 			}
 
 			if (!plugin.getGui().getChestVoteShopNotBuyable(identifier)) {
-				if (hasPerm && (limitPass || !plugin.getGui().isChestVoteShopHideLimitedReached())) {
+				if ((hasPerm || !plugin.getGui().getChestVoteShopHideOnNoPermission(identifier))
+						&& (limitPass || !plugin.getGui().isChestVoteShopHideLimitedReached())) {
 					ItemBuilder builder = new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier));
 
 					inv.addButton(new BInventoryButton(builder) {
@@ -147,13 +148,13 @@ public class VoteShop extends GUIHandler {
 										}
 									} else {
 										plugin.getBukkitScheduler().runTask(plugin, new Runnable() {
-											
+
 											@Override
 											public void run() {
-												new VoteShopConfirm(plugin, player, user, identifier).open(GUIMethod.CHEST);
+												new VoteShopConfirm(plugin, player, user, identifier)
+														.open(GUIMethod.CHEST);
 											}
 										});
-										
 
 									}
 								} else {

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

@@ -31,6 +31,22 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private String bungeeMethod = "PLUGINMESSAGING";
 
+	@ConfigDataString(path = "Redis.Host")
+	@Getter
+	private String RedisHost = "";
+
+	@ConfigDataString(path = "Redis.Username")
+	@Getter
+	private String RedisUsername = "";
+
+	@ConfigDataString(path = "Redis.Password")
+	@Getter
+	private String RedisPassword = "";
+
+	@ConfigDataInt(path = "Redis.Port")
+	@Getter
+	private int RedisPort = 6379;
+
 	@ConfigDataString(path = "BungeeServer.Host")
 	@Getter
 	private String bungeeServerHost = "";
@@ -46,11 +62,10 @@ public class BungeeSettings extends YMLFile {
 	@ConfigDataBoolean(path = "PerServerMilestones")
 	@Getter
 	private boolean perServerMilestones = false;
-	
+
 	@ConfigDataBoolean(path = "GiveExtraAllSitesRewards")
 	@Getter
 	private boolean giveExtraAllSitesRewards = false;
-	
 
 	@ConfigDataBoolean(path = "PerServerRewards")
 	@Getter

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

@@ -326,6 +326,10 @@ public class GUI extends YMLFile {
 	public boolean getChestVoteShopCloseGUI(String shop) {
 		return getData().getBoolean("CHEST.Shop." + shop + ".CloseGUI", true);
 	}
+	
+	public boolean getChestVoteShopHideOnNoPermission(String shop) {
+		return getData().getBoolean("CHEST.Shop." + shop + ".HideOnNoPermission", true);
+	}
 
 	@ConfigDataBoolean(path = "CHEST.VoteShopEnabled")
 	@Getter

VotingPlugin/src/com/bencodez/votingplugin/data/ServerData.java

@@ -6,6 +6,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
+import java.util.UUID;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -72,6 +73,10 @@ public class ServerData {
 		return getData().getStringList("AutoCachePlaceholders");
 	}
 
+	public List<String> getDisabledReminders() {
+		return getData().getStringList("DisabledReminders");
+	}
+
 	public synchronized void addServiceSite(String site) {
 		ArrayList<String> l = getServiceSites();
 		if (!getServiceSites().contains(site)) {
@@ -327,6 +332,15 @@ public class ServerData {
 		saveData();
 	}
 
+	public void saveDisabledReminders(ArrayList<UUID> disabledReminders) {
+		ArrayList<String> uuids = new ArrayList<String>();
+		for (UUID uuid : disabledReminders) {
+			uuids.add(uuid.toString());
+		}
+		getData().set("DisabledReminders", uuids);
+		saveData();
+	}
+
 	/**
 	 * Update values.
 	 */

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

@@ -49,9 +49,10 @@ public class PlayerJoinEvent implements Listener {
 		plugin.getPlaceholders().onUpdate(user, true);
 
 		if (plugin.getBungeeSettings().isUseBungeecoord()
-				&& plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
-			plugin.getPluginMessaging().sendPluginMessage("Login", user.getPlayerName(), user.getUUID(),
-					plugin.getBungeeSettings().getServer());
+				&& (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)
+						|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.REDIS))) {
+			plugin.getBungeeHandler().getGlobalMessageHandler().sendMessage("Login", user.getPlayerName(),
+					user.getUUID(), plugin.getBungeeSettings().getServer());
 		}
 	}
 

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

@@ -238,7 +238,7 @@ public class PlayerVoteListener implements Listener {
 					@Override
 					public void run() {
 						if (Bukkit.getOnlinePlayers().size() > 0) {
-							plugin.getPluginMessaging().sendPluginMessage("VoteUpdate", uuid);
+							plugin.getBungeeHandler().getGlobalMessageHandler().sendMessage("VoteUpdate", uuid);
 						}
 					}
 				}, 2);

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

@@ -286,6 +286,20 @@ public class PlaceHolders {
 			}
 		}.withDescription("Returns true/false if user has broadcast disabled").updateDataKey("DisableBroadcast"));
 
+		placeholders.add(new PlaceHolder<VotingPluginUser>("DisableReminders") {
+
+			@Override
+			public String placeholderRequest(VotingPluginUser user, String identifier) {
+				if (plugin.getVoteReminding().getRemindersEnabled().containsKey(user.getJavaUUID())) {
+					if (!plugin.getVoteReminding().getRemindersEnabled().get(user.getJavaUUID()).booleanValue()) {
+
+						return "True";
+					}
+				}
+				return "False";
+			}
+		}.withDescription("Returns true/false if user has reminders disabled"));
+
 		placeholders.add(new PlaceHolder<VotingPluginUser>("MilestoneCount") {
 
 			@Override

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

@@ -462,7 +462,14 @@ public class TopVoterHandler implements Listener {
 	}
 
 	public void resetGottenMilestones() {
-		plugin.getUserManager().removeAllKeyValues("GottenMileStones", DataType.STRING);
+		plugin.getUserManager().removeAllKeyValues(getGottenMilestonesPath(), DataType.STRING);
+	}
+
+	public String getGottenMilestonesPath() {
+		if (plugin.getBungeeSettings().isPerServerMilestones()) {
+			return plugin.getBungeeSettings().getServerNameStorage() + "_" + "GottenMilestones";
+		}
+		return "GottenMileStones";
 	}
 
 	public void resetVoteShopLimit(String shopIdent) {

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

@@ -1,5 +1,8 @@
 package com.bencodez.votingplugin.votereminding;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
@@ -33,6 +36,35 @@ public class VoteReminding {
 		this.plugin = plugin;
 	}
 
+	public void loadReminds() {
+		List<String> uuidsStr = plugin.getServerData().getDisabledReminders();
+
+		for (String str : uuidsStr) {
+			remindersEnabled.put(UUID.fromString(str), Boolean.FALSE);
+		}
+
+		plugin.getTimer().scheduleAtFixedRate(new Runnable() {
+
+			@Override
+			public void run() {
+				saveReminds();
+			}
+		}, 24, 24, TimeUnit.HOURS);
+	}
+
+	public void saveReminds() {
+		ArrayList<UUID> remindersDisabled = new ArrayList<UUID>();
+		for (Entry<UUID, Boolean> entry : remindersEnabled.entrySet()) {
+			if (remindersEnabled.containsKey(entry.getKey())) {
+				if (!remindersEnabled.get(entry.getKey()).booleanValue()) {
+					remindersDisabled.add(entry.getKey());
+				}
+			}
+		}
+
+		plugin.getServerData().saveDisabledReminders(remindersDisabled);
+	}
+
 	/**
 	 * Check remind.
 	 *