Update version number to 6.15.1

Fix issue with RedisHandler initialization utilizing wrong parameters

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/Config.yml

@@ -50,7 +50,7 @@ VoteReminding:
   # Requires VoteDelays to be setup properly
   # Use /vote next to see when you can be reminded
   # Players require the perm "VotingPlugin.Login.RemindVotes" or "VotingPlugin.Player"
-  # To remind if any votesite is available (rather than all) use the permission "VotingPlugin.Login.RemindVotes.Any"
+  # To remind if all votesites are available (rather than any) use the permission "VotingPlugin.Login.RemindVotes.All"
   Enabled: true
 
   # Will remind player on login if he can vote
@@ -530,13 +530,11 @@ UseVoteStreaks: true
 # If false, storing best totals will be disabled
 UseHighestTotals: true
 
-# Enable Geyser prefix support
-# May take time before geyser players can vote properly
-# If players vote with prefix, then this is probably not needed and
-# may work better disabled
-# Geyser support is currently hit or miss
-GeyserPrefixSupport: false
-GeyserPrefix: '*'
+# Geyser/Bedrock player support
+# Set prefix used for voting
+# Players should vote with prefix
+# https://github.com/BenCodez/VotingPlugin/wiki/Bedrock-Player-Support
+BedrockPlayerPrefix: '.'
 
 # Whether or not to create daily backups. (Only the most recent ones get kept)
 CreateBackups: true

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/SpecialRewards.yml

@@ -83,7 +83,9 @@ VoteParty:
   OnlyOncePerDay: false
   # If true, will give voteparty once per week only
   OnlyOncePerWeek: false
-  # Reset extra votes
+  # Reset extra votes weekly
+  ResetExtraVotesWeekly: false
+  # Reset extra votes monthly
   ResetExtraVotesMonthly: false
   # Count votes from /av vote?
   CountFakeVotes: true
@@ -93,6 +95,10 @@ VoteParty:
   CountOfflineVotes: true
   # Broadcast when vote party reached
   Broadcast: '&cReached the vote party amount!'
+  # Send a broadcast at a certain number of votes left and send a vote reminder
+  VoteReminderBroadcast: '%votesrequired% left to go, go vote!'
+  # List of votes required amounts for when to send vote party reminders
+  VoteReminderAtVotes: []
   # List of commands to execute, these only execute once.
   # %player% does not work here
   GlobalCommands: []

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
@@ -106,17 +110,22 @@ BungeeManageTotals: true
 # Set DisableBroadcast to true on spigot servers (BungeeSettings.yml) as well
 Broadcast: true
 
-# Geyser settings
-# This may or may not work
-# Does not work on velocity currently
-GeyserSupport: false
-GeyserPrefix: '.'
+# Geyser/bedrock player settings
+# https://github.com/BenCodez/VotingPlugin/wiki/Bedrock-Player-Support
+BedrockPlayerPrefix: '.'
 
 # Time votes will be cached on proxy
 # -1 means no time limit
 # Time in days
 VoteCacheTime: -1
 
+# Maxium number of votes possible per day
+# Usually matches the amount of votesites
+# Will limit vote totals to match accordingly
+# Only applies for month total
+# Set to -1 to disable
+MaxAmountOfVotesPerDay: -1
+
 VoteParty:
   # If enabled, will trigger vote party reward 
   # in BungeeSettings.yml under BungeeVotePartyReward
@@ -135,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/Resources/plugin.yml

@@ -257,6 +257,9 @@ permissions:
   VotingPlugin.NoRemind:
     description: Ignore vote reminding
     default: false
+  VotingPlugin.BypassWaitUntilVoteDelay:
+    description: Bypass WaitUntilVoteDelay
+    default: false
   VotingPlugin.Sign.Create:
     description: Permission to create sign
   VotingPlugin.Admin.GenerateServiceSite:

VotingPlugin/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>${version.art}</artifactId>
-	<version>6.14.1</version>
+	<version>6.15.1</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -88,7 +88,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.5.0</version>
+				<version>3.5.1</version>
 				<configuration>
 					<shadedArtifactAttached>false</shadedArtifactAttached>
 					<minimizeJar>true</minimizeJar>
@@ -221,19 +221,19 @@
 		<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>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.28</version>
+			<version>1.18.30</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.md-5</groupId>
 			<artifactId>bungeecord-api</artifactId>
-			<version>1.20-R0.1</version>
+			<version>1.20-R0.2</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -263,7 +263,7 @@
 		<dependency>
 			<groupId>me.clip</groupId>
 			<artifactId>placeholderapi</artifactId>
-			<version>2.11.3</version>
+			<version>2.11.5</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
@@ -415,7 +415,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.6.0</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.0</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;
 	}
@@ -142,8 +155,9 @@ public class BungeeHandler implements Listener {
 				long lastUpdated = Long.valueOf(data.get("LastUpdated").getString()).longValue();
 				plugin.debug("LastUpdated: " + lastUpdated);
 				if (LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli() - lastUpdated > 1000 * 60 * 60
-						* 1) {
-					plugin.getLogger().warning("Ignore bungee time change since it was more than 1 hour ago");
+						* 2) {
+					plugin.getLogger().warning("Ignoring bungee time change since it was more than 2 hours ago");
+					globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), type.toString(), false);
 					return false;
 				}
 
@@ -260,9 +274,367 @@ 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() > 3 && plugin.getBungeeSettings().isPerServerMilestones()) {
+					BungeeMessageData text = new BungeeMessageData(args.get(3));
+					plugin.getSpecialRewards().checkMilestone(user, text, true);
+				}
+
+				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().getRedisUsername(),
+					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();
@@ -273,279 +645,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

@@ -342,6 +342,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	}
 
+	public ArrayList<VoteSite> getVoteSitesEnabled() {
+		ArrayList<VoteSite> sites = new ArrayList<VoteSite>();
+		for (VoteSite site : getVoteSites()) {
+			if (site.isEnabled()) {
+				sites.add(site);
+			}
+		}
+		return sites;
+	}
+
 	public String getVoteSiteName(boolean checkEnabled, String... urls) {
 		ArrayList<String> sites = getConfigVoteSites().getVoteSitesNames(checkEnabled);
 		for (String url : urls) {
@@ -1057,6 +1067,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		checkUpdate.startUp();
 		voteReminding = new VoteReminding(this);
 		voteReminding.loadRemindChecking();
+		voteReminding.loadReminds();
 		specialRewards = new SpecialRewards(this);
 		signs = new Signs(this);
 
@@ -1284,7 +1295,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 		voteTimer.shutdown();
 		try {
-			voteTimer.awaitTermination(10, TimeUnit.SECONDS);
+			voteTimer.awaitTermination(1, TimeUnit.SECONDS);
 		} catch (InterruptedException e) {
 			e.printStackTrace();
 		}

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

@@ -324,11 +324,11 @@ public class VotingPluginMetrics {
 			}
 		}));
 
-		metrics.addCustomChart(new BStatsMetrics.SimplePie("geyserprefixsupport", new Callable<String>() {
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("bedrockplayerprefix", new Callable<String>() {
 
 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getOptions().isGeyserPrefixSupport();
+				return "" + plugin.getOptions().getBedrockPlayerPrefix();
 			}
 		}));
 

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

@@ -3,6 +3,7 @@ package com.bencodez.votingplugin.bungee;
 import java.util.regex.Pattern;
 
 import lombok.Getter;
+import lombok.Setter;
 
 public class BungeeMessageData {
 
@@ -10,20 +11,28 @@ public class BungeeMessageData {
 	// alltimetotal//monthtotal//weeklytotal//dailytotal//points//milestonecount//votepartycurrent//votepartyrequired
 
 	@Getter
+	@Setter
 	private int allTimeTotal = 0;
 	@Getter
+	@Setter
 	private int dailyTotal = 0;
 	@Getter
+	@Setter
 	private int milestoneCount = 0;
 	@Getter
+	@Setter
 	private int monthTotal = 0;
 	@Getter
+	@Setter
 	private int points = 0;
 	@Getter
+	@Setter
 	private int weeklyTotal = 0;
 	@Getter
+	@Setter
 	private int votePartyCurrent = 0;
 	@Getter
+	@Setter
 	private int votePartyRequired = 0;
 
 	public BungeeMessageData(int allTimeTotal, int monthTotal, int weeklyTotal, int dailyTotal, int points,

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);
@@ -37,12 +55,8 @@ public class Config {
 		return getData().getBoolean("Broadcast", false);
 	}
 
-	public boolean getGeyserSupport() {
-		return getData().getBoolean("GeyserSupport", false);
-	}
-
-	public String getGeyserPrefix() {
-		return getData().getString("GeyserPrefix", ".");
+	public String getBedrockPlayerPrefix() {
+		return getData().getString("BedrockPlayerPrefix", ".");
 	}
 
 	public boolean getOnlineMode() {
@@ -81,6 +95,10 @@ public class Config {
 		return getData().getBoolean("MultiProxySupport", false);
 	}
 
+	public int getMaxAmountOfVotesPerDay() {
+		return getData().getInt("MaxAmountOfVotesPerDay", -1);
+	}
+
 	public int getMultiProxySocketHostPort() {
 		return getData().getInt("MultiProxySocketHost.Port", 1297);
 	}

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

@@ -25,9 +25,16 @@ public class NonVotedPlayersCache {
 		}
 	}
 
-	private void addPlayer(String uuid, String playerName) {
+	public void addPlayer(String uuid, String playerName) {
 		getData().set("NonVotedPlayers." + playerName + ".UUID", uuid);
 		getData().set("NonVotedPlayers." + playerName + ".LastTime", System.currentTimeMillis());
+		save();
+	}
+
+	public void addPlayerCheck(String uuid, String playerName) {
+		if (!bungee.getMysql().containsKeyQuery(uuid)) {
+			addPlayer(uuid, playerName);
+		}
 	}
 
 	public void check() {

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;
@@ -71,9 +73,9 @@ import net.md_5.bungee.event.EventHandler;
 
 public class VotingPluginBungee extends Plugin implements Listener {
 
-	private HashMap<String, ArrayList<OfflineBungeeVote>> cachedOnlineVotes = new HashMap<String, ArrayList<OfflineBungeeVote>>();
+	private ConcurrentHashMap<String, ArrayList<OfflineBungeeVote>> cachedOnlineVotes = new ConcurrentHashMap<String, ArrayList<OfflineBungeeVote>>();
 
-	private HashMap<String, ArrayList<OfflineBungeeVote>> cachedVotes = new HashMap<String, ArrayList<OfflineBungeeVote>>();
+	private ConcurrentHashMap<String, ArrayList<OfflineBungeeVote>> cachedVotes = new ConcurrentHashMap<String, ArrayList<OfflineBungeeVote>>();
 
 	private HashMap<String, ClientHandler> clientHandles;
 
@@ -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,46 @@ 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);
+								if (nonVotedPlayersCache != null) {
+									nonVotedPlayersCache.addPlayerCheck(uuid, player);
+								}
+								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 +950,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() {
@@ -936,6 +992,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 							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) {
@@ -952,9 +1010,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 			});
 
 			multiproxyClientHandles = new HashMap<String, ClientHandler>();
-			for (
-
-			String s : config.getMultiProxyServers()) {
+			for (String s : config.getMultiProxyServers()) {
 				Configuration d = config.getMultiProxyServersConfiguration(s);
 				multiproxyClientHandles.put(s, new ClientHandler(d.getString("Host", ""), d.getInt("Port", 1234),
 						encryptionHandler, config.getDebug()));
@@ -989,14 +1045,15 @@ public class VotingPluginBungee extends Plugin implements Listener {
 	public void login(ProxiedPlayer p) {
 		if (p != null && p.getServer() != null && p.getServer().getInfo() != null) {
 			final String server = p.getServer().getInfo().getName();
-			final ProxiedPlayer proixedPlayer = p;
+			final ProxiedPlayer proxiedPlayer = p;
 			getProxy().getScheduler().schedule(this, new Runnable() {
 
 				@Override
 				public void run() {
 					if (isOnline(p)) {
 						checkCachedVotes(server);
-						checkOnlineVotes(proixedPlayer, proixedPlayer.getUniqueId().toString(), server);
+						checkOnlineVotes(proxiedPlayer, proxiedPlayer.getUniqueId().toString(), server);
+						multiProxyLogin(proxiedPlayer);
 					}
 				}
 			}, 1, TimeUnit.SECONDS);
@@ -1004,6 +1061,16 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 	}
 
+	public void multiProxyLogin(ProxiedPlayer p) {
+		if (!config.getMultiProxySupport()) {
+			return;
+		}
+		if (config.getPrimaryServer()) {
+			return;
+		}
+		sendMultiProxyServerMessage("Login", p.getUniqueId().toString(), p.getName());
+	}
+
 	@EventHandler
 	public void onPluginMessage(PluginMessageEvent ev) {
 		if (!ev.getTag().equals("vp:vp".toLowerCase())) {
@@ -1097,6 +1164,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);
@@ -1172,7 +1254,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()) {
@@ -1180,7 +1262,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);
 				}
 			}
 		}
@@ -1211,15 +1293,10 @@ public class VotingPluginBungee extends Plugin implements Listener {
 			}
 
 			if (uuid.isEmpty()) {
-				if (config.getGeyserSupport()) {
-					if (!player.startsWith(config.getGeyserPrefix())) {
-						uuid = getUUID(config.getGeyserPrefix() + player);
-						player = config.getGeyserPrefix() + player;
-					}
+				if (player.startsWith(config.getBedrockPlayerPrefix())) {
+					getLogger().info("Ignoring vote since unable to get UUID of bedrock player");
+					return;
 				}
-			}
-
-			if (uuid.isEmpty()) {
 				if (config.getAllowUnJoined()) {
 					debug("Fetching UUID online, since allowunjoined is enabled");
 					UUID u = null;
@@ -1245,8 +1322,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 			player = getProperName(uuid, player);
 
+			addVoteParty();
 			if (getConfig().getPrimaryServer() || !getConfig().getMultiProxySupport()) {
-				addVoteParty();
 				if (getConfig().getBungeeManageTotals()) {
 
 					if (mysql == null) {
@@ -1267,6 +1344,15 @@ public class VotingPluginBungee extends Plugin implements Listener {
 					int dailyTotal = getValue(data, "DailyTotal", 1);
 					int points = getValue(data, "Points", getConfig().getPointsOnVote());
 					int milestoneCount = getValue(data, "MilestoneCount", 1);
+
+					int maxVotes = getConfig().getMaxAmountOfVotesPerDay();
+					if (maxVotes > 0) {
+						LocalDateTime cTime = getBungeeTimeChecker().getTime();
+						int days = cTime.getDayOfMonth();
+						if (monthTotal > days * maxVotes) {
+							monthTotal = days * maxVotes;
+						}
+					}
 					text = new BungeeMessageData(allTimeTotal, monthTotal, weeklyTotal, dailyTotal, points,
 							milestoneCount, votePartyVotes, currentVotePartyVotesRequired);
 					ArrayList<Column> update = new ArrayList<Column>();
@@ -1289,7 +1375,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()) {
@@ -1300,7 +1386,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
@@ -1315,16 +1401,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");
@@ -1345,10 +1430,10 @@ 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,
-								"" + currentVotePartyVotesRequired);
+						sendMessageServer(s, "VoteUpdate", uuid, "" + votePartyVotes,
+								"" + currentVotePartyVotesRequired, text.toString());
 
 					}
 				}

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"), "");
@@ -60,11 +76,15 @@ public class Config extends VelocityYMLFile {
 	public int getBungeePort() {
 		return getInt(getNode("BungeeServer", "Port"), 1297);
 	}
-	
+
+	public int getMaxAmountOfVotesPerDay() {
+		return getInt(getNode("MaxAmountOfVotesPerDay"), -1);
+	}
+
 	public int getVoteCacheTime() {
 		return getInt(getNode("VoteCacheTime"), -1);
 	}
-	
+
 	public boolean getDebug() {
 		return getBoolean(getNode("Debug"), false);
 	}
@@ -137,16 +157,12 @@ public class Config extends VelocityYMLFile {
 		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 String getBedrockPlayerPrefix() {
+		return getString(getNode("BedrockPlayerPrefix"), ".");
 	}
 
 	public ConfigurationNode getMultiProxyServers(String s) {

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

@@ -20,12 +20,18 @@ 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();
 	}
 
+	public void addPlayerCheck(String uuid, String playerName) {
+		if (!plugin.getMysql().containsKeyQuery(uuid)) {
+			addPlayer(uuid, playerName);
+		}
+	}
+
 	public void check() {
 		for (String player : getKeys(getNode("NonVotedPlayers"))) {
 			long time = getNode("NonVotedPlayers", player, "LastTime").getLong(0);

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;
@@ -93,8 +95,8 @@ import ninja.leaping.configurate.yaml.YAMLConfigurationLoader;
 public class VotingPluginVelocity {
 
 	private static final ChannelIdentifier CHANNEL = MinecraftChannelIdentifier.create("vp", "vp");
-	private HashMap<String, ArrayList<OfflineBungeeVote>> cachedOnlineVotes = new HashMap<String, ArrayList<OfflineBungeeVote>>();
-	private HashMap<RegisteredServer, ArrayList<OfflineBungeeVote>> cachedVotes = new HashMap<RegisteredServer, ArrayList<OfflineBungeeVote>>();
+	private ConcurrentHashMap<String, ArrayList<OfflineBungeeVote>> cachedOnlineVotes = new ConcurrentHashMap<String, ArrayList<OfflineBungeeVote>>();
+	private ConcurrentHashMap<RegisteredServer, ArrayList<OfflineBungeeVote>> cachedVotes = new ConcurrentHashMap<RegisteredServer, ArrayList<OfflineBungeeVote>>();
 
 	private HashMap<String, ClientHandler> clientHandles;
 
@@ -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,60 @@ 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 (nonVotedPlayersCache != null) {
+									nonVotedPlayersCache.addPlayerCheck(uuid, player);
+								}
+								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 +1047,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 +1089,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 +1202,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);
@@ -1247,17 +1334,12 @@ public class VotingPluginVelocity {
 				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()) {
+					if (player.startsWith(config.getBedrockPlayerPrefix())) {
+						logger.info("Ignoring vote since unable to get UUID of bedrock player");
+						return;
+					}
 					debug("Fetching UUID online, since allowunjoined is enabled");
 					UUID u = null;
 					try {
@@ -1282,8 +1364,8 @@ public class VotingPluginVelocity {
 
 			player = getProperName(uuid, player);
 
+			addVoteParty();
 			if (getConfig().getPrimaryServer() || !getConfig().getMultiProxySupport()) {
-				addVoteParty();
 				if (getConfig().getBungeeManageTotals()) {
 
 					if (mysql == null) {
@@ -1303,6 +1385,15 @@ public class VotingPluginVelocity {
 					int dailyTotal = getValue(data, "DailyTotal", 1);
 					int points = getValue(data, "Points", getConfig().getPointsOnVote());
 					int milestoneCount = getValue(data, "MilestoneCount", 1);
+
+					int maxVotes = getConfig().getMaxAmountOfVotesPerDay();
+					if (maxVotes > 0) {
+						LocalDateTime cTime = getBungeeTimeChecker().getTime();
+						int days = cTime.getDayOfMonth();
+						if (monthTotal > days * maxVotes) {
+							monthTotal = days * maxVotes;
+						}
+					}
 					text = new BungeeMessageData(allTimeTotal, monthTotal, weeklyTotal, dailyTotal, points,
 							milestoneCount, votePartyVotes, currentVotePartyVotesRequired);
 					ArrayList<Column> update = new ArrayList<Column>();
@@ -1328,7 +1419,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()) {
@@ -1351,9 +1442,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()) {
@@ -1363,8 +1453,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()) {
@@ -1384,10 +1474,10 @@ public class VotingPluginVelocity {
 					}
 
 					for (RegisteredServer s : getAvailableAllServers()) {
-						sendPluginMessageServer(s, "VoteUpdate", uuid, "" + votePartyVotes,
-								"" + currentVotePartyVotesRequired);
+						sendMessageServer(s, "VoteUpdate", uuid, "" + votePartyVotes,
+								"" + currentVotePartyVotesRequired, text.toString());
 						if (config.getBroadcast()) {
-							sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
+							sendMessageServer(s, "VoteBroadcast", uuid, player, service);
 						}
 					}
 				}
@@ -1418,6 +1508,17 @@ public class VotingPluginVelocity {
 		}
 	}
 
+	public void multiProxyLogin(Player p) {
+		if (!config.getMultiProxySupport()) {
+			return;
+		}
+		if (config.getPrimaryServer()) {
+			return;
+		}
+		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

@@ -5,7 +5,9 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.Map.Entry;
+import java.util.Queue;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -35,6 +37,7 @@ import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.PlayerUtils;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.updater.Updater;
+import com.bencodez.advancedcore.api.user.UserStorage;
 import com.bencodez.advancedcore.api.user.userstorage.Column;
 import com.bencodez.advancedcore.api.user.userstorage.DataType;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
@@ -1689,6 +1692,29 @@ public class CommandLoader {
 					}
 				});
 
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(plugin, new String[] { "RemoveOfflineUUIDs" },
+						"VotingPlugin.Commands.AdminVote.RemoveOfflineUUIDs|" + adminPerm,
+						"Purges database of offline UUIDs, keeps online UUIDs", true, true) {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						if (!plugin.getOptions().isOnlineMode()) {
+							sendMessage(sender, "&cNot in online mode!");
+							return;
+						}
+						int amount = 0;
+						for (String uuid : plugin.getUserManager().getAllUUIDs()) {
+							if (uuid.charAt(14) == '3') {
+								plugin.getUserManager().removeUUID(UUID.fromString(uuid));
+								amount++;
+							}
+
+						}
+						sendMessage(sender, "&cOffline UUIDs purged: " + amount);
+					}
+				});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(plugin, new String[] { "Placeholders", "(player)" },
 						"VotingPlugin.Commands.AdminVote.Placeholders.Players|" + adminPerm,
@@ -1702,6 +1728,51 @@ public class CommandLoader {
 					}
 				});
 
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(plugin, new String[] { "MergeDataFrom", "(UserStorage)" },
+						"VotingPlugin.Commands.AdminVote.MergeDataFrom|" + adminPerm,
+						"Merge player totals from other storage type", true, true) {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						plugin.loadUserAPI(UserStorage.value(args[1]));
+
+						if (plugin.getMysql() != null) {
+							plugin.getMysql().clearCacheBasic();
+						}
+
+						HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager()
+								.getAllKeys(UserStorage.value(args[1]));
+						Queue<Entry<UUID, ArrayList<Column>>> players = new LinkedList<Entry<UUID, ArrayList<Column>>>(
+								cols.entrySet());
+						ArrayList<String> uuids = plugin.getUserManager().getAllUUIDs();
+
+						while (players.size() > 0) {
+							Entry<UUID, ArrayList<Column>> entry = players.poll();
+							VotingPluginUser user = plugin.getVotingPluginUserManager()
+									.getVotingPluginUser(entry.getKey(), false);
+							user.dontCache();
+							if (uuids.contains(entry.getKey().toString())) {
+								user.mergeData(user.getData().convert(entry.getValue()));
+							} else {
+								user.getData().setValues(plugin.getStorageType(),
+										user.getData().convert(entry.getValue()));
+							}
+
+							sendMessage(sender, "Finished merge for " + user.getUUID() + ", " + players.size()
+									+ " more left to go!");
+
+							if (players.size() % 50 == 0) {
+								sendMessage(sender,
+										"Working on converting data, about " + players.size() + " left to go!");
+							}
+						}
+						plugin.getUserManager().getDataManager().clearCache();
+						sendMessage(sender, "Merge finished");
+
+					}
+				});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(plugin, new String[] {},
 				"VotingPlugin.Commands.AdminVote|" + adminPerm, "Base command") {
 
@@ -2049,6 +2120,9 @@ 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);
+				plugin.getVoteReminding().saveReminds();
 
 				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/config/SpecialRewardsConfig.java

@@ -66,6 +66,18 @@ public class SpecialRewardsConfig extends YMLFile {
 	@ConfigDataBoolean(path = "VoteParty.ResetExtraVotesMonthly")
 	@Getter
 	private boolean votePartyResetExtraVotesMonthly = false;
+	
+	@ConfigDataBoolean(path = "VoteParty.ResetExtraVotesWeekly")
+	@Getter
+	private boolean votePartyResetExtraVotesWeekly = false;
+
+	@ConfigDataString(path = "VoteParty.VoteReminderBroadcast")
+	@Getter
+	private String votePartyVoteReminderBroadcast = "%votesrequired% left to go, go vote!";
+
+	@ConfigDataListString(path = "VoteParty.VoteReminderAtVotes")
+	@Getter
+	private ArrayList<String> votePartyVoteReminderAtVotes = new ArrayList<String>();
 
 	@ConfigDataListString(path = "VoteParty.GlobalRandomCommand")
 	@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

@@ -17,6 +17,7 @@ import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.events.PlayerPostVoteEvent;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
 import com.bencodez.votingplugin.objects.VoteSite;
+import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 // TODO: Auto-generated Javadoc
@@ -114,8 +115,18 @@ public class PlayerVoteListener implements Listener {
 		}
 
 		if (voteSite.isWaitUntilVoteDelay() && !user.canVoteSite(voteSite)) {
-			plugin.getLogger().info(user.getPlayerName() + " must wait until votedelay is over, ignoring vote");
-			return;
+			if (!event.isRealVote()) {
+				plugin.getLogger()
+				.info(user.getPlayerName() + " did a not real vote, bypassing WaitUntilVoteDelay");
+			} else {
+				if (user.hasPermission("VotingPlugin.BypassWaitUntilVoteDelay")) {
+					plugin.getLogger()
+							.info(user.getPlayerName() + " has bypass permission for WaitUntilVoteDelay, bypassing");
+				} else {
+					plugin.getLogger().info(user.getPlayerName() + " must wait until votedelay is over, ignoring vote");
+					return;
+				}
+			}
 		}
 
 		final String uuid = user.getUUID();
@@ -208,6 +219,20 @@ public class PlayerVoteListener implements Listener {
 		}
 		user.checkDayVoteStreak(event.isForceBungee());
 
+		if (plugin.getConfigFile().isLimitMonthlyVotes()) {
+			int value = 0;
+			if (event.isBungee()) {
+				value = event.getBungeeTextTotals().getMonthTotal();
+			} else {
+				value = user.getTotal(TopVoter.Monthly);
+			}
+			LocalDateTime cTime = plugin.getTimeChecker().getTime();
+			int days = cTime.getDayOfMonth();
+			if (value >= days * plugin.getVoteSites().size()) {
+				user.setTotal(TopVoter.Monthly, days * plugin.getVoteSites().size());
+			}
+		}
+
 		// other rewards
 		plugin.getSpecialRewards().checkAllSites(user, event.isForceBungee());
 		plugin.getSpecialRewards().checkAlmostAllSites(user, event.isForceBungee());
@@ -223,7 +248,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);
@@ -234,6 +259,10 @@ public class PlayerVoteListener implements Listener {
 				event.isForceBungee(), voteTime);
 		plugin.getServer().getPluginManager().callEvent(postVoteEvent);
 
+		if (user.isOnline()) {
+			plugin.getPlaceholders().onUpdate(user, true);
+		}
+
 		if (!user.isOnline()) {
 			user.clearCache();
 		}

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/specialrewards/SpecialRewards.java

@@ -262,7 +262,9 @@ public class SpecialRewards {
 			if (streak.contains("-")) {
 				// multiple
 				multiple = true;
+
 			}
+			plugin.debug("Streak: " + streak + " multiple: " + multiple);
 			if (StringParser.getInstance().isInt(s)) {
 				int streakRequired = Integer.parseInt(s);
 				if (streakRequired != 0) {
@@ -287,8 +289,7 @@ public class SpecialRewards {
 							}
 						} else {
 							if (curStreak != 0 && curStreak % streakRequired == 0) {
-								giveVoteStreakReward(user, user.isOnline(), type, streakRequired + "-", curStreak,
-										forceBungee);
+								giveVoteStreakReward(user, user.isOnline(), type, streak, curStreak, forceBungee);
 								gotReward = true;
 								plugin.debug(
 										user.getPlayerName() + " got VoteStreak " + streakRequired + "* for " + type);

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/user/UserManager.java

@@ -19,18 +19,6 @@ public class UserManager {
 		this.plugin = plugin;
 	}
 
-	@Deprecated
-	public UserManager() {
-	}
-
-	@Deprecated
-	static UserManager instance = new UserManager();
-
-	@Deprecated
-	public static UserManager getInstance() {
-		return instance;
-	}
-
 	public void addCachingKeys() {
 		UserDataManager manager = plugin.getUserManager().getDataManager();
 		manager.addKey(new UserDataKeyBoolean("TopVoterIgnore"));

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

@@ -4,7 +4,6 @@ import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDateTime;
-import java.time.YearMonth;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -25,6 +24,8 @@ import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
+import com.bencodez.advancedcore.api.user.usercache.value.DataValue;
+import com.bencodez.advancedcore.api.user.usercache.value.DataValueInt;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
@@ -351,6 +352,10 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		if (!voteStreakUpdatedToday(LocalDateTime.now())) {
 			if (!plugin.getSpecialRewardsConfig().isVoteStreakRequirementUsePercentage() || hasPercentageTotal(
 					TopVoter.Daily, plugin.getSpecialRewardsConfig().getVoteStreakRequirementDay(), null)) {
+				plugin.extraDebug("Adding day vote streak to " + getUUID() + " "
+						+ plugin.getSpecialRewardsConfig().isVoteStreakRequirementUsePercentage() + " "
+						+ hasPercentageTotal(TopVoter.Daily,
+								plugin.getSpecialRewardsConfig().getVoteStreakRequirementDay(), null));
 				addDayVoteStreak();
 				plugin.getSpecialRewards().checkVoteStreak(this, "Day", forceBungee);
 				setDayVoteStreakLastUpdate(System.currentTimeMillis());
@@ -682,11 +687,12 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		int total = getTotal(top);
 		switch (top) {
 		case Daily:
-			return total / plugin.getVoteSites().size() * 100 > percentage;
+			return (double) total / (double) plugin.getVoteSitesEnabled().size() * 100 > percentage;
 		case Monthly:
-			return total / (plugin.getVoteSites().size() * time.getMonth().length(false)) * 100 > percentage;
+			return (double) total / ((double) plugin.getVoteSitesEnabled().size() * time.getMonth().length(false))
+					* 100 > percentage;
 		case Weekly:
-			return total / (plugin.getVoteSites().size() * 7) * 100 > percentage;
+			return (double) total / ((double) plugin.getVoteSitesEnabled().size() * 7) * 100 > percentage;
 		default:
 			return false;
 		}
@@ -1092,7 +1098,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		case Monthly:
 			if (plugin.getConfigFile().isLimitMonthlyVotes()) {
 				LocalDateTime time = plugin.getTimeChecker().getTime();
-				int days = YearMonth.of(time.getYear(), time.getMonth()).lengthOfMonth();
+				int days = time.getDayOfMonth();
 				if (value >= days * plugin.getVoteSites().size()) {
 					value = days * plugin.getVoteSites().size();
 				}
@@ -1410,4 +1416,20 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 
 	}
 
+	public void mergeData(HashMap<String, DataValue> toAdd) {
+		HashMap<String, DataValue> currentData = getData().getValues();
+		HashMap<String, DataValue> newData = new HashMap<String, DataValue>();
+
+		for (TopVoter top : TopVoter.values()) {
+			if (toAdd.containsKey(top.getColumnName()) && currentData.containsKey(top.getColumnName())) {
+				newData.put(top.getColumnName(), new DataValueInt(
+						currentData.get(top.getColumnName()).getInt() + toAdd.get(top.getColumnName()).getInt()));
+			}
+		}
+
+		if (newData.size() > 0) {
+			getData().setValues(newData);
+		}
+	}
+
 }

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

@@ -305,6 +305,10 @@ public class VoteParty implements Listener {
 		if (plugin.getSpecialRewardsConfig().isVotePartyResetWeekly()) {
 			reset(true);
 		}
+		
+		if (plugin.getSpecialRewardsConfig().isVotePartyResetExtraVotesWeekly()) {
+			plugin.getServerData().setVotePartyExtraRequired(0);
+		}
 	}
 
 	public void register() {
@@ -344,6 +348,24 @@ public class VoteParty implements Listener {
 		plugin.getServerData().saveData();
 	}
 
+	public void checkVoteReminder(VotingPluginUser user) {
+		int neededVotes = getNeededVotes();
+
+		for (String str : plugin.getSpecialRewardsConfig().getVotePartyVoteReminderAtVotes()) {
+			if (StringParser.getInstance().isInt(str)) {
+				int num = Integer.parseInt(str);
+				if (neededVotes == num) {
+					String broadcastMessage = plugin.getSpecialRewardsConfig().getVotePartyVoteReminderBroadcast();
+					HashMap<String, String> placeholders = new HashMap<String, String>();
+					placeholders.put("player", user.getPlayerName());
+					placeholders.put("votesrequired", "" + neededVotes);
+					MiscUtils.getInstance()
+							.broadcast(StringParser.getInstance().replacePlaceHolder(broadcastMessage, placeholders));
+				}
+			}
+		}
+	}
+
 	public synchronized void vote(VotingPluginUser user, boolean realVote, boolean forceBungee) {
 		if (plugin.getSpecialRewardsConfig().isVotePartyEnabled()) {
 			if (plugin.getSpecialRewardsConfig().isVotePartyCountFakeVotes() || realVote) {
@@ -351,6 +373,7 @@ public class VoteParty implements Listener {
 					addTotal(user);
 					addVotePlayer(user);
 					check(user, forceBungee);
+					checkVoteReminder(user);
 				}
 			}
 		}

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.
 	 *