Update version number

Prevent clients from sending plugin messages

README.md

@@ -18,7 +18,7 @@ https://github.com/Ben12345rocks/VotingPlugin/blob/master/VotingPlugin/Resources
     </repository>
     
     <dependency>
-	    <groupId>com.github.Ben12345rocks</groupId>
+	    <groupId>com.github.BenCodez</groupId>
 	    <artifactId>VotingPlugin</artifactId>
 	    <version>LATEST</version>
 	    <scope>provided</scope>

VotingPlugin/Resources/BungeeSettings.yml

@@ -7,10 +7,6 @@
 # Plugin using bungee, requires plugin on bungee server
 UseBungeecord: false
 
-# For pluginmessaging method only
-# Whether to broadcast on cached votes
-BungeeBroadcastAlways: false
-
 # What type of bungee setup
 # Requires restart and set on all servers
 # https://github.com/Ben12345rocks/VotingPlugin/wiki/Bungeecoord-Setups
@@ -26,8 +22,19 @@ BungeeDebug: false
 
 # Get the plugin to broadcast to all servers
 # If false you need to enable 
+# Only use for global rewards (one per network), otherwise you will get double broadcasts
 BungeeBroadcast: false
 
+# For pluginmessaging method only
+# Whether to broadcast on cached votes
+BungeeBroadcastAlways: false
+
+# If true, offline rewards will be stored per server, rather than global
+# This shouldn't need to be set unless you get alot of cross server rewards issues
+# You can also specify the server within the rewards
+# Requires server name below to be correct
+PerServerRewards: false
+
 # What server this is in bungee (must match)
 # Also can be applied to rewards
 Server: PleaseSet
@@ -37,11 +44,13 @@ Server: PleaseSet
 # -----------------------------
 
 # Bungee communication, add bungee host/port here
+# For socket method
 BungeeServer:
   Host: '127.0.0.1'
   Port: 1297
   
 # Bungee communication, add this to bungee server
+# For socket method
 SpigotServer:
   Host: '127.0.0.1'
   Port: 1298

VotingPlugin/Resources/Config.yml

@@ -30,6 +30,35 @@ MySQL:
   Prefix: ''
   #UseSSL: true
   #PublicKeyRetrieval: false
+  
+# ---------------------------------------------------------
+# Mysql cache options 
+# Clearing cache forces the plugin to pull from database
+# Not needed unless you are using multiple servers
+# If using a bungee setup most of these options are overriden automatically
+# ---------------------------------------------------------
+
+# Clear cache on update, setting to true reduces update speed
+# Also may require AlwaysUpdate set to true
+ClearCacheOnUpdate: false
+
+# Clear cache on player join always
+ClearCacheOnJoin: false
+
+# Clears cache for the player who voted only
+# Only effects if using mysql
+# Would recommend for some bungee setups
+ClearCacheOnVote: false
+
+# Clear cache when player leaves
+ClearCacheOnLeave: false
+
+ClearCacheOnVoteShopPurchase: true
+
+# --------------------
+# AllowUnJoined options
+# May need to set to true for bungee setup
+# --------------------
 
 # Let players who never joined before vote
 # Recommend: False (Will prevent creating random user data)
@@ -241,6 +270,9 @@ Format:
   # See https://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html
   TimeFormat: 'EEE, d MMM yyyy HH:mm'
   
+  # Reward time format for %date% placeholder (Time of giving reward)
+  RewardTimeFormat: 'EEE, d MMM yyyy HH:mm'
+  
   TimeFormats:
     Day: 'Day'
     Days: 'Days'
@@ -288,7 +320,7 @@ Format:
     Amount: 1
     Name: '&aNext Page'
   
-  InvFull: '&cInventory full, dropping items on ground'
+  InvFull: '&cInventory full'
   
   # Display text
   # Used in /vote top (GUI)
@@ -343,6 +375,15 @@ StoreTopVoters:
 # Most of these values can be left untouched for most setups
 # ------------------------------------------------
 
+# If false, votestreaks will be disabled
+UseVoteStreaks: true
+
+# If false, storing best totals will be disabled
+UseHighestTotals: true
+
+# If true, /vote will open /vote gui by default
+UseVoteGUIMainCommand: false
+
 # Number of points to give on vote
 # Set to 0 to give no points
 PointsOnVote: 1
@@ -351,6 +392,13 @@ PointsOnVote: 1
 # Not really recommended
 AddTotals: true
 
+# If true, items given for rewards are dropped on the ground
+# If false, items will be given when there is space
+DropOnFullInv: true
+
+# If true, allsites will have an extra check to prevent duplicate allsites from being given
+ExtraAllSitesCheck: false
+
 # Click sound when using gui
 # Set to none for no sound
 ClickSound: 
@@ -362,9 +410,9 @@ ClickSound:
 # case sensitive
 VotingBroadcastBlacklist: []
 
-# Set to false to prevent javascript
-# parsing on placeholderapi placeholders
-UseJavascriptPlaceholders: true
+# When enabled, javascript will be parsed on placeholders (from placeholderapi)
+# allows more fancy placeholders with math for example
+UseJavascriptPlaceholders: false
   
 # Limit monthly votes to number of days of a month multipled by the number of sites
 LimitMonthlyVotes: false
@@ -381,6 +429,9 @@ PreventRepeatMilestones: false
 # Mainly to be used for alts and such
 UsePrimaryAccountForPlaceholders: false
 
+# If true, permissions will be handled differently
+MultiplePermissionsCheck: false
+
 AddCustomCommands: false
 
 # Injects custom command to /vote
@@ -522,29 +573,6 @@ SpamClickTime: 350
 # Uncomment to use
 #SpamClickMessage: '&cDetected spam clicking GUI, closing to prevent exploits'
 
-# ---------------------------------------------------------
-# Mysql cache options 
-# Clearing cache forces the plugin to pull from database
-# Not needed unless you are using multiple servers
-# ---------------------------------------------------------
-
-# Clear cache on update, setting to true reduces update speed
-# Also may require AlwaysUpdate set to true
-ClearCacheOnUpdate: false
-
-# Clear cache on player join always
-ClearCacheOnJoin: false
-
-# Clears cache for the player who voted only
-# Only effects if using mysql
-# Would recommend for some bungee setups
-ClearCacheOnVote: false
-
-# Clear cache when player leaves
-ClearCacheOnLeave: false
-
-ClearCacheOnVoteShopPurchase: true
-
 # ###############################################################
 # Deprecated options, don't recommend using any of these
 

VotingPlugin/Resources/GUI.yml

@@ -4,7 +4,7 @@
 #
 # GUI Methods:
 # - BOOK
-# - GUI
+# - CHEST
 # - CHAT (Disables GUI)
 GUIMethod:
   Today: CHEST #BOOK not available (future update?)
@@ -24,12 +24,13 @@ LastMonthGUI: false
 CHEST:
   # GUI for /vote gui, /vgui, /votegui
   VoteGUI:
-    # Items will be orders as it is below
+    # Items will be ordered as listed here
+    # You can add items following this format, even set slots
+    # See extra item below. GUI will auto resize to what is needed
     URL:
       # Standard item format, lore is automaticly applied 
       Item:
         Material: 'BOW'
-        Data: 0
         Amount: 1
         Name: '&4URL'
         Lore:
@@ -40,41 +41,45 @@ CHEST:
     Next:
       Item:
         Material: 'COMPASS'
-        Data: 0
         Amount: 1
         Name: '&4Next'
     Last:
       Item:
         Material: 'CLOCK'
-        Data: 0
         Amount: 1
         Name: '&4Last'
     Total:
       Item:
         Material: 'CHEST'
-        Data: 0
         Amount: 1
         Name: '&4Total'
     Top:
       Item:
         Material: 'OAK_SIGN'
-        Data: 0
         Amount: 1
         Name: '&4Top'
     Today:
       Item:
         Material: 'BOOK'
-        Data: 0
         Amount: 1
         Name: '&4Today'
     Shop:
       Item:
         Material: 'DIAMOND'
-        Data: 0
         Amount: 1
         Name: '&4Vote Shop'
         Lore:
         - '&aYou currently have %points% points'
+    # 'ExtraName' below is an identifier, can be whatever
+    # ExtraItem:
+      # Item:
+        # Material: 'DIRT'
+        # Amount: 1
+        # Name: 'Extra item'
+        ## Works on most GUI items
+        # Slot: 10
+        ## Send rewards on click, run commands, check conditions, etc
+        # Rewards: []
         
   # GUI for /vote url, /vote
   VoteURL:
@@ -84,8 +89,12 @@ CHEST:
     SiteName: '&c%Name%'
     SeeURL: '&cClick to see URL'
     NextVote: '&cCan Vote In: %Info%'
+    #Start slot for specific site buttons
+    #StartSlot: 1
     ViewAllUrlsButtonEnabled: true
     AllUrlsButton:
+      #Set slot for AllUrlsButton
+      #Slot: 0
       RequireAllSitesVoted: true
       AlreadyVotedItem:
         Material: 'REDSTONE_BLOCK'
@@ -110,6 +119,14 @@ CHEST:
       Data: 0
       Amount: 1
     URLText: '%VoteUrl%'
+    # #Add Extra items
+    # ExtraItems:
+      # Item1:
+        # Material: DIRT
+        # Amount: 1
+        # Slot: 1
+        # #Can run commands or effects
+        # Rewards: []
     
   VoteLast:
     Name: 'VoteLast: %player%'
@@ -139,9 +156,10 @@ CHEST:
       Material: 'OAK_SIGN'
       Amount: 1
       # 8 Slots over from the bottom left
+      # Bottom of GUI
       Slot: 7
-    # Number of topvoters to display on page +9
-    # 9 Slots on the botton are used for page buttons
+    # Number of topvoters to display on each GUI page
+    # 9 Slots on the botton are used for page buttons (added on top)
     Size: 27
     # If true, /vote top will show player heads
     UseSkull: true
@@ -258,6 +276,7 @@ CHEST:
     # Identifier
     # Used in placeholders for formats
     # Do not have spaces in the identifier
+    # Change the identifier for each shop item
     Diamond:
       Identifier_Name: 'Diamond'
       # Item
@@ -276,6 +295,10 @@ CHEST:
       Permission: ''
       # Whether or not to keep GUI open after purchase
       CloseGUI: true
+      # Require confirmation on purchase, overrides global option above
+      RequireConfirmation: false
+      # Overrides other purchase message
+      #PurchaseMessage: 'Thanks for the purchase'
       # Limit how many times you can buy this
       #Limit: 3
       # Reset limit daily/weekly/monthly
@@ -287,6 +310,9 @@ CHEST:
       #NotBuyable: false
       # Rewards to run if player buys successfully
       Rewards:
+        # Run command on purchase
+        #Commands:
+        #- 'command here'
         Items:
           Diamond:
             Material: 'DIAMOND'

VotingPlugin/Resources/SpecialRewards.yml

@@ -15,6 +15,9 @@ AllSites:
   Messages:
     Player: '&aYou voted on all sites in 1 day!'
 
+# NOTE: This is not a 1 time reward, that's what milestones are for!
+# If total votes (Can be changed) divided by cumulative amount 
+# and as no remainder (So divides perfectly)then a reward is given
 Cumulative:
   # Number of votes required
   # Allows multiple cumulative rewards
@@ -42,11 +45,16 @@ VoteParty:
   #IncreaseVotesRquired: 10
   # If true, players who did not vote to reach the votes required will 
   # recieve the reward
+  # If false, only players who voted get rewards
   GiveAllPlayers: false
   # If true, the vote count will reset each day
   ResetEachDay: false
+  # If true, the vote count will reset each week
+  ResetWeekly: false
   # Reset at the end of the month
   ResetMonthly: false
+  # If true, will give voteparty only once per day
+  OnlyOncePerDay: false
   # Reset extra votes
   ResetExtraVotesMonthly: false
   # Count votes from /av vote?
@@ -62,6 +70,8 @@ VoteParty:
   Commands: []
   # Rewards to give per player
   Rewards: 
+    # Uncomment below for online players to be rewarded only
+    #RewardType: ONLINE
     Commands:
     - say %player%
     Items:
@@ -72,6 +82,7 @@ VoteParty:
 # Reset milestones at end of the month
 ResetMilestonesMonthly: false
   
+# One time reward to be given (unless you reset it somehow)
 MileStones:
   # Number of votes required
   # Allows multiple milestones
@@ -143,6 +154,8 @@ LoginRewards: []
 # Will queue until player logs in unless forceoffline is enabled
 LogoutRewards: []
 
+EnableMonthlyAwards: true
+
 # Rewards to give
 MonthlyAwards:
   # Position. 1 is first in top voter, 2 is second, etc...

VotingPlugin/Resources/VoteSites.yml

@@ -15,6 +15,9 @@ VoteSites:
     # Used for sorted list
     # High prority, higher on the list
     Priority: 5
+    
+    # If true, voteside will be hidden from some GUI's, similar to being disabled
+    Hidden: false
           
     # The serviceName from the vote, has to be correct to work correctly
     # Gotten from voting on the site (will be in console/log)
@@ -44,6 +47,9 @@ VoteSites:
     # Recommend: false
     VoteDelayDaily: false
     
+    #Offset time for /vote next caculations
+    #TimeOffSet: 0
+    
     # If true, rewards can be executed offline (requires ForceOffline to be true in the reward)
     # Setting this to true will execute the reward offline while the player is offline
     # This basiclly disables offline voting if set to true, don't misinterpret this option
@@ -101,6 +107,12 @@ VoteSites:
         Fallback:
           Messages:
             Player: 'You got unlucky'
+            
+      # Give 1 diamond
+      Items:
+        item1:
+          Material: DIAMOND
+          Amount: 1
 
       Messages:
         Player: 'You voted'

VotingPlugin/Resources/bungeeconfig.yml

@@ -38,21 +38,44 @@ BlockedServers:
 # MYSQL
 BungeeMethod: PLUGINMESSAGING
 
-FallBackServer: factions
+# 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
+AllowUnJoined: false
+
+# If true, bungee will handle adding totals
+# If false, spigot servers will EACH set their own totals
+# If false, AllowUnJoined should false on bungee, spigot servers will handle that
+# Recommened to leave true, setting to false setups are currently unsupported
+BungeeManageTotals: true
 
 # ----------------------------
-# SOCKET METHOD Settings
+# PLUGINMESSAGING Settings
+# ----------------------------
+
+# Applies to PLUGINMESSAGING & when SendVotesToAllServers is true
+# Votes will be forwarded when specific player is online
+WaitForUserOnline: false
+
+# ----------------------------
+# SOCKET Settings, do not touch otherwise
 # ----------------------------
 
 # Tell servers to broadcast
+# For socket method
 Broadcast: true
 
+# Server to send vote to if player is offline
+FallBackServer: factions
+
 # Bungee communication, Add this to each spigot server
+# For socket method
 BungeeServer:
   Host: '127.0.0.1'
   Port: 1297
   
 # Bungee communication, add each spigot server here
+# For socket method
 SpigotServers:
   lobby:
     Host: '127.0.0.1'

VotingPlugin/Resources/plugin.yml

@@ -112,9 +112,6 @@ commands:
   adminvoteconfig:
     description: Command Alias
     aliases: avconfig
-  adminvotesettotal:
-    description: Command Alias
-    aliases: avsettotal
   adminvoteupdatecheck:
     description: Command Alias
     aliases: avupdatecheck
@@ -127,9 +124,6 @@ commands:
   adminvotegivereward:
     description: Command Alias
     aliases: avgivereward
-  adminvoteusers:
-    description: Command Alias
-    aliases: avusers
   adminvoteConvertFromData:
     description: Command Alias
     aliases: avConvertFromData
@@ -141,15 +135,26 @@ commands:
   adminvoteClearCache:
     description: Command Alias
     aliases: avClearCache
-  adminvoteConvertFrom:
-    description: Command Alias
-    aliases: avConvertFrom
   adminvoteServiceSites:
     description: Command Alias
     aliases: avServiceSites
   adminvoteSetVotePartyCount:
     description: Command Alias
     aliases: avSetVotePartyCount
+  adminvoteChoices:
+    description: Command Alias
+    aliases: avChoices
+  adminvoteReloadAll:
+    description: Command Alias
+    aliases: avReloadAll
+  adminvotePermsPlayer:
+    description: Command Alias
+    aliases: avPermsPlayer
+  adminvoteResyncMilestonesAlreadyGiven:
+    description: Command Alias
+    aliases: avResyncMilestonesAlreadyGiven
+  voteSetPrimaryAccount:
+    description: Command Alias
   adminvoteClearOfflineVotes:
     description: Command Alias
     aliases: avClearOfflineVotes
@@ -218,9 +223,9 @@ permissions:
   VotingPlugin.Player:
     description: Allows basic access player commands
   VotingPlugin.Mod:
-    description: Allows mod access player commands
+    description: Allows mod commands
   VotingPlugin.Admin:
-    description: Allows admin access player commands
+    description: Allows admincommands
   VotingPlugin.Login.RemindVotes:
     description: Allows players to get remined on login if they can vote
     default: true
@@ -237,4 +242,7 @@ permissions:
     description: Permission to create sign
   VotingPlugin.Admin.GenerateServiceSite:
     description: Permission for generating votesite message
+  VotingPlugin.Login.RemindVotes.Any:
+    description: Remind if player can vote on any website, rather than all
+    default: false
   

VotingPlugin/pom.xml

@@ -3,8 +3,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
-	<artifactId>votingplugin</artifactId>
-	<version>6.0</version>
+	<artifactId>VotingPlugin</artifactId>
+	<version>6.1.4</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -106,29 +106,29 @@
 							other plugins -->
 						<relocation>
 							<pattern>com.bencodez.advancedcore</pattern>
-							<shadedPattern>${project.groupId}.${project.artifactId}.advancedcore</shadedPattern>
+							<shadedPattern>${project.groupId}.votingplugin.advancedcore</shadedPattern>
 						</relocation>
 						<!-- Lets relocate the shaded API so we dont cause any conflicts with 
 							other plugins -->
 						<relocation>
 							<pattern>net.pl3x.bukkit.chatapi</pattern>
-							<shadedPattern>${project.groupId}.${project.artifactId}</shadedPattern>
+							<shadedPattern>${project.groupId}.votingplugin</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>me.mrten.mysqlapi</pattern>
-							<shadedPattern>${project.groupId}.${project.artifactId}.mysqlapi</shadedPattern>
+							<shadedPattern>${project.groupId}.votingplugin.mysqlapi</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>com.zaxxer.HikariCP</pattern>
-							<shadedPattern>${project.groupId}.${project.artifactId}.HikariCP</shadedPattern>
+							<shadedPattern>${project.groupId}.votingplugin.HikariCP</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>com.zaxxer.hikari</pattern>
-							<shadedPattern>${project.groupId}.${project.artifactId}.hikari</shadedPattern>
+							<shadedPattern>${project.groupId}.votingplugin.hikari</shadedPattern>
 						</relocation>
 						<relocation>
-							<pattern>org.slf4j.slf4j-simple</pattern>
-							<shadedPattern>${project.groupId}.${project.artifactId}.slf4j-simple</shadedPattern>
+							<pattern>xyz.upperlevel.spigot.book</pattern>
+							<shadedPattern>${project.groupId}.votingplugin.upperlevel.book</shadedPattern>
 						</relocation>
 					</relocations>
 				</configuration>
@@ -256,7 +256,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.16.4-R0.1-SNAPSHOT</version>
+			<version>1.16.5-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

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

@@ -0,0 +1,30 @@
+package com.Ben12345rocks.VotingPlugin.Objects;
+
+import org.bukkit.entity.Player;
+
+import com.bencodez.votingplugin.user.UserManager;
+import com.bencodez.votingplugin.user.VotingPluginUser;
+
+@Deprecated
+public class User {
+	private VotingPluginUser user;
+	public User(Player p) {
+		user = UserManager.getInstance().getVotingPluginUser(p);
+	}
+	
+	public int getPoints() {
+		return user.getPoints();
+	}
+	
+	public void setPoints(int points) {
+		user.setPoints(points);
+	}
+	
+	public void addPoints(int points) {
+		user.addPoints(points);
+	}
+	
+	public boolean removePoints(int points) {
+		return user.removePoints(points);
+	}
+ }

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

@@ -9,6 +9,7 @@ import com.bencodez.advancedcore.bungeeapi.pluginmessage.PluginMessageHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.ClientHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
+import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.user.UserManager;
@@ -47,9 +48,9 @@ public class BungeeHandler {
 		plugin.getLogger().info("Using BungeeMethod: " + method.toString());
 
 		if (method.equals(BungeeMethod.MYSQL)) {
-			plugin.registerBungeeChannels();
+			plugin.registerBungeeChannels("vp:vp");
 		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-			plugin.registerBungeeChannels();
+			plugin.registerBungeeChannels("vp:vp");
 
 			plugin.getPluginMessaging().add(new PluginMessageHandler("Vote") {
 				@Override
@@ -59,15 +60,21 @@ public class BungeeHandler {
 					String service = args.get(2);
 					long time = Long.parseLong(args.get(3));
 					plugin.debug("pluginmessaging vote received from " + player + " on " + service);
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
+							player);
 
 					boolean wasOnline = Boolean.valueOf(args.get(4));
 
-					String text = args.get(6);
+					BungeeMessageData text = new BungeeMessageData(args.get(6));
+
+					boolean setTotals = false;
+					if (args.size() > 7) {
+						setTotals = Boolean.valueOf(args.get(7));
+					}
 
 					user.clearCache();
 
-					user.bungeeVotePluginMessaging(service, time, text);
+					user.bungeeVotePluginMessaging(service, time, text, !setTotals);
 
 					if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
 						if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
@@ -94,12 +101,18 @@ public class BungeeHandler {
 					String uuid = args.get(1);
 					String service = args.get(2);
 					long time = Long.parseLong(args.get(3));
-					String text = args.get(6);
+					BungeeMessageData text = new BungeeMessageData(args.get(6));
 					plugin.debug("pluginmessaging voteonline received from " + player + " on " + service);
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
+							player);
 					user.clearCache();
 
-					user.bungeeVotePluginMessaging(service, time, text);
+					boolean setTotals = false;
+					if (args.size() > 7) {
+						setTotals = Boolean.valueOf(args.get(7));
+					}
+
+					user.bungeeVotePluginMessaging(service, time, text, !setTotals);
 
 					if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
 						if (Boolean.valueOf(args.get(4)) || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
@@ -147,6 +160,15 @@ public class BungeeHandler {
 				}
 			});
 
+			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);
+
+				}
+			});
+
 		} else if (method.equals(BungeeMethod.SOCKETS)) {
 			encryptionHandler = new EncryptionHandler(new File(plugin.getDataFolder(), "secretkey.key"));
 
@@ -162,7 +184,7 @@ public class BungeeHandler {
 
 				@Override
 				public void onReceive(String[] data) {
-					if (data.length > 3) {
+					if (data.length > 5) {
 						plugin.extraDebug("BungeeVote from " + data[2] + ", processing");
 						String uuid = data[1];
 						VotingPluginUser user = null;
@@ -174,7 +196,7 @@ public class BungeeHandler {
 
 						user.clearCache();
 
-						user.bungeeVote(data[3]);
+						user.bungeeVote(data[3], new BungeeMessageData(data[4]), !Boolean.valueOf(data[5]));
 					}
 				}
 			});
@@ -183,7 +205,7 @@ public class BungeeHandler {
 
 				@Override
 				public void onReceive(String[] data) {
-					if (data.length > 3) {
+					if (data.length > 5) {
 						plugin.extraDebug("BungeeVoteOnline from " + data[2] + ", processing");
 						String uuid = data[1];
 						VotingPluginUser user = null;
@@ -195,7 +217,7 @@ public class BungeeHandler {
 
 						user.clearCache();
 
-						user.bungeeVoteOnline(data[3]);
+						user.bungeeVoteOnline(data[3], new BungeeMessageData(data[4]), !Boolean.valueOf(data[5]));
 					}
 				}
 			});

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

@@ -66,7 +66,6 @@ import com.bencodez.votingplugin.config.SpecialRewardsConfig;
 import com.bencodez.votingplugin.cooldown.CoolDownCheck;
 import com.bencodez.votingplugin.data.ServerData;
 import com.bencodez.votingplugin.listeners.BlockBreak;
-import com.bencodez.votingplugin.listeners.PlayerCommandSendListener;
 import com.bencodez.votingplugin.listeners.PlayerInteract;
 import com.bencodez.votingplugin.listeners.PlayerJoinEvent;
 import com.bencodez.votingplugin.listeners.PlayerVoteListener;
@@ -237,32 +236,22 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	}
 
 	private void checkYMLError() {
-		if (configFile.isFailedToRead() || configVoteSites.isFailedToRead()) {
+		if (configFile.isFailedToRead() || configVoteSites.isFailedToRead() || specialRewardsConfig.isFailedToRead()
+				|| bungeeSettings.isFailedToRead() || gui.isFailedToRead()) {
 			ymlError = true;
-		} else if (!configFile.isFailedToRead() && !configVoteSites.isFailedToRead()) {
+		} else {
 			ymlError = false;
 		}
 
-		if (configFile.isFailedToRead()) {
+		if (ymlError) {
 			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
 
 				@Override
 				public void run() {
-					plugin.getLogger().severe("Failed to load Config.yml");
+					plugin.getLogger().severe("Failed to load a file, check startup log");
 				}
 			}, 10);
 		}
-
-		if (configVoteSites.isFailedToRead()) {
-			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
-
-				@Override
-				public void run() {
-					plugin.getLogger().severe("Failed to load VoteSites.yml");
-				}
-
-			}, 10);
-		}
 	}
 
 	public void convertDataStorage(UserStorage from, UserStorage to) {
@@ -635,9 +624,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		// vote party
 		voteParty = new VoteParty(this);
-		if (specialRewardsConfig.getVotePartyEnabled()) {
-			voteParty.check();
-		}
 		voteParty.register();
 
 		topVoterHandler.register();
@@ -774,7 +760,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			if (!contains) {
 				issues = false;
 				plugin.getLogger().warning("No vote has been recieved from " + site.getServiceSite()
-						+ ", may be an invalid service site. Vote on the site and look in console for a service site, if you get nothing then there is an issue with votifier");
+						+ ", may be an invalid service site. Please read: https://github.com/BenCodez/VotingPlugin/wiki/Votifier-Troubleshooting");
 			}
 		}
 
@@ -899,9 +885,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		pm.registerEvents(new BlockBreak(this), this);
 		pm.registerEvents(new PlayerInteract(this), this);
 		pm.registerEvents(new VotingPluginUpdateEvent(this), this);
-		if (!NMSManager.getInstance().isVersion("1.12")) {
-			pm.registerEvents(new PlayerCommandSendListener(this), this);
-		}
+		/*
+		 * if (!NMSManager.getInstance().isVersion("1.12")) { pm.registerEvents(new
+		 * PlayerCommandSendListener(this), this); }
+		 */
 		coolDownCheck = new CoolDownCheck(this);
 		pm.registerEvents(coolDownCheck, this);
 
@@ -1048,6 +1035,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		setConfigData(configFile.getData());
 		if (bungeeSettings.isUseBungeecoord()) {
 			getOptions().setClearCacheOnJoin(true);
+			getOptions().setPerServerRewards(getBungeeSettings().isPerServerRewards());
 		}
 	}
 
@@ -1057,13 +1045,15 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		for (VotingPluginUser user : users) {
 			HashMap<VoteSite, LocalDateTime> times = new HashMap<VoteSite, LocalDateTime>();
 			for (VoteSite voteSite : plugin.getVoteSites()) {
-				long time = user.getTime(voteSite);
-				if ((LocalDateTime.now().getDayOfMonth() == MiscUtils.getInstance().getDayFromMili(time))
-						&& (LocalDateTime.now().getMonthValue() == MiscUtils.getInstance().getMonthFromMili(time))
-						&& (LocalDateTime.now().getYear() == MiscUtils.getInstance().getYearFromMili(time))) {
-
-					times.put(voteSite, LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault()));
+				if (!voteSite.isHidden()) {
+					long time = user.getTime(voteSite);
+					if ((LocalDateTime.now().getDayOfMonth() == MiscUtils.getInstance().getDayFromMili(time))
+							&& (LocalDateTime.now().getMonthValue() == MiscUtils.getInstance().getMonthFromMili(time))
+							&& (LocalDateTime.now().getYear() == MiscUtils.getInstance().getYearFromMili(time))) {
 
+						times.put(voteSite,
+								LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault()));
+					}
 				}
 			}
 			if (times.keySet().size() > 0) {

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

@@ -0,0 +1,53 @@
+package com.bencodez.votingplugin.bungee;
+
+import java.util.regex.Pattern;
+
+import lombok.Getter;
+
+public class BungeeMessageData {
+
+	// Message string
+	// alltimetotal//monthtotal//weeklytotal//dailytotal//points//milestonecount
+
+	@Getter
+	private int allTimeTotal = 0;
+	@Getter
+	private int monthTotal = 0;
+	@Getter
+	private int weeklyTotal = 0;
+	@Getter
+	private int dailyTotal = 0;
+	@Getter
+	private int points = 0;
+	@Getter
+	private int milestoneCount = 0;
+
+	public BungeeMessageData(String str) {
+		String[] data = str.split(Pattern.quote("//"));
+		if (data.length >= 6) {
+			allTimeTotal = Integer.parseInt(data[0]);
+			monthTotal = Integer.parseInt(data[1]);
+			weeklyTotal = Integer.parseInt(data[2]);
+			dailyTotal = Integer.parseInt(data[3]);
+			points = Integer.parseInt(data[4]);
+			milestoneCount = Integer.parseInt(data[5]);
+		}
+	}
+
+	@Override
+	public String toString() {
+		return allTimeTotal + "//" + monthTotal + "//" + weeklyTotal + "//" + dailyTotal + "//" + points + "//"
+				+ milestoneCount;
+	}
+
+	public BungeeMessageData(int allTimeTotal, int monthTotal, int weeklyTotal, int dailyTotal, int points,
+			int milestoneCount) {
+		this.allTimeTotal = allTimeTotal;
+		this.monthTotal = monthTotal;
+		this.weeklyTotal = weeklyTotal;
+		this.dailyTotal = dailyTotal;
+		this.points = points;
+		this.milestoneCount = milestoneCount;
+	}
+
+}

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

@@ -29,6 +29,18 @@ public class Config {
 		return getData().getBoolean("Broadcast", false);
 	}
 
+	public boolean getWaitForUserOnline() {
+		return getData().getBoolean("WaitForUserOnline", false);
+	}
+
+	public boolean getBungeeManageTotals() {
+		return getData().getBoolean("BungeeManageTotals", true);
+	}
+
+	public boolean getAllowUnJoined() {
+		return getData().getBoolean("AllowUnJoined", false);
+	}
+
 	public String getBungeeHost() {
 		return getData().getString("BungeeServer.Host", "");
 	}

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

@@ -0,0 +1,94 @@
+package com.bencodez.votingplugin.bungee;
+
+import java.io.File;
+import java.io.IOException;
+
+import lombok.Getter;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.config.Configuration;
+import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.config.YamlConfiguration;
+
+public class NonVotedPlayersCache {
+	private VotingPluginBungee bungee;
+	@Getter
+	private Configuration data;
+
+	public NonVotedPlayersCache(VotingPluginBungee bungee) {
+		this.bungee = bungee;
+	}
+
+	public void addPlayer(ProxiedPlayer proxiedPlayer) {
+		if (!bungee.getMysql().containsKeyQuery(proxiedPlayer.getUniqueId().toString())) {
+			addPlayer(proxiedPlayer.getUniqueId().toString(), proxiedPlayer.getName());
+		}
+	}
+
+	private void addPlayer(String uuid, String playerName) {
+		getData().set("NonVotedPlayers." + playerName + ".UUID", uuid);
+		getData().set("NonVotedPlayers." + playerName + ".LastTime", System.currentTimeMillis());
+	}
+
+	public String playerExists(String playerName) {
+		if (getData().getSection("NonVotedPlayers").getKeys().contains(playerName)) {
+			return getData().getString("NonVotedPlayers." + playerName + ".UUID", "");
+		}
+		return "";
+	}
+
+	private void remove(String player) {
+		bungee.debug("Removing nonvotedplayer: " + player);
+		getData().set("NonVotedPlayers." + player, null);
+	}
+
+	public void check() {
+		for (String player : getData().getSection("NonVotedPlayers").getKeys()) {
+			long time = getData().getLong("NonVotedPlayers." + player + ".LastTime", 0);
+			if ((System.currentTimeMillis() - time) > 1000 * 60 * 60 * 24 * 5) {
+				remove(player);
+			} else {
+				String uuid = getData().getString("NonVotedPlayers." + player + ".UUID", "");
+				if (!uuid.isEmpty()) {
+					if (bungee.getMysql().containsKeyQuery(uuid)) {
+						remove(player);
+					}
+				} else {
+					remove(player);
+				}
+			}
+		}
+		save();
+	}
+
+	public void load() {
+		if (!bungee.getDataFolder().exists()) {
+			bungee.getDataFolder().mkdir();
+		}
+
+		File file = new File(bungee.getDataFolder(), "nonvotedplayerscache.yml");
+
+		if (!file.exists()) {
+			try {
+				file.createNewFile();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		try {
+			data = ConfigurationProvider.getProvider(YamlConfiguration.class)
+					.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void save() {
+		try {
+			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
+					new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+}

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

@@ -26,4 +26,9 @@ public class OfflineBungeeVote {
 		this.text = text;
 	}
 
+	@Override
+	public String toString() {
+		return "VoteCache:" + playerName + "/" + uuid + "/" + service + "/" + time + "/" + realVote + "/" + text;
+	}
+
 }

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

@@ -0,0 +1,23 @@
+package com.bencodez.votingplugin.bungee;
+
+import com.vexsoftware.votifier.bungee.events.VotifierEvent;
+import com.vexsoftware.votifier.model.Vote;
+
+import net.md_5.bungee.event.EventHandler;
+
+public class VoteEventBungee implements net.md_5.bungee.api.plugin.Listener {
+	private VotingPluginBungee plugin;
+
+	public VoteEventBungee(VotingPluginBungee plugin) {
+		this.plugin = plugin;
+	}
+
+	@EventHandler
+	public void onVote(VotifierEvent event) {
+		Vote vote = event.getVote();
+		plugin.getLogger().info("Vote received " + vote.getUsername() + " from service site " + vote.getServiceName());
+
+		plugin.vote(vote.getUsername(), vote.getServiceName(), true);
+
+	}
+}

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

@@ -29,20 +29,20 @@ import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.vexsoftware.votifier.bungee.events.VotifierEvent;
-import com.vexsoftware.votifier.model.Vote;
 
 import lombok.Getter;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.connection.Server;
 import net.md_5.bungee.api.event.PluginMessageEvent;
+import net.md_5.bungee.api.event.PostLoginEvent;
 import net.md_5.bungee.api.event.ServerConnectedEvent;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.event.EventHandler;
 
-public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.plugin.Listener {
+public class VotingPluginBungee extends Plugin {
 
 	private HashMap<String, ArrayList<OfflineBungeeVote>> cachedOnlineVotes = new HashMap<String, ArrayList<OfflineBungeeVote>>();
 
@@ -65,35 +65,58 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 
 	private VoteCache voteCacheFile;
 
+	private NonVotedPlayersCache nonVotedPlayersCache;
+
 	public void checkCachedVotes(String server) {
 		if (getProxy().getServerInfo(server) != null) {
 			if (!getProxy().getServerInfo(server).getPlayers().isEmpty()) {
 				if (cachedVotes.containsKey(server) && !config.getBlockedServers().contains(server)) {
 					ArrayList<OfflineBungeeVote> c = cachedVotes.get(server);
+					ArrayList<OfflineBungeeVote> newSet = new ArrayList<OfflineBungeeVote>();
 					if (!c.isEmpty()) {
 						for (OfflineBungeeVote cache : c) {
-							sendPluginMessageServer(server, "Vote", cache.getPlayerName(), cache.getUuid(),
-									cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
-									"" + cache.isRealVote(), cache.getText());
+							boolean toSend = true;
+							if (getConfig().getWaitForUserOnline()) {
+								ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(cache.getUuid()));
+								if (p == null || !p.isConnected()) {
+									toSend = false;
+								} else if (p != null && p.isConnected()
+										&& !p.getServer().getInfo().getName().equals(server)) {
+									toSend = false;
+								}
+
+							}
+							if (toSend) {
+								sendPluginMessageServer(server, "Vote", cache.getPlayerName(), cache.getUuid(),
+										cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
+										"" + cache.isRealVote(), cache.getText(),
+										"" + getConfig().getBungeeManageTotals());
+							} else {
+								debug("Not sending vote because user isn't on server " + server + ": "
+										+ cache.toString());
+								newSet.add(cache);
+							}
 						}
-						cachedVotes.put(server, new ArrayList<OfflineBungeeVote>());
+						cachedVotes.put(server, newSet);
 					}
 				}
 			}
 		}
+
 	}
 
-	public void checkOnlineVotes(ProxiedPlayer player, String uuid) {
+	public void checkOnlineVotes(ProxiedPlayer player, String uuid, String server) {
 		if (player != null && player.isConnected() && cachedOnlineVotes.containsKey(uuid)) {
 			ArrayList<OfflineBungeeVote> c = cachedOnlineVotes.get(uuid);
 			if (!c.isEmpty()) {
-				String server = getProxy().getPlayer(UUID.fromString(uuid)).getServer().getInfo().getName();
+				if (server == null) {
+					server = getProxy().getPlayer(UUID.fromString(uuid)).getServer().getInfo().getName();
+				}
 				if (!config.getBlockedServers().contains(server)) {
 					for (OfflineBungeeVote cache : c) {
-
 						sendPluginMessageServer(server, "VoteOnline", cache.getPlayerName(), cache.getUuid(),
 								cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
-								"" + cache.isRealVote(), cache.getText());
+								"" + cache.isRealVote(), cache.getText(), "" + getConfig().getBungeeManageTotals());
 					}
 					cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
 				}
@@ -143,9 +166,14 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 		if (p != null && p.isConnected()) {
 			return p.getUniqueId().toString();
 		}
-		String str = mysql.getUUID(playerName);
-		if (str != null) {
-			return str;
+		if (mysql != null) {
+			String str = mysql.getUUID(playerName);
+			if (str != null) {
+				return str;
+			}
+		}
+		if (nonVotedPlayersCache != null) {
+			return nonVotedPlayersCache.playerExists(playerName);
 		}
 		return "";
 	}
@@ -170,7 +198,7 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 				return num;
 			}
 		}
-		return -1;
+		return 0;
 	}
 
 	private int mysqlUpdate(ArrayList<Column> cols, String uuid, String column, int toAdd) {
@@ -199,53 +227,70 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 					num++;
 				}
 			}
+			nonVotedPlayersCache.save();
 		}
 	}
 
 	@Override
 	public void onEnable() {
-		getProxy().getPluginManager().registerListener(this, this);
+		try {
+			getProxy().getPluginManager().registerListener(this, new VoteEventBungee(this));
+		} catch (Exception e) {
+			getLogger().warning("Votifier event failed to enable");
+		}
 		config = new Config(this);
 		config.load();
 
-		mysql = new BungeeMySQL("VotingPlugin_Users", config.getData());
+		try {
+			mysql = new BungeeMySQL("VotingPlugin_Users", config.getData());
 
-		// column types
-		getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
-		getMysql().alterColumnType("CheckWorld", "VARCHAR(5)");
-		getMysql().alterColumnType("Reminded", "VARCHAR(5)");
-		getMysql().alterColumnType("DisableBroadcast", "VARCHAR(5)");
-		getMysql().alterColumnType("LastOnline", "VARCHAR(20)");
-		getMysql().alterColumnType("PlayerName", "VARCHAR(30)");
-		getMysql().alterColumnType("DailyTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("WeeklyTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("DayVoteStreak", "INT DEFAULT '0'");
-		getMysql().alterColumnType("BestDayVoteStreak", "INT DEFAULT '0'");
-		getMysql().alterColumnType("WeekVoteStreak", "INT DEFAULT '0'");
-		getMysql().alterColumnType("BestWeekVoteStreak", "INT DEFAULT '0'");
-		getMysql().alterColumnType("VotePartyVotes", "INT DEFAULT '0'");
-		getMysql().alterColumnType("MonthVoteStreak", "INT DEFAULT '0'");
-		getMysql().alterColumnType("Points", "INT DEFAULT '0'");
-		getMysql().alterColumnType("HighestDailyTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("AllTimeTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("HighestMonthlyTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("MilestoneCount", "INT DEFAULT '0'");
-		getMysql().alterColumnType("MonthTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
+			// column types
+			getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
+			getMysql().alterColumnType("CheckWorld", "VARCHAR(5)");
+			getMysql().alterColumnType("Reminded", "VARCHAR(5)");
+			getMysql().alterColumnType("DisableBroadcast", "VARCHAR(5)");
+			getMysql().alterColumnType("LastOnline", "VARCHAR(20)");
+			getMysql().alterColumnType("PlayerName", "VARCHAR(30)");
+			getMysql().alterColumnType("DailyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("WeeklyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("DayVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("BestDayVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("WeekVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("BestWeekVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("VotePartyVotes", "INT DEFAULT '0'");
+			getMysql().alterColumnType("MonthVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("Points", "INT DEFAULT '0'");
+			getMysql().alterColumnType("HighestDailyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("AllTimeTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("HighestMonthlyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("MilestoneCount", "INT DEFAULT '0'");
+			getMysql().alterColumnType("MonthTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 
 		getProxy().getPluginManager().registerCommand(this, new VotingPluginBungeeCommand(this));
 
 		method = BungeeMethod.getByName(config.getBungeeMethod());
+		if (method == null) {
+			method = BungeeMethod.PLUGINMESSAGING;
+		}
+
+		this.getProxy().registerChannel("vp:vp");
 
 		if (method.equals(BungeeMethod.MYSQL)) {
-			this.getProxy().registerChannel("VotingPlugin:VotingPlugin".toLowerCase());
+			// this.getProxy().registerChannel("vp:vp");
 
 		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
 			voteCacheFile = new VoteCache(this);
 			voteCacheFile.load();
 
+			nonVotedPlayersCache = new NonVotedPlayersCache(this);
+			nonVotedPlayersCache.load();
+
 			try {
 				for (String server : voteCacheFile.getServers()) {
 					ArrayList<OfflineBungeeVote> vote = new ArrayList<OfflineBungeeVote>();
@@ -287,12 +332,21 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 					}
 
 					for (String player : cachedOnlineVotes.keySet()) {
-						checkOnlineVotes(getProxy().getPlayer(UUID.fromString(player)), player);
+						checkOnlineVotes(getProxy().getPlayer(UUID.fromString(player)), player, null);
 					}
 				}
-			}, 15l, TimeUnit.SECONDS);
+			}, 15l, 30l, TimeUnit.SECONDS);
 
-			this.getProxy().registerChannel("VotingPlugin:VotingPlugin".toLowerCase());
+			getProxy().getScheduler().schedule(this, new Runnable() {
+
+				@Override
+				public void run() {
+					if (nonVotedPlayersCache != null) {
+						debug("Checking nonvotedplayers.yml...");
+						nonVotedPlayersCache.check();
+					}
+				}
+			}, 1l, 60l, TimeUnit.MINUTES);
 		} else if (method.equals(BungeeMethod.SOCKETS)) {
 			encryptionHandler = new EncryptionHandler(new File(getDataFolder(), "secretkey.key"));
 
@@ -352,9 +406,15 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 
 	@EventHandler
 	public void onPluginMessage(PluginMessageEvent ev) {
-		if (!ev.getTag().equals("VotingPlugin:VotingPlugin".toLowerCase())) {
+		if (!ev.getTag().equals("vp:vp".toLowerCase())) {
 			return;
 		}
+
+		ev.setCancelled(true);
+
+		if (!(ev.getSender() instanceof Server))
+			return;
+
 		ByteArrayInputStream instream = new ByteArrayInputStream(ev.getData());
 		DataInputStream in = new DataInputStream(instream);
 		try {
@@ -362,15 +422,23 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 			DataOutputStream out = new DataOutputStream(outstream);
 			String subchannel = in.readUTF();
 			int size = in.readInt();
-			out.writeUTF(subchannel);
-			out.writeInt(size);
-			for (int i = 0; i < size; i++) {
-				out.writeUTF(in.readUTF());
-			}
-			for (String send : getProxy().getServers().keySet()) {
-				if (getProxy().getServers().get(send).getPlayers().size() > 0) {
-					getProxy().getServers().get(send).sendData("VotingPlugin:VotingPlugin".toLowerCase(),
-							outstream.toByteArray());
+
+			// check for status message returns
+			if (subchannel.equalsIgnoreCase("statusokay")) {
+				String server = in.readUTF();
+				getLogger().info("Status okay for " + server);
+				return;
+			} else {
+				// reforward message
+				out.writeUTF(subchannel);
+				out.writeInt(size);
+				for (int i = 0; i < size; i++) {
+					out.writeUTF(in.readUTF());
+				}
+				for (String send : getProxy().getServers().keySet()) {
+					if (getProxy().getServers().get(send).getPlayers().size() > 0) {
+						getProxy().getServers().get(send).sendData("vp:vp".toLowerCase(), outstream.toByteArray());
+					}
 				}
 			}
 		} catch (Exception e) {
@@ -378,6 +446,13 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 		}
 	}
 
+	@EventHandler
+	public void onLogin(PostLoginEvent event) {
+		if (nonVotedPlayersCache != null) {
+			nonVotedPlayersCache.addPlayer(event.getPlayer());
+		}
+	}
+
 	@EventHandler
 	public void onServerConnected(ServerConnectedEvent event) {
 		final String server = event.getServer().getInfo().getName();
@@ -387,21 +462,12 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 			@Override
 			public void run() {
 				checkCachedVotes(server);
-				checkOnlineVotes(event.getPlayer(), uuid);
+				checkOnlineVotes(event.getPlayer(), uuid, server);
 			}
 
 		}, 2, TimeUnit.SECONDS);
 	}
 
-	@EventHandler
-	public void onVote(VotifierEvent event) {
-		Vote vote = event.getVote();
-		getLogger().info("Vote received " + vote.getUsername() + " from service site " + vote.getServiceName());
-
-		vote(vote.getUsername(), vote.getServiceName(), true);
-
-	}
-
 	private UUID parseUUIDFromString(String uuidAsString) {
 		String[] parts = { "0x" + uuidAsString.substring(0, 8), "0x" + uuidAsString.substring(8, 12),
 				"0x" + uuidAsString.substring(12, 16), "0x" + uuidAsString.substring(16, 20),
@@ -434,8 +500,7 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 				out.writeUTF(message);
 			}
 			if (getProxy().getServers().get(server).getPlayers().size() > 0) {
-				getProxy().getServers().get(server).sendData("VotingPlugin:VotingPlugin".toLowerCase(),
-						byteOutStream.toByteArray(), false);
+				getProxy().getServers().get(server).sendData("vp:vp".toLowerCase(), byteOutStream.toByteArray(), false);
 			}
 			out.close();
 		} catch (Exception e) {
@@ -458,11 +523,12 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 		}
 	}
 
-	public void sendSocketVote(String name, String service) {
+	public void sendSocketVote(String name, String service, BungeeMessageData text) {
 		String uuid = getUUID(name);
 
 		if (config.getSendVotesToAllServers()) {
-			sendServerMessage("bungeevote", uuid, name, service);
+			sendServerMessage("bungeevote", uuid, name, service, text.toString(),
+					"" + getConfig().getBungeeManageTotals());
 			if (config.getBroadcast()) {
 				sendServerMessage("BungeeBroadcast", service, uuid, name);
 			}
@@ -480,7 +546,8 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 				server = config.getFallBack();
 			}
 
-			sendServerMessageServer(server, "bungeevoteonline", uuid, name, service);
+			sendServerMessageServer(server, "bungeevoteonline", uuid, name, service, text.toString(),
+					"" + getConfig().getBungeeManageTotals());
 			if (config.getBroadcast()) {
 				sendServerMessage("BungeeBroadcast", service, uuid, name);
 			}
@@ -490,7 +557,24 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 	}
 
 	public void status(CommandSender sender) {
-		sendServerMessage("status");
+		if (method.equals(BungeeMethod.SOCKETS)) {
+			sendServerMessage("status");
+		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			for (String s : getProxy().getServers().keySet()) {
+				if (!config.getBlockedServers().contains(s)) {
+					ServerInfo info = getProxy().getServerInfo(s);
+					if (info.getPlayers().isEmpty()) {
+						getLogger().info("No players on server " + s + " to send test status message");
+					} else {
+						// send
+						getLogger().info("Sending request for status message on " + s);
+						sendPluginMessageServer(s, "Status", s);
+					}
+				} else {
+					getLogger().info("Ignoring blocked server " + s);
+				}
+			}
+		}
 	}
 
 	public void vote(String player, String service, boolean realVote) {
@@ -498,25 +582,34 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 			getLogger().info("No name from vote on " + service);
 			return;
 		}
-		if (method.equals(BungeeMethod.SOCKETS)) {
-			sendSocketVote(player, service);
-		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-			String uuid = getUUID(player);
-			if (uuid.isEmpty()) {
+
+		String uuid = getUUID(player);
+		if (uuid.isEmpty()) {
+			if (config.getAllowUnJoined()) {
 				UUID u = null;
 				try {
 					u = fetchUUID(player);
 				} catch (Exception e) {
-					e.printStackTrace();
+					if (getConfig().getDebug()) {
+						e.printStackTrace();
+					}
 				}
 				if (u == null) {
 					debug("Failed to get uuid for " + player);
 					return;
 				}
 				uuid = u.toString();
+			} else {
+				getLogger().info("Ignoring vote from " + player);
+				return;
 			}
+		}
 
-			player = getProperName(uuid, player);
+		player = getProperName(uuid, player);
+
+		BungeeMessageData text = null;
+
+		if (getConfig().getBungeeManageTotals()) {
 
 			if (!mysql.getUuids().contains(uuid)) {
 				mysql.update(uuid, "PlayerName", player, DataType.STRING);
@@ -524,23 +617,43 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 
 			ArrayList<Column> data = mysql.getExactQuery(new Column("uuid", uuid, DataType.STRING));
 
-			String text = mysqlUpdate(data, uuid, "AllTimeTotal", 1) + "//" + mysqlUpdate(data, uuid, "MonthTotal", 1)
-					+ "//" + mysqlUpdate(data, uuid, "WeeklyTotal", 1) + "//" + mysqlUpdate(data, uuid, "DailyTotal", 1)
-					+ "//" + mysqlUpdate(data, uuid, "Points", 1) + "//" + mysqlUpdate(data, uuid, "MilestoneCount", 1);
+			text = new BungeeMessageData(mysqlUpdate(data, uuid, "AllTimeTotal", 1),
+					mysqlUpdate(data, uuid, "MonthTotal", 1), mysqlUpdate(data, uuid, "WeeklyTotal", 1),
+					mysqlUpdate(data, uuid, "DailyTotal", 1), mysqlUpdate(data, uuid, "Points", 1),
+					mysqlUpdate(data, uuid, "MilestoneCount", 1));
+		} else {
+			text = new BungeeMessageData(0, 0, 0, 0, 0, 0);
+		}
 
-			long time = LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+		/*
+		 * String text = mysqlUpdate(data, uuid, "AllTimeTotal", 1) + "//" +
+		 * mysqlUpdate(data, uuid, "MonthTotal", 1) + "//" + mysqlUpdate(data, uuid,
+		 * "WeeklyTotal", 1) + "//" + mysqlUpdate(data, uuid, "DailyTotal", 1) + "//" +
+		 * mysqlUpdate(data, uuid, "Points", 1) + "//" + mysqlUpdate(data, uuid,
+		 * "MilestoneCount", 1);
+		 */
+
+		long time = LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+
+		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
 
 			if (config.getSendVotesToAllServers()) {
 				for (String s : getProxy().getServers().keySet()) {
 					if (!config.getBlockedServers().contains(s)) {
 						ServerInfo info = getProxy().getServerInfo(s);
-						if (info.getPlayers().isEmpty()) {
+						boolean forceCache = false;
+						ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
+						if ((p == null || !p.isConnected()) && getConfig().getWaitForUserOnline()) {
+							forceCache = true;
+							debug("Forcing vote to cache");
+						}
+						if (info.getPlayers().isEmpty() || forceCache) {
 							// cache
 							if (!cachedVotes.containsKey(s)) {
 								cachedVotes.put(s, new ArrayList<OfflineBungeeVote>());
 							}
 							ArrayList<OfflineBungeeVote> list = cachedVotes.get(s);
-							list.add(new OfflineBungeeVote(player, uuid, service, time, realVote, text));
+							list.add(new OfflineBungeeVote(player, uuid, service, time, realVote, text.toString()));
 							cachedVotes.put(s, list);
 
 							debug("Caching vote for " + player + " on " + service + " for " + s);
@@ -548,7 +661,8 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 						} else {
 							// send
 							sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
-									Boolean.TRUE.toString(), "" + realVote, text);
+									Boolean.TRUE.toString(), "" + realVote, text.toString(),
+									"" + getConfig().getBungeeManageTotals());
 						}
 					}
 				}
@@ -557,7 +671,8 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 				if (p != null && p.isConnected()
 						&& !config.getBlockedServers().contains(p.getServer().getInfo().getName())) {
 					sendPluginMessageServer(p.getServer().getInfo().getName(), "VoteOnline", player, uuid, service,
-							"" + time, Boolean.TRUE.toString(), "" + realVote, text);
+							"" + time, Boolean.TRUE.toString(), "" + realVote, text.toString(),
+							"" + getConfig().getBungeeManageTotals());
 				} else {
 					if (!cachedOnlineVotes.containsKey(uuid)) {
 						cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
@@ -566,13 +681,15 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 					if (list == null) {
 						list = new ArrayList<OfflineBungeeVote>();
 					}
-					list.add(new OfflineBungeeVote(player, uuid, service, time, realVote, text));
+					list.add(new OfflineBungeeVote(player, uuid, service, time, realVote, text.toString()));
 					cachedOnlineVotes.put(uuid, list);
 					debug("Caching online vote for " + player + " on " + service);
 				}
 			}
-
+		} else if (method.equals(BungeeMethod.SOCKETS)) {
+			sendSocketVote(player, service, text);
 		}
+
 	}
 
 }

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

@@ -31,10 +31,14 @@ public class VotingPluginBungeeCommand extends Command {
 				if (args[0].equalsIgnoreCase("status")) {
 					if (bungee.getMethod().equals(BungeeMethod.SOCKETS)) {
 						sender.sendMessage(new TextComponent(
-								"Checking status, waiting for response, check console, only for socket method"));
+								"Checking status, waiting for response, check console, method: sockets"));
+						bungee.status(sender);
+					} else if (bungee.getMethod().equals(BungeeMethod.PLUGINMESSAGING)){
+						sender.sendMessage(new TextComponent(
+								"Checking status, waiting for response, check console, method: plugin messaging"));
 						bungee.status(sender);
 					} else {
-						sender.sendMessage(new TextComponent("Not using socket method, command unavailable"));
+						sender.sendMessage(new TextComponent("Not using socket/pluginmessage method, command unavailable"));
 					}
 				}
 				if (args[0].equalsIgnoreCase("help")) {

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

@@ -6,6 +6,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -14,6 +15,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.permissions.Permission;
 
 import com.bencodez.advancedcore.DebugLevel;
 import com.bencodez.advancedcore.api.command.CommandHandler;
@@ -401,12 +403,21 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				new AdminVotePerms(plugin, sender).open();
+				new AdminVotePerms(plugin, sender, 1).open();
+			}
+		});
+
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Perms", "(Number)" },
+				"VotingPlugin.Commands.AdminVote.Perms|" + adminPerm, "List permissions") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				new AdminVotePerms(plugin, sender, Integer.parseInt(args[1])).open();
 			}
 		});
 
 		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "Perms", "(Player)" },
+				.add(new CommandHandler(new String[] { "PermsPlayer", "(Player)" },
 						"VotingPlugin.Commands.AdminVote.Perms.Other|" + adminPerm,
 						"List permissions from the plugin the player has") {
 
@@ -417,7 +428,7 @@ public class CommandLoader {
 				});
 
 		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "Perms", "(Player)", "(Number)" },
+				.add(new CommandHandler(new String[] { "PermsPlayer", "(Player)", "(Number)" },
 						"VotingPlugin.Commands.AdminVote.Perms.Other|" + adminPerm,
 						"List permissions from the plugin the player has") {
 
@@ -427,6 +438,30 @@ public class CommandLoader {
 					}
 				});
 
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "Perms", "(Number)", "(Player)" },
+						"VotingPlugin.Commands.AdminVote.Perms.Other|" + adminPerm,
+						"List permissions from the plugin the specificed player has") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						new AdminVotePerms(plugin, sender, Integer.parseInt(args[1]), args[2]).open();
+					}
+				});
+
+		if (plugin.getOptions().getDebug().equals(DebugLevel.DEV)) {
+			plugin.getAdminVoteCommand()
+					.add(new CommandHandler(new String[] { "PermsDebug" }, "VotingPlugin.Commands.AdminVote.PermsDebug",
+							"Dev permission list, generate this list, requires dev debug") {
+
+						@Override
+						public void execute(CommandSender sender, String[] args) {
+							sendMessage(sender, ArrayUtils.getInstance()
+									.convert(new AdminVotePerms(plugin, sender, 0).listPermsDev(sender)));
+						}
+					});
+		}
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Reload" },
 				"VotingPlugin.Commands.AdminVote.Reload|" + adminPerm, "Reload plugin, will not reload user storage") {
 
@@ -507,6 +542,7 @@ public class CommandLoader {
 					});
 
 				}
+
 				sendMessage(sender,
 						"Using AdvancedCore " + plugin.getVersion() + "' built on '" + plugin.getBuildTime());
 			}
@@ -714,8 +750,6 @@ public class CommandLoader {
 				plugin.getServer().getPluginManager().callEvent(voteEvent);
 
 				if (plugin.isYmlError()) {
-					sendMessage(sender,
-							"&4" + plugin.getName() + " v" + plugin.getDescription().getVersion() + " reloaded!");
 					sendMessage(sender, "&3Detected yml error, please check server log for details");
 				}
 
@@ -1019,7 +1053,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						plugin.getVoteParty().giveRewards();
+						plugin.getVoteParty().giveRewards(plugin.getBungeeSettings().isUseBungeecoord());
 					}
 				});
 
@@ -1055,7 +1089,8 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						plugin.getSpecialRewards().giveMilestoneVoteReward(user, user.isOnline(), parseInt(args[3]));
+						plugin.getSpecialRewards().giveMilestoneVoteReward(user, user.isOnline(), parseInt(args[3]),
+								plugin.getBungeeSettings().isUseBungeecoord());
 						sendMessage(sender, "&cMilestone " + args[3] + " forced");
 					}
 				});
@@ -1116,7 +1151,7 @@ public class CommandLoader {
 						public void execute(CommandSender sender, String[] args) {
 							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
 							plugin.getSpecialRewards().giveVoteStreakReward(user, user.isOnline(), str, args[4],
-									parseInt(args[4]));
+									parseInt(args[4]), plugin.getBungeeSettings().isUseBungeecoord());
 							sendMessage(sender, "&cVoteStreak " + str + " " + args[4] + " forced");
 						}
 					});
@@ -1129,7 +1164,8 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						plugin.getSpecialRewards().giveCumulativeVoteReward(user, user.isOnline(), parseInt(args[3]));
+						plugin.getSpecialRewards().giveCumulativeVoteReward(user, user.isOnline(), parseInt(args[3]),
+								plugin.getBungeeSettings().isUseBungeecoord());
 						sendMessage(sender, "&cCumulative " + args[3] + " forced");
 					}
 				});
@@ -1140,7 +1176,8 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
-				plugin.getSpecialRewards().giveAllSitesRewards(user, user.isOnline());
+				plugin.getSpecialRewards().giveAllSitesRewards(user, user.isOnline(),
+						plugin.getBungeeSettings().isUseBungeecoord());
 				sendMessage(sender, "&cAllSites forced");
 			}
 		});
@@ -1151,7 +1188,8 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
-				plugin.getSpecialRewards().giveFirstVoteRewards(user, user.isOnline());
+				plugin.getSpecialRewards().giveFirstVoteRewards(user, user.isOnline(),
+						plugin.getBungeeSettings().isUseBungeecoord());
 				sendMessage(sender, "&cFirstVote forced");
 			}
 		});
@@ -1196,15 +1234,40 @@ public class CommandLoader {
 			return;
 		}
 		for (CommandHandler cmdHandle : plugin.getVoteCommand()) {
-			if (cmdHandle.getArgs().length > 0) {
+			int argLength = cmdHandle.getArgs().length;
+			String arg0 = "";
+			if (argLength > 0) {
+				arg0 = cmdHandle.getArgs()[0];
+			}
+			String[] perms = cmdHandle.getPerm().split(Pattern.quote("|"));
+			try {
+				if (perms.length > 1) {
+					// has another perm
+					plugin.devDebug("Adding child perm " + perms[0] + " to " + perms[1] + " from /vote" + arg0);
+					Permission p = Bukkit.getPluginManager().getPermission(perms[1]);
+					p.getChildren().put(perms[0], true);
+					p.recalculatePermissibles();
+				}
+			} catch (Exception e) {
+				plugin.debug("Failed to set permission for /vote" + arg0);
+			}
+			if (argLength > 0) {
 				String[] args = cmdHandle.getArgs()[0].split("&");
+
 				for (String arg : args) {
 					commands.put("vote" + arg, cmdHandle);
+
 					try {
 						plugin.getCommand("vote" + arg).setExecutor(new CommandAliases(cmdHandle, false));
 
 						plugin.getCommand("vote" + arg)
 								.setTabCompleter(new AliasesTabCompleter().setCMDHandle(cmdHandle, false));
+
+						String currentPerm = plugin.getCommand("vote" + arg).getPermission();
+						if (currentPerm == null || currentPerm.length() > perms[0].length()) {
+							plugin.getCommand("vote" + arg).setPermission(perms[0]);
+						}
+
 						for (String str : plugin.getCommand("vote" + arg).getAliases()) {
 							commands.put(str, cmdHandle);
 						}
@@ -1212,20 +1275,44 @@ public class CommandLoader {
 						plugin.devDebug("Failed to load command and tab completer for /vote" + arg);
 					}
 				}
-
 			}
 		}
 
 		for (CommandHandler cmdHandle : plugin.getAdminVoteCommand()) {
-			if (cmdHandle.getArgs().length > 0) {
+			int argLength = cmdHandle.getArgs().length;
+			String arg0 = "";
+			if (argLength > 0) {
+				arg0 = cmdHandle.getArgs()[0];
+			}
+			String[] perms = cmdHandle.getPerm().split(Pattern.quote("|"));
+			try {
+				if (perms.length > 1) {
+					// has another perm
+					plugin.devDebug("Adding child perm " + perms[0] + " to " + perms[1] + " from /adminvote" + arg0);
+					Permission p = Bukkit.getPluginManager().getPermission(perms[1]);
+					p.getChildren().put(perms[0], true);
+					p.recalculatePermissibles();
+				}
+			} catch (Exception e) {
+				plugin.debug("Failed to set permission for /adminvote" + arg0);
+			}
+
+			if (argLength > 0) {
 				String[] args = cmdHandle.getArgs()[0].split("&");
 				for (String arg : args) {
 					commands.put("adminvote" + arg, cmdHandle);
+
 					try {
 						plugin.getCommand("adminvote" + arg).setExecutor(new CommandAliases(cmdHandle, true));
 
 						plugin.getCommand("adminvote" + arg)
 								.setTabCompleter(new AliasesTabCompleter().setCMDHandle(cmdHandle, true));
+
+						String currentPerm = plugin.getCommand("adminvote" + arg).getPermission();
+						if (currentPerm == null || currentPerm.length() > perms[0].length()) {
+							plugin.getCommand("adminvote" + arg).setPermission(perms[0]);
+						}
+
 						for (String str : plugin.getCommand("adminvote" + arg).getAliases()) {
 							commands.put(str, cmdHandle);
 						}
@@ -1385,6 +1472,28 @@ public class CommandLoader {
 			}
 		});
 
+		ArrayList<String> topVoter = new ArrayList<String>();
+		for (TopVoter top : TopVoter.values()) {
+			topVoter.add(top.toString());
+		}
+
+		TabCompleteHandler.getInstance().addTabCompleteOption(new TabCompleteHandle("(topvoter)", topVoter) {
+
+			@Override
+			public void reload() {
+				ArrayList<String> topVoter = new ArrayList<String>();
+				for (TopVoter top : TopVoter.values()) {
+					topVoter.add(top.toString());
+				}
+				setReplace(topVoter);
+
+			}
+
+			@Override
+			public void updateReplacements() {
+			}
+		});
+
 		TabCompleteHandler.getInstance().addTabCompleteOption(new TabCompleteHandle("(VoteShop)", sites) {
 
 			@Override
@@ -1537,6 +1646,16 @@ public class CommandLoader {
 			});
 		}
 
+		plugin.getVoteCommand().add(new CommandHandler(new String[] { "URL", "(SiteName)" },
+				"VotingPlugin.Commands.Vote.URL.VoteSite", "Open VoteURL GUI for VoteSite", false) {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				new VoteURLVoteSite(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender),
+						args[1]).open();
+			}
+		});
+
 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "URL" },
 				"VotingPlugin.Commands.Vote.URL|" + playerPerm, "Open VoteURL GUI", false) {
 
@@ -1547,15 +1666,6 @@ public class CommandLoader {
 
 			}
 		});
-		plugin.getVoteCommand().add(new CommandHandler(new String[] { "URL", "(SiteName)" },
-				"VotingPlugin.Commands.Vote.URL.VoteSite", "Open VoteURL GUI for VoteSite", false) {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				new VoteURLVoteSite(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender),
-						args[1]).open();
-			}
-		});
 
 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Last", "(player)" },
 				"VotingPlugin.Commands.Vote.Last.Other|" + modPerm, "See other players last votes") {
@@ -1656,15 +1766,6 @@ public class CommandLoader {
 			}
 		});
 
-		plugin.getVoteCommand().add(new CommandHandler(new String[] { "GUI" },
-				"VotingPlugin.Commands.Vote.GUI|" + playerPerm, "Open VoteGUI", false) {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				new VoteGUI(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender)).open();
-			}
-		});
-
 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "GUI", "(player)" },
 				"VotingPlugin.Commands.Vote.GUI.Other|" + modPerm, "Open VoteGUI", false) {
 
@@ -1680,6 +1781,15 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.getVoteCommand().add(new CommandHandler(new String[] { "GUI" },
+				"VotingPlugin.Commands.Vote.GUI|" + playerPerm, "Open VoteGUI", false) {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				new VoteGUI(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender)).open();
+			}
+		});
+
 		if (plugin.getGui().isLastMonthGUI()) {
 			plugin.getVoteCommand()
 					.add(new CommandHandler(new String[] { "LastMonthTop" },
@@ -1704,6 +1814,34 @@ public class CommandLoader {
 			}
 		});
 
+		for (final TopVoter top : TopVoter.values()) {
+			String argName = top.toString();
+			String perm = top.toString();
+			if (argName.equals(TopVoter.AllTime.toString())) {
+				argName = "All";
+				perm = "All";
+			}
+
+			plugin.getVoteCommand().add(new CommandHandler(new String[] { "Top", argName },
+					"VotingPlugin.Commands.Vote.Top." + perm + "|" + playerPerm, "Open page of Top Voters") {
+
+				@Override
+				public void execute(CommandSender sender, String[] args) {
+					new VoteTopVoter(plugin, sender, null, top, 1).open(GUIMethod.CHAT);
+				}
+			});
+
+			plugin.getVoteCommand().add(new CommandHandler(new String[] { "Top", argName, "(number)" },
+					"VotingPlugin.Commands.Vote.Top." + perm + "|" + playerPerm, "Open page of Top Voters") {
+
+				@Override
+				public void execute(CommandSender sender, String[] args) {
+					int page = Integer.parseInt(args[2]);
+					new VoteTopVoter(plugin, sender, null, top, page).open(GUIMethod.CHAT);
+				}
+			});
+		}
+
 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Top", "(number)" },
 				"VotingPlugin.Commands.Vote.Top|" + playerPerm, "Open page of Top Voters") {
 
@@ -1715,47 +1853,6 @@ public class CommandLoader {
 			}
 		});
 
-		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Top", "(number)", "Monthly" },
-				"VotingPlugin.Commands.Vote.Top.Monthly|" + playerPerm, "Open page of Top Voters") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				int page = Integer.parseInt(args[1]);
-				new VoteTopVoter(plugin, sender, null, TopVoter.Monthly, page).open(GUIMethod.CHAT);
-			}
-		});
-
-		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Top", "(number)", "All" },
-				"VotingPlugin.Commands.Vote.Top.All|" + playerPerm, "Open page of Top Voters All Time") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				int page = Integer.parseInt(args[1]);
-				new VoteTopVoter(plugin, sender, null, TopVoter.AllTime, page).open(GUIMethod.CHAT);
-			}
-		});
-
-		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Top", "(number)", "Weekly" },
-				"VotingPlugin.Commands.Vote.Top.Weekly|" + playerPerm, "Open page of Top Voters") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				int page = Integer.parseInt(args[1]);
-				new VoteTopVoter(plugin, sender, null, TopVoter.Weekly, page).open(GUIMethod.CHAT);
-
-			}
-		});
-
-		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Top", "(number)", "Daily" },
-				"VotingPlugin.Commands.Vote.Top.Daily|" + playerPerm, "Open page of Top Voters") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				int page = Integer.parseInt(args[1]);
-				new VoteTopVoter(plugin, sender, null, TopVoter.Daily, page).open(GUIMethod.CHAT);
-			}
-		});
-
 		plugin.getVoteCommand()
 				.add(new CommandHandler(new String[] { "Party" }, "VotingPlugin.Commands.Vote.Party|" + playerPerm,
 						"View current amount of votes and how many more needed") {
@@ -1929,7 +2026,13 @@ public class CommandLoader {
 						if (sender instanceof Player) {
 							user = UserManager.getInstance().getVotingPluginUser((Player) sender);
 						}
-						new VoteURL(plugin, sender, user, true).open();
+						if (plugin.getConfigFile().isUseVoteGUIMainCommand() && sender instanceof Player) {
+							// vote gui command
+							new VoteGUI(plugin, sender, user).open();
+						} else {
+							new VoteURL(plugin, sender, user, true).open();
+						}
+
 					}
 				});
 
@@ -1938,7 +2041,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				new VoteURL(plugin, sender, null, true).open();
+				new VoteURL(plugin, sender, null, true).open(GUIMethod.CHAT);
 			}
 		});
 

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

@@ -1,6 +1,8 @@
 package com.bencodez.votingplugin.commands.gui.admin;
 
 import java.util.ArrayList;
+import java.util.Set;
+import java.util.regex.Pattern;
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -19,9 +21,10 @@ public class AdminVotePerms extends GUIHandler {
 	private String playerName;
 	private VotingPluginMain plugin;
 
-	public AdminVotePerms(VotingPluginMain plugin, CommandSender player) {
+	public AdminVotePerms(VotingPluginMain plugin, CommandSender player, int page) {
 		super(player);
 		this.plugin = plugin;
+		this.page = page;
 	}
 
 	public AdminVotePerms(VotingPluginMain plugin, CommandSender player, int page, String playerName) {
@@ -38,17 +41,18 @@ public class AdminVotePerms extends GUIHandler {
 
 	public String[] listPerms(CommandSender sender) {
 		ArrayList<String> msg = new ArrayList<String>();
-		msg.add("&c&lCommand : Permissions (seperated by |)");
 
 		for (CommandHandler handle : plugin.getVoteCommand()) {
 			if (sender instanceof Player) {
 				if (handle.hasPerm(sender)) {
-					msg.add("&a" + handle.getHelpLineCommand("/vote") + " : " + handle.getPerm() + " : true");
+					msg.add("&6" + handle.getHelpLineCommand("/vote") + " : "
+							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &atrue");
 				} else {
-					msg.add("&c" + handle.getHelpLineCommand("/vote") + " : " + handle.getPerm() + " : false");
+					msg.add("&6" + handle.getHelpLineCommand("/vote") + " : "
+							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &cfalse");
 				}
 			} else {
-				msg.add(handle.getHelpLineCommand("/vote") + " : " + handle.getPerm());
+				msg.add(handle.getHelpLineCommand("/vote") + " : " + handle.getPerm().split(Pattern.quote("|"))[0]);
 			}
 
 		}
@@ -56,30 +60,57 @@ public class AdminVotePerms extends GUIHandler {
 		for (CommandHandler handle : plugin.getAdminVoteCommand()) {
 			if (sender instanceof Player) {
 				if (handle.hasPerm(sender)) {
-					msg.add("&a" + handle.getHelpLineCommand("/av") + " : " + handle.getPerm() + " : true");
+					msg.add("&6" + handle.getHelpLineCommand("/av") + " : "
+							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &atrue");
 				} else {
-					msg.add("&c" + handle.getHelpLineCommand("/av") + " : " + handle.getPerm() + " : false");
+					msg.add("&6" + handle.getHelpLineCommand("/av") + " : "
+							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &cfalse");
 				}
 			} else {
-				msg.add(handle.getHelpLineCommand("/av") + " : " + handle.getPerm());
+				msg.add(handle.getHelpLineCommand("/av") + " : " + handle.getPerm().split(Pattern.quote("|"))[0]);
 			}
 		}
 
 		for (Permission perm : plugin.getDescription().getPermissions()) {
 			if (sender instanceof Player) {
-				if (sender.hasPermission(perm)) {
-					msg.add("&a" + perm.getName() + " : true");
+				Set<String> child = perm.getChildren().keySet();
+				if (child.size() > 0) {
+					if (sender.hasPermission(perm)) {
+						msg.add("&6" + perm.getName() + " : &atrue");
+					} else {
+						msg.add("&6" + perm.getName() + " : &cfalse");
+					}
 				} else {
-					msg.add("&c" + perm.getName() + " : false");
+					if (sender.hasPermission(perm)) {
+						msg.add("&6" + perm.getName() + " : &atrue");
+					} else {
+						msg.add("&6" + perm.getName() + " : &cfalse");
+					}
 				}
+
 			} else {
 				msg.add(perm.getName());
 			}
 		}
 
-		msg = ArrayUtils.getInstance().colorize(msg);
+		int pagesize = plugin.getConfigFile().getFormatPageSize();
 
-		return ArrayUtils.getInstance().convert(msg);
+		int maxPage = msg.size() / pagesize;
+		if ((msg.size() % pagesize) != 0) {
+			maxPage++;
+		}
+
+		ArrayList<String> text = new ArrayList<String>();
+
+		text.add("&c&lCommand : Permissions " + page + "/" + maxPage);
+
+		for (int i = pagesize * page - pagesize; i < msg.size() && i < pagesize * page; i++) {
+			text.add(msg.get(i));
+		}
+
+		text = ArrayUtils.getInstance().colorize(text);
+
+		return ArrayUtils.getInstance().convert(text);
 	}
 
 	public ArrayList<String> listPerms(CommandSender sender, String player, int page) {
@@ -91,26 +122,39 @@ public class AdminVotePerms extends GUIHandler {
 
 			for (CommandHandler handle : plugin.getVoteCommand()) {
 				if (handle.hasPerm(p)) {
-					msg.add("&a" + handle.getHelpLineCommand("/vote") + " : " + handle.getPerm() + " : true");
+					msg.add("&6" + handle.getHelpLineCommand("/vote") + " : "
+							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &atrue");
 				} else {
-					msg.add("&c" + handle.getHelpLineCommand("/vote") + " : " + handle.getPerm() + " : false");
+					msg.add("&6" + handle.getHelpLineCommand("/vote") + " : "
+							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &cfalse");
 				}
 
 			}
 
 			for (CommandHandler handle : plugin.getAdminVoteCommand()) {
 				if (handle.hasPerm(p)) {
-					msg.add("&a" + handle.getHelpLineCommand("/av") + " : " + handle.getPerm() + " : true");
+					msg.add("&6" + handle.getHelpLineCommand("/av") + " : "
+							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &atrue");
 				} else {
-					msg.add("&c" + handle.getHelpLineCommand("/av") + " : " + handle.getPerm() + " : false");
+					msg.add("&6" + handle.getHelpLineCommand("/av") + " : "
+							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &cfalse");
 				}
 			}
 
 			for (Permission perm : plugin.getDescription().getPermissions()) {
-				if (p.hasPermission(perm)) {
-					msg.add("&a" + perm.getName() + " : true");
+				Set<String> child = perm.getChildren().keySet();
+				if (child.size() > 0) {
+					if (p.hasPermission(perm)) {
+						msg.add("&6" + perm.getName() + " : &atrue");
+					} else {
+						msg.add("&6" + perm.getName() + " : &cfalse");
+					}
 				} else {
-					msg.add("&c" + perm.getName() + " : false");
+					if (p.hasPermission(perm)) {
+						msg.add("&6" + perm.getName() + " : &atrue");
+					} else {
+						msg.add("&6" + perm.getName() + " : &cfalse");
+					}
 				}
 			}
 
@@ -123,7 +167,7 @@ public class AdminVotePerms extends GUIHandler {
 				maxPage++;
 			}
 
-			text.add("&c&lCommand : Permissions (seperated by |) " + page + "/" + maxPage);
+			text.add("&c&lCommand : Permissions for " + player + " " + page + "/" + maxPage);
 
 			for (int i = pagesize * page - pagesize; i < msg.size() && i < pagesize * page; i++) {
 				text.add(msg.get(i));
@@ -135,6 +179,34 @@ public class AdminVotePerms extends GUIHandler {
 
 	}
 
+	public String[] listPermsDev(CommandSender sender) {
+		ArrayList<String> msg = new ArrayList<String>();
+		msg.add("Command");
+		msg.add("  Permissions (seperated by |");
+		msg.add("  Help messasge");
+		msg.add("  ");
+
+		for (CommandHandler handle : plugin.getVoteCommand()) {
+			msg.add(handle.getHelpLineCommand("/vote"));
+			msg.add("  " + handle.getPerm());
+			msg.add("  " + handle.getHelpMessage());
+		}
+
+		for (CommandHandler handle : plugin.getAdminVoteCommand()) {
+			msg.add(handle.getHelpLineCommand("/av"));
+			msg.add("  " + handle.getPerm());
+			msg.add("  " + handle.getHelpMessage());
+		}
+
+		for (Permission perm : plugin.getDescription().getPermissions()) {
+			msg.add(perm.getName() + " : " + perm.getDescription());
+		}
+
+		msg = ArrayUtils.getInstance().colorize(msg);
+
+		return ArrayUtils.getInstance().convert(msg);
+	}
+
 	@Override
 	public void onBook(Player player) {
 	}

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

@@ -11,8 +11,9 @@ import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.rewards.RewardHandler;
+import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.user.UserManager;
@@ -62,7 +63,14 @@ public class VoteGUI extends GUIHandler {
 					lore = plugin.getTopVoterHandler().topVoterAllTime(1);
 				}
 			} else if (slot.equalsIgnoreCase("today")) {
-				lore = new VoteToday(plugin, player, user, 1).voteToday();
+				String[] today = new VoteToday(plugin, player, user, 1).voteTodayGUI();
+				ArrayList<String> list = new ArrayList<String>();
+				if (today.length > 0) {
+					for (int i = today.length - 1; i < today.length && list.size() < 10 && i >= 0; i--) {
+						list.add(today[i]);
+					}
+				}
+				lore = ArrayUtils.getInstance().convert(list);
 			} else if (slot.equalsIgnoreCase("help")) {
 				lore = new String[] { "Click to view help" };
 			}
@@ -112,14 +120,8 @@ public class VoteGUI extends GUIHandler {
 
 	@Override
 	public void onChest(Player player) {
-		if ((!player.getName().equals(user.getPlayerName())
-				&& !player.hasPermission("VotingPlugin.Commands.Vote.GUI.Other")
-				&& !player.hasPermission("VotingPlugin.Mod"))
-				|| (!player.hasPermission("VotingPlugin.Commands.Vote.GUI")
-						&& !player.hasPermission("VotingPlugin.Player"))) {
-			player.sendMessage(
-					StringParser.getInstance().colorize(VotingPluginMain.plugin.getOptions().getFormatNoPerms()));
-			return;
+		if (this.user == null) {
+			user = UserManager.getInstance().getVotingPluginUser((Player) player);
 		}
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteGUIName());
 		if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
@@ -171,6 +173,13 @@ public class VoteGUI extends GUIHandler {
 							new VoteTopVoterLastMonth(plugin, player, user).open(GUIMethod.CHEST);
 						}
 					}
+
+					if (RewardHandler.getInstance().hasRewards(plugin.getGui().getData(),
+							plugin.getGui().getChestVoteGUISlotRewardsPath(slot))) {
+						RewardHandler.getInstance().giveReward(UserManager.getInstance().getVotingPluginUser(player),
+								plugin.getGui().getData(), plugin.getGui().getChestVoteGUISlotRewardsPath(slot),
+								new RewardOptions().addPlaceholder("identifier", slot));
+					}
 				}
 
 				@Override

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

@@ -38,7 +38,9 @@ public class VoteLast extends GUIHandler {
 				"%player%", playerName));
 
 		for (VoteSite voteSite : plugin.getVoteSites()) {
-			msg.add(user.voteCommandLastLine(voteSite));
+			if (!voteSite.isHidden()) {
+				msg.add(user.voteCommandLastLine(voteSite));
+			}
 		}
 
 		return ArrayUtils.getInstance().colorize(msg);
@@ -59,20 +61,23 @@ public class VoteLast extends GUIHandler {
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteLastName());
 		inv.addPlaceholder("player", user.getPlayerName());
 		for (VoteSite site : plugin.getVoteSites()) {
-			inv.addButton(inv.getNextSlot(), new UpdatingBInventoryButton(site.getItem().setName(site.getDisplayName())
-					.setLore(user.voteCommandLastLine(site)).setAmountNone(1), 1000, 1000) {
+			if (!site.isHidden()) {
+				inv.addButton(inv.getNextSlot(),
+						new UpdatingBInventoryButton(site.getItem().setName(site.getDisplayName())
+								.setLore(user.voteCommandLastLine(site)).setAmountNone(1), 1000, 1000) {
 
-				@Override
-				public void onClick(ClickEvent clickEvent) {
+							@Override
+							public void onClick(ClickEvent clickEvent) {
 
-				}
+							}
 
-				@Override
-				public ItemBuilder onUpdate(Player p) {
-					return site.getItem().setName(site.getDisplayName()).setLore(user.voteCommandLastLine(site))
-							.setAmountNone(1);
-				}
-			});
+							@Override
+							public ItemBuilder onUpdate(Player p) {
+								return site.getItem().setName(site.getDisplayName())
+										.setLore(user.voteCommandLastLine(site)).setAmountNone(1);
+							}
+						});
+			}
 		}
 
 		if (plugin.getGui().getChestVoteLastBackButton()) {

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

@@ -42,15 +42,17 @@ public class VoteNext extends GUIHandler {
 				.replaceIgnoreCase(plugin.getConfigFile().getFormatCommandsVoteNextTitle(), "%player%", playerName)));
 
 		for (VoteSite voteSite : plugin.getVoteSites()) {
+			if (!voteSite.isHidden()) {
 
-			String msgLine = plugin.getConfigFile().getFormatCommandsVoteNextLayout();
+				String msgLine = plugin.getConfigFile().getFormatCommandsVoteNextLayout();
 
-			msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%info%",
-					user.voteCommandNextInfo(voteSite));
-
-			msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%SiteName%", voteSite.getDisplayName());
-			msg.add(StringParser.getInstance().colorize(msgLine));
+				msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%info%",
+						user.voteCommandNextInfo(voteSite));
 
+				msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%SiteName%",
+						voteSite.getDisplayName());
+				msg.add(StringParser.getInstance().colorize(msgLine));
+			}
 		}
 		return msg;
 	}

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

@@ -106,7 +106,7 @@ public class VoteShop extends GUIHandler {
 								}
 
 								if (limitPass) {
-									if (!plugin.getGui().isChestVoteShopRequireConfirmation()) {
+									if (!plugin.getGui().isChestVoteShopRequireConfirmation(identifier)) {
 										HashMap<String, String> placeholders = new HashMap<String, String>();
 										placeholders.put("identifier",
 												plugin.getGui().getChestShopIdentifierIdentifierName(identifier));
@@ -119,7 +119,7 @@ public class VoteShop extends GUIHandler {
 													new RewardOptions().setPlaceholders(placeholders));
 
 											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
-													plugin.getConfigFile().getFormatShopPurchaseMsg(), placeholders));
+													plugin.getGui().getCHESTVoteShopPurchase(identifier), placeholders));
 											if (limit > 0) {
 												user.setVoteShopIdentifierLimit(identifier,
 														user.getVoteShopIdentifierLimit(identifier) + 1);

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

@@ -66,7 +66,7 @@ public class VoteShopConfirm extends GUIHandler {
 							new RewardOptions().setPlaceholders(placeholders));
 
 					user.sendMessage(StringParser.getInstance()
-							.replacePlaceHolder(plugin.getConfigFile().getFormatShopPurchaseMsg(), placeholders));
+							.replacePlaceHolder(plugin.getGui().getCHESTVoteShopPurchase(identifier), placeholders));
 					if (limit > 0) {
 						user.setVoteShopIdentifierLimit(identifier, user.getVoteShopIdentifierLimit(identifier) + 1);
 					}

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

@@ -1,13 +1,13 @@
 package com.bencodez.votingplugin.commands.gui.player;
 
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Map.Entry;
 
-import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
 
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
@@ -17,6 +17,7 @@ import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.user.UUID;
 import com.bencodez.advancedcore.nms.NMSManager;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
@@ -89,19 +90,19 @@ public class VoteToday extends GUIHandler {
 				msg = StringParser.getInstance().replacePlaceHolder(msg, placeholders);
 				ItemBuilder item = null;
 				if (plugin.getGui().isChestVoteTodayUseSkull() && !NMSManager.getInstance().isVersion("1.12")) {
-					item = new ItemBuilder(new ItemStack(Material.PLAYER_HEAD, 1)).setSkullOwner(player);
+					item = new ItemBuilder(user.getPlayerHead());
 				} else {
 					item = new ItemBuilder(plugin.getGui().getChestVoteTodayPlayerItem());
 				}
 				item.setName(StringParser.getInstance().replacePlaceHolder(plugin.getGui().getChestVoteTodayIconTitle(),
 						"player", user.getPlayerName()));
 				item.setLore(msg);
+				final String uuid = user.getUUID();
 				inv.addButton(inv.getNextSlot(), new BInventoryButton(item) {
 
 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						VotingPluginUser user = UserManager.getInstance()
-								.getVotingPluginUser(clickEvent.getClickedItem().getItemMeta().getDisplayName());
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
 						new VoteGUI(plugin, player, user)
 								.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
 					}
@@ -141,4 +142,31 @@ public class VoteToday extends GUIHandler {
 		return ArrayUtils.getInstance().convert(msg);
 	}
 
+	public String[] voteTodayGUI() {
+		ArrayList<String> msg = new ArrayList<String>();
+		for (VotingPluginUser user : plugin.getVoteToday().keySet()) {
+
+			LocalDateTime mostRecent = null;
+			VoteSite mostRecentSite = null;
+			for (Entry<VoteSite, LocalDateTime> entry : plugin.getVoteToday().get(user).entrySet()) {
+				if (mostRecent == null || entry.getValue().isAfter(mostRecent)) {
+					mostRecent = entry.getValue();
+					mostRecentSite = entry.getKey();
+				}
+			}
+			if (mostRecent != null) {
+				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(plugin.getConfigFile().getFormatTimeFormat());
+				String timeString = mostRecent.format(formatter);
+				HashMap<String, String> placeholders = new HashMap<String, String>();
+				placeholders.put("player", user.getPlayerName());
+				placeholders.put("votesite", mostRecentSite.getKey());
+				placeholders.put("time", timeString);
+				msg.add(StringParser.getInstance()
+						.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteTodayLine(), placeholders));
+			}
+		}
+		msg = ArrayUtils.getInstance().colorize(msg);
+		return ArrayUtils.getInstance().convert(msg);
+	}
+
 }

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

@@ -13,12 +13,14 @@ import com.bencodez.advancedcore.api.bookgui.Layout;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.MessageBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.topvoter.TopVoter;
@@ -41,7 +43,7 @@ public class VoteURL extends GUIHandler {
 		if (user == null && player instanceof Player) {
 			this.user = UserManager.getInstance().getVotingPluginUser((Player) player);
 		}
-		if (player.getName().equals(user.getPlayerName())) {
+		if (player != null && user != null && player.getName().equals(user.getPlayerName())) {
 			if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
 				user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
 			}
@@ -59,16 +61,18 @@ public class VoteURL extends GUIHandler {
 		if (plugin.getConfigFile().getFormatCommandsVoteAutoInputSites()) {
 			int counter = 0;
 			for (VoteSite voteSite : plugin.getVoteSites()) {
-				counter++;
-				String voteURL = voteSite.getVoteURL(json);
-				MessageBuilder message = new MessageBuilder(plugin.getConfigFile().getFormatCommandsVoteURLS());
-				message.replacePlaceholder("num", Integer.toString(counter)).replacePlaceholder("url", voteURL)
-						.replacePlaceholder("SiteName", voteSite.getDisplayName());
-				if (user != null && user.getPlayerName() != null) {
-					message.replacePlaceholder("player", "" + user.getPlayerName()).replacePlaceholder("Next",
-							"" + user.voteCommandNextInfo(voteSite));
+				if (!voteSite.isHidden()) {
+					counter++;
+					String voteURL = voteSite.getVoteURL(json);
+					MessageBuilder message = new MessageBuilder(plugin.getConfigFile().getFormatCommandsVoteURLS());
+					message.replacePlaceholder("num", Integer.toString(counter)).replacePlaceholder("url", voteURL)
+							.replacePlaceholder("SiteName", voteSite.getDisplayName());
+					if (user != null && user.getPlayerName() != null) {
+						message.replacePlaceholder("player", "" + user.getPlayerName()).replacePlaceholder("Next",
+								"" + user.voteCommandNextInfo(voteSite));
+					}
+					sites.add(message.colorize().getText());
 				}
-				sites.add(message.colorize().getText());
 			}
 		}
 		if (user != null) {
@@ -102,6 +106,10 @@ public class VoteURL extends GUIHandler {
 		if (!builderAll.hasCustomLore()) {
 			builderAll.setLore("&cClick Me");
 		}
+		int slot = plugin.getGui().getChestVoteURLAllUrlsButtonSlot();
+		if (slot >= 0) {
+			builderAll.setSlot(slot);
+		}
 		return builderAll;
 	}
 
@@ -151,12 +159,10 @@ public class VoteURL extends GUIHandler {
 	public void onChest(Player player) {
 		// normal GUI
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteURLName());
-
-		int count = 0;
 		if (plugin.getGui().getChestVoteURLViewAllUrlsButtonEnabled()) {
 			ItemBuilder builderAll = getItemAll();
 
-			inv.addButton(count, new UpdatingBInventoryButton(builderAll, 1000, 1000) {
+			inv.addButton(new UpdatingBInventoryButton(builderAll, 1000, 1000) {
 
 				@Override
 				public void onClick(ClickEvent event) {
@@ -170,38 +176,53 @@ public class VoteURL extends GUIHandler {
 					return getItemAll();
 				}
 			});
-
-			count++;
 		}
 
+		int startSlot = plugin.getGui().getChestVoteURLAllUrlsButtonStartSlot();
 		for (final VoteSite voteSite : plugin.getVoteSites()) {
-			ItemBuilder builder = getItemVoteSite(voteSite);
+			if (!voteSite.isHidden()) {
+				ItemBuilder builder = getItemVoteSite(voteSite);
+				if (startSlot >= 0) {
+					builder.setSlot(startSlot);
+					startSlot++;
+				}
 
-			inv.addButton(count, new UpdatingBInventoryButton(builder, 1000, 1000) {
+				inv.addButton(new UpdatingBInventoryButton(builder, 1000, 1000) {
 
-				@Override
-				public void onClick(ClickEvent event) {
-					Player player = event.getPlayer();
-					if (player != null) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-						user.sendMessage(StringParser.getInstance().replacePlaceHolder(
-								StringParser.getInstance()
-										.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
-												plugin.getGui().getChestVoteURLURLText(), "voteurl",
-												voteSite.getVoteURL()), "sitename", voteSite.getDisplayName()),
-								"player", player.getName()));
+					@Override
+					public void onClick(ClickEvent event) {
+						Player player = event.getPlayer();
+						if (player != null) {
+							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
+							user.sendMessage(StringParser.getInstance().replacePlaceHolder(StringParser.getInstance()
+									.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
+											plugin.getGui().getChestVoteURLURLText(), "voteurl", voteSite.getVoteURL()),
+											"sitename", voteSite.getDisplayName()),
+									"player", player.getName()));
+
+						}
 
 					}
 
-				}
+					@Override
+					public ItemBuilder onUpdate(Player player) {
+						return getItemVoteSite(voteSite);
+					}
+
+				});
+			}
+		}
+
+		for (final String str : plugin.getGui().getChestVoteURLExtraItems()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestVoteURLExtraItemsItem(str))) {
 
 				@Override
-				public ItemBuilder onUpdate(Player player) {
-					return getItemVoteSite(voteSite);
+				public void onClick(ClickEvent clickEvent) {
+					new RewardBuilder(plugin.getGui().getData(), "CHEST.VoteURL.ExtraItems." + str + ".Rewards")
+							.setGiveOffline(false).send(clickEvent.getPlayer());
+					;
 				}
-
 			});
-			count++;
 		}
 
 		if (plugin.getGui().getChestVoteURLBackButton()) {

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

@@ -25,9 +25,13 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private boolean bungeeDebug = false;
 
+	@ConfigDataBoolean(path = "VotifierBypass")
+	@Getter
+	private boolean votifierBypass = false;
+
 	@ConfigDataString(path = "BungeeMethod")
 	@Getter
-	private String bungeeMethod = "SOCKETS";
+	private String bungeeMethod = "PLUGINMESSAGING";
 
 	@ConfigDataString(path = "BungeeServer.Host")
 	@Getter
@@ -37,6 +41,14 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private int bungeeServerPort = 1297;
 
+	@ConfigDataBoolean(path = "RemoveInvalidUsers")
+	@Getter
+	private boolean removeInvalidUsers = false;
+
+	@ConfigDataBoolean(path = "PerServerRewards")
+	@Getter
+	private boolean perServerRewards = false;
+
 	@ConfigDataString(path = "Server")
 	@Getter
 	private String server = "PleaseSet";

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

@@ -36,6 +36,14 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean allowUnjoined = false;
 
+	@ConfigDataBoolean(path = "UseVoteGUIMainCommand")
+	@Getter
+	private boolean useVoteGUIMainCommand = false;
+	
+	@ConfigDataBoolean(path = "ExtraAllSitesCheck")
+	@Getter
+	private boolean extraAllSitesCheck = false;
+
 	@ConfigDataBoolean(path = "AllowUnJoinedCheckServer")
 	@Getter
 	private boolean allowUnJoinedCheckServer = true;
@@ -217,7 +225,7 @@ public class Config extends YMLFile {
 
 	@ConfigDataBoolean(path = "UseJavascriptPlaceholders")
 	@Getter
-	private boolean useJavascriptPlaceholders = true;
+	private boolean useJavascriptPlaceholders = false;
 
 	@ConfigDataBoolean(path = "UsePrimaryAccountForPlaceholders")
 	@Getter
@@ -639,8 +647,16 @@ public class Config extends YMLFile {
 		return getData().getBoolean("LoadTopVoter.AllTime", true);
 	}
 
+	@ConfigDataBoolean(path = "UseVoteStreaks")
+	@Getter
+	private boolean useVoteStreaks = true;
+
+	@ConfigDataBoolean(path = "UseHighestTotals")
+	@Getter
+	private boolean useHighestTotals = true;
+
 	public boolean getLoadTopVoterDaily() {
-		return getData().getBoolean("LoadTopVoter.Daily");
+		return getData().getBoolean("LoadTopVoter.Daily", false);
 	}
 
 	public boolean getLoadTopVoterMonthly() {
@@ -648,7 +664,7 @@ public class Config extends YMLFile {
 	}
 
 	public boolean getLoadTopVoterWeekly() {
-		return getData().getBoolean("LoadTopVoter.Weekly");
+		return getData().getBoolean("LoadTopVoter.Weekly", false);
 	}
 
 	public int getPointsOnVote() {

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

@@ -128,7 +128,7 @@ public class ConfigVoteSites extends YMLFile {
 	 * @return the vote delay
 	 */
 	public int getVoteDelay(String siteName) {
-		return getData(siteName).getInt("VoteDelay");
+		return getData(siteName).getInt("VoteDelay", 24);
 	}
 
 	public int getVoteDelayMin(String siteName) {
@@ -144,6 +144,10 @@ public class ConfigVoteSites extends YMLFile {
 	public boolean getVoteSiteEnabled(String siteName) {
 		return getData(siteName).getBoolean("Enabled");
 	}
+	
+	public boolean getVoteSiteHidden(String siteName) {
+		return getData(siteName).getBoolean("Hidden");
+	}
 
 	/**
 	 * Gets the vote site file.

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

@@ -144,6 +144,11 @@ public class GUI extends YMLFile {
 
 	private VotingPluginMain plugin;
 
+	public String getCHESTVoteShopPurchase(String identifier) {
+		return getData().getString("CHEST.Shop." + identifier + ".PurchaseMessage",
+				plugin.getConfigFile().getFormatShopPurchaseMsg());
+	}
+
 	public GUI(VotingPluginMain plugin) {
 		super(plugin, new File(plugin.getDataFolder(), "GUI.yml"));
 		this.plugin = plugin;
@@ -213,6 +218,10 @@ public class GUI extends YMLFile {
 		return getData().getString("CHEST.VoteGUI." + slot + ".Command", "");
 	}
 
+	public String getChestVoteGUISlotRewardsPath(String slot) {
+		return "CHEST.VoteGUI." + slot + ".Rewards";
+	}
+
 	/**
 	 * Gets the vote GUI slot lore.
 	 *
@@ -423,6 +432,25 @@ public class GUI extends YMLFile {
 		return getData().getConfigurationSection("CHEST.VoteURL.AlreadyVotedItem");
 	}
 
+	public int getChestVoteURLAllUrlsButtonSlot() {
+		return getData().getInt("CHEST.VoteURL.AllUrlsButton.Slot", -1);
+	}
+
+	public int getChestVoteURLAllUrlsButtonStartSlot() {
+		return getData().getInt("CHEST.VoteURL.StartSlot", -1);
+	}
+
+	public Set<String> getChestVoteURLExtraItems() {
+		if (getData().isConfigurationSection("CHEST.VoteURL.ExtraItems")) {
+			return getData().getConfigurationSection("CHEST.VoteURL.ExtraItems").getKeys(false);
+		}
+		return new HashSet<String>();
+	}
+
+	public ConfigurationSection getChestVoteURLExtraItemsItem(String item) {
+		return getData().getConfigurationSection("CHEST.VoteURL.ExtraItems." + item);
+	}
+
 	public boolean getChestVoteURLBackButton() {
 		return getData().getBoolean("CHEST.VoteURL.BackButton");
 	}
@@ -497,4 +525,9 @@ public class GUI extends YMLFile {
 	public void onFileCreation() {
 		plugin.saveResource("GUI.yml", true);
 	}
+
+	public boolean isChestVoteShopRequireConfirmation(String identifier) {
+		return getData().getBoolean("CHEST.Shop." + identifier + ".RequireConfirmation",
+				isChestVoteShopRequireConfirmation());
+	}
 }

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

@@ -27,7 +27,7 @@ public class SpecialRewardsConfig extends YMLFile {
 
 	@ConfigDataBoolean(path = "EnableMonthlyAwards")
 	@Getter
-	private boolean enableMonthlyAwards = false;
+	private boolean enableMonthlyAwards = true;
 
 	@ConfigDataBoolean(path = "EnableWeeklyAwards")
 	@Getter
@@ -43,6 +43,10 @@ public class SpecialRewardsConfig extends YMLFile {
 	@Getter
 	private boolean votePartyResetExtraVotesMonthly = false;
 
+	@ConfigDataBoolean(path = "VoteParty.ResetCount")
+	@Getter
+	private boolean votePartyResetCount = true;
+
 	@Getter
 	private String votePartyRewardsPath = "VoteParty.Rewards";
 
@@ -229,9 +233,17 @@ public class SpecialRewardsConfig extends YMLFile {
 		return getData().getBoolean("VoteParty.ResetEachDay");
 	}
 
+	public boolean getVotePartyOnlyOncePerDay() {
+		return getData().getBoolean("VoteParty.OnlyOncePerDay");
+	}
+
 	public boolean getVotePartyResetMontly() {
 		return getData().getBoolean("VoteParty.ResetMonthly");
 	}
+	
+	public boolean getVotePartyResetWeekly() {
+		return getData().getBoolean("VoteParty.ResetWeekly");
+	}
 
 	public int getVotePartyUserVotesRequired() {
 		return getData().getInt("VoteParty.UserVotesRequired");

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

@@ -239,4 +239,17 @@ public class ServerData {
 	public void updateValues() {
 		setVersion();
 	}
+
+	public boolean isLastVotePartySameDay() {
+		int num = getData().getInt("LastVoteParty", 0);
+		if (num != plugin.getTimeChecker().getTime().getDayOfYear()) {
+			return true;
+		}
+		return false;
+	}
+
+	public void updateLastVoteParty() {
+		getData().set("LastVoteParty", plugin.getTimeChecker().getTime().getDayOfYear());
+		saveData();
+	}
 }

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

@@ -3,7 +3,9 @@ package com.bencodez.votingplugin.events;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
+import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.objects.VoteSite;
+import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -36,7 +38,7 @@ public class PlayerVoteEvent extends Event {
 
 	@Getter
 	@Setter
-	private String bungeeTextTotals;
+	private BungeeMessageData bungeeTextTotals;
 
 	@Getter
 	@Setter
@@ -66,6 +68,10 @@ public class PlayerVoteEvent extends Event {
 	@Setter
 	private VoteSite voteSite;
 
+	@Getter
+	@Setter
+	private VotingPluginUser votingPluginUser;
+
 	public PlayerVoteEvent(VoteSite voteSite, String voteUsername, String serviceSite, boolean realVote) {
 		super(true);
 		this.player = voteUsername;

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

@@ -13,6 +13,7 @@ import com.bencodez.votingplugin.VotingPluginMain;
 /**
  * The Class PlayerJoinEvent.
  */
+@Deprecated
 public class PlayerCommandSendListener implements Listener {
 
 	@SuppressWarnings("unused")

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

@@ -49,10 +49,18 @@ public class PlayerVoteListener implements Listener {
 			if (!plugin.getConfigFile().isAllowUnjoined()) {
 				plugin.getLogger().warning("Player " + playerName
 						+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
+				if (event.isBungee() && plugin.getBungeeSettings().isRemoveInvalidUsers()) {
+					UserManager.getInstance().getVotingPluginUser(playerName).remove();
+				}
 				return;
 			}
 		}
 
+		if (playerName.isEmpty()) {
+			plugin.getLogger().warning("Empty player name for vote");
+			return;
+		}
+
 		if (event.isBungee()) {
 			plugin.debug("BungeePlayerVote forcebungee: " + event.isForceBungee() + ", bungeetotals: "
 					+ event.getBungeeTextTotals());
@@ -64,8 +72,6 @@ public class PlayerVoteListener implements Listener {
 		if (voteSite == null) {
 			if (!plugin.getConfigFile().isDisableNoServiceSiteMessage()) {
 				plugin.getLogger().warning("No voting site with the service site: '" + event.getServiceSite() + "'");
-				plugin.getLogger().warning(
-						"Please read here on how to fix it: https://github.com/Ben12345rocks/VotingPlugin/wiki/Common-Problems");
 
 				ArrayList<String> services = new ArrayList<String>();
 				for (VoteSite site : plugin.getVoteSites()) {
@@ -77,7 +83,12 @@ public class PlayerVoteListener implements Listener {
 			return;
 		}
 
-		VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(playerName);
+		VotingPluginUser user = null;
+		if (event.getVotingPluginUser() != null) {
+			user = event.getVotingPluginUser();
+		} else {
+			user = UserManager.getInstance().getVotingPluginUser(playerName);
+		}
 		user.updateName(true);
 
 		if (plugin.getConfigFile().isClearCacheOnVote() || plugin.getBungeeSettings().isUseBungeecoord()) {
@@ -92,7 +103,7 @@ public class PlayerVoteListener implements Listener {
 		synchronized (object) {
 
 			// vote party
-			plugin.getVoteParty().vote(user, event.isRealVote());
+			plugin.getVoteParty().vote(user, event.isRealVote(), event.isForceBungee());
 
 			// broadcast vote if enabled in config
 			if (plugin.getConfigFile().isBroadcastVotesEnabled()
@@ -122,7 +133,7 @@ public class PlayerVoteListener implements Listener {
 			}
 
 			// check first vote rewards
-			plugin.getSpecialRewards().checkFirstVote(user);
+			plugin.getSpecialRewards().checkFirstVote(user, event.isForceBungee());
 
 			if (user.isReminded()) {
 				user.setReminded(false);
@@ -133,6 +144,7 @@ public class PlayerVoteListener implements Listener {
 			if (((user.isOnline() || voteSite.isGiveOffline())
 					&& VotingPluginMain.plugin.getOptions().isProcessRewards()) || event.isBungee()) {
 				user.playerVote(voteSite, true, false, event.isForceBungee());
+				user.sendVoteEffects(true);
 				user.closeInv();
 			} else {
 				user.addOfflineVote(voteSite.getKey());
@@ -150,12 +162,12 @@ public class PlayerVoteListener implements Listener {
 				user.addPoints();
 			}
 
-			user.checkDayVoteStreak();
+			user.checkDayVoteStreak(event.isForceBungee());
 
 			// other rewards
-			plugin.getSpecialRewards().checkAllSites(user);
-			plugin.getSpecialRewards().checkCumualativeVotes(user, event.getBungeeTextTotals());
-			plugin.getSpecialRewards().checkMilestone(user, event.getBungeeTextTotals());
+			plugin.getSpecialRewards().checkAllSites(user, event.isForceBungee());
+			plugin.getSpecialRewards().checkCumualativeVotes(user, event.getBungeeTextTotals(), event.isForceBungee());
+			plugin.getSpecialRewards().checkMilestone(user, event.getBungeeTextTotals(), event.isForceBungee());
 
 			if (plugin.getBungeeSettings().isUseBungeecoord()) {
 				if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.MYSQL)) {

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

@@ -9,8 +9,8 @@ import org.bukkit.event.Listener;
 
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
-import com.bencodez.votingplugin.objects.VoteSite;
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.model.VotifierEvent;
 
@@ -68,6 +68,14 @@ public class VotiferEvent implements Listener {
 
 			@Override
 			public void run() {
+
+				if (plugin.getBungeeSettings().isUseBungeecoord() && !plugin.getBungeeSettings().isVotifierBypass()
+						&& (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)
+								|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.SOCKETS))) {
+					plugin.getLogger().severe(
+							"Ignoring vote from votifier since pluginmessaging or socket bungee method is enabled");
+					return;
+				}
 				String voteSiteName = plugin.getVoteSiteName(voteSite);
 
 				ArrayList<String> sites = plugin.getConfigVoteSites().getVoteSitesNames();
@@ -84,13 +92,9 @@ public class VotiferEvent implements Listener {
 					plugin.getLogger().warning("VoteSite with service site '" + voteSiteName
 							+ "' does not exist, attempting to generaterate...");
 					plugin.getConfigVoteSites().generateVoteSite(voteSiteName);
-
-					ArrayList<String> services = new ArrayList<String>();
-					for (VoteSite site : plugin.getVoteSites()) {
-						services.add(site.getServiceSite());
-					}
+					
 					plugin.getLogger()
-							.info("Current known service sites: " + ArrayUtils.getInstance().makeStringList(services));
+							.info("Current known service sites: " + ArrayUtils.getInstance().makeStringList(plugin.getServerData().getServiceSites()));
 				}
 
 				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName), voteUsername,

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

@@ -36,6 +36,10 @@ public class VoteSite {
 	@Setter
 	private boolean enabled;
 
+	@Getter
+	@Setter
+	private boolean hidden;
+
 	@Getter
 	@Setter
 	private boolean giveOffline;
@@ -147,9 +151,9 @@ public class VoteSite {
 	 */
 	public ItemBuilder getItem() {
 		if (item == null) {
-			plugin.getLogger().warning("Invalid item section in site: " + key);
-			return new ItemBuilder(Material.STONE, 1).setName("&cInvalid item for site: " + key)
-					.setLore("&cInvalid item for site: " + key);
+			plugin.getLogger().warning("Invalid display item section in site: " + key);
+			return new ItemBuilder(Material.STONE, 1).setName("&cInvalid display item for site: " + key)
+					.setLore("&cInvalid display item for site: " + key);
 		} else {
 			return new ItemBuilder(item);
 		}
@@ -223,6 +227,7 @@ public class VoteSite {
 		giveOffline = plugin.getConfigVoteSites().getVoteSiteGiveOffline(key);
 		waitUntilVoteDelay = plugin.getConfigVoteSites().getWaitUntilVoteDelay(key);
 		timeOffSet = plugin.getConfigVoteSites().getTimeOffSet(key);
+		hidden = plugin.getConfigVoteSites().getVoteSiteHidden(key);
 	}
 
 	public boolean isVaidServiceSite() {

VotingPlugin/src/com/bencodez/votingplugin/specialrewards/SpecialRewards.java

@@ -1,5 +1,6 @@
 package com.bencodez.votingplugin.specialrewards;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Set;
 
@@ -10,6 +11,7 @@ import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.events.PlayerSpecialRewardEvent;
 import com.bencodez.votingplugin.events.SpecialRewardType;
 import com.bencodez.votingplugin.topvoter.TopVoter;
@@ -27,21 +29,28 @@ public class SpecialRewards {
 		this.plugin = plugin;
 	}
 
-	/**
-	 * Check all sites.
-	 *
-	 * @param user the user
-	 * @return true, if successful
-	 */
-	public boolean checkAllSites(VotingPluginUser user) {
+	public boolean checkAllSites(VotingPluginUser user, boolean forceBungee) {
 		boolean checkAllVotes = user.checkAllVotes();
+		if (checkAllVotes
+				&& (plugin.getConfigFile().isExtraAllSitesCheck() || plugin.getBungeeSettings().isUseBungeecoord())) {
+			int currentDay = LocalDateTime.now().getDayOfYear();
+			int day = user.getGottenAllSitesDay();
+			if (currentDay == day) {
+				checkAllVotes = false;
+				plugin.debug("Not giving allsites, already gotten today");
+			} else {
+				user.setGottenAllSitesDay(currentDay);
+			}
+
+		}
 		if (checkAllVotes) {
-			giveAllSitesRewards(user, user.isOnline());
+			giveAllSitesRewards(user, user.isOnline(), forceBungee);
 		}
 		return checkAllVotes;
 	}
 
-	public boolean checkCumualativeVotes(VotingPluginUser user, String bungeeTextTotals) {
+	public boolean checkCumualativeVotes(VotingPluginUser user, BungeeMessageData bungeeMessageData,
+			boolean forceBungee) {
 		boolean gotCumulativeAny = false;
 		Set<String> votes = plugin.getSpecialRewardsConfig().getCumulativeVotes();
 		for (String vote : votes) {
@@ -53,35 +62,30 @@ public class SpecialRewards {
 									plugin.getSpecialRewardsConfig().getCumulativeRewardsPath(votesRequired))) {
 						boolean gotCumulative = false;
 						int total = 0;
-						boolean useBungeeTotalNum = false;
-						String[] data = new String[] { "0", "0", "0", "0" };
-						if (bungeeTextTotals != null) {
-							data = bungeeTextTotals.split("//");
-							useBungeeTotalNum = true;
-						}
+						boolean useBungeeTotalNum = bungeeMessageData != null;
 						if (plugin.getSpecialRewardsConfig().getCumulativeVotesInSameDay(votesRequired)) {
 							if (!useBungeeTotalNum) {
 								total = user.getTotal(TopVoter.Daily);
 							} else {
-								total = Integer.parseInt(data[3]);
+								total = bungeeMessageData.getDailyTotal();
 							}
 						} else if (plugin.getSpecialRewardsConfig().getCumulativeVotesInSameWeek(votesRequired)) {
 							if (!useBungeeTotalNum) {
 								total = user.getTotal(TopVoter.Weekly);
 							} else {
-								total = Integer.parseInt(data[2]);
+								total = bungeeMessageData.getWeeklyTotal();
 							}
 						} else if (plugin.getSpecialRewardsConfig().getCumulativeVotesInSameMonth(votesRequired)) {
 							if (!useBungeeTotalNum) {
 								total = user.getTotal(TopVoter.Monthly);
 							} else {
-								total = Integer.parseInt(data[1]);
+								total = bungeeMessageData.getMonthTotal();
 							}
 						} else {
 							if (!useBungeeTotalNum) {
 								total = user.getTotal(TopVoter.AllTime);
 							} else {
-								total = Integer.parseInt(data[0]);
+								total = bungeeMessageData.getAllTimeTotal();
 							}
 						}
 
@@ -93,7 +97,7 @@ public class SpecialRewards {
 
 						if (gotCumulative) {
 							gotCumulativeAny = true;
-							giveCumulativeVoteReward(user, user.isOnline(), votesRequired);
+							giveCumulativeVoteReward(user, user.isOnline(), votesRequired, forceBungee);
 							plugin.debug(user.getPlayerName() + " got cumulative " + votesRequired);
 						} else {
 							plugin.devDebug(user.getPlayerName() + " not able to get cumulative " + votesRequired);
@@ -107,17 +111,11 @@ public class SpecialRewards {
 		return gotCumulativeAny;
 	}
 
-	/**
-	 * Check first vote.
-	 *
-	 * @param user the user
-	 * @return true, if successful
-	 */
-	public boolean checkFirstVote(VotingPluginUser user) {
+	public boolean checkFirstVote(VotingPluginUser user, boolean forceBungee) {
 		if (RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath())) {
 			if (!user.hasGottenFirstVote()) {
-				giveFirstVoteRewards(user, user.isOnline());
+				giveFirstVoteRewards(user, user.isOnline(), forceBungee);
 				return true;
 			}
 
@@ -125,17 +123,14 @@ public class SpecialRewards {
 		return false;
 	}
 
-	public boolean checkMilestone(VotingPluginUser user, String bungeeTextTotals) {
+	public boolean checkMilestone(VotingPluginUser user, BungeeMessageData bungeeMessageData, boolean forceBungee) {
 		int milestoneCount = user.getMilestoneCount();
-		if (bungeeTextTotals != null) {
-			String[] data = bungeeTextTotals.split("//");
-			if (data.length > 4) {
-				try {
-					milestoneCount = Integer.parseInt(data[5]);
-				} catch (Exception e) {
-					e.printStackTrace();
-					milestoneCount = user.getMilestoneCount();
-				}
+		if (bungeeMessageData != null) {
+			try {
+				milestoneCount = bungeeMessageData.getMilestoneCount();
+			} catch (Exception e) {
+				e.printStackTrace();
+				milestoneCount = user.getMilestoneCount();
 			}
 		}
 		if (plugin.getConfigFile().isPreventRepeatMilestones()) {
@@ -175,7 +170,7 @@ public class SpecialRewards {
 
 						int userVotesTotal = milestoneCount;
 						if (userVotesTotal >= votesRequired && !user.hasGottenMilestone(votesRequired)) {
-							giveMilestoneVoteReward(user, user.isOnline(), votesRequired);
+							giveMilestoneVoteReward(user, user.isOnline(), votesRequired, forceBungee);
 							user.setHasGotteMilestone(votesRequired, true);
 							plugin.debug(user.getPlayerName() + " got milestone " + votesRequired);
 
@@ -189,7 +184,7 @@ public class SpecialRewards {
 		return gotMilestone;
 	}
 
-	public boolean checkVoteStreak(VotingPluginUser user, String type) {
+	public boolean checkVoteStreak(VotingPluginUser user, String type, boolean forceBungee) {
 		boolean gotReward = false;
 
 		Set<String> streaks = plugin.getSpecialRewardsConfig().getVoteStreakVotes(type);
@@ -216,14 +211,16 @@ public class SpecialRewards {
 						}
 						if (!multiple) {
 							if (curStreak == streakRequired) {
-								giveVoteStreakReward(user, user.isOnline(), type, "" + streakRequired, curStreak);
+								giveVoteStreakReward(user, user.isOnline(), type, "" + streakRequired, curStreak,
+										forceBungee);
 								gotReward = true;
 								plugin.debug(
 										user.getPlayerName() + " got VoteStreak " + streakRequired + " for " + type);
 							}
 						} else {
 							if (curStreak != 0 && curStreak % streakRequired == 0) {
-								giveVoteStreakReward(user, user.isOnline(), type, streakRequired + "-", curStreak);
+								giveVoteStreakReward(user, user.isOnline(), type, streakRequired + "-", curStreak,
+										forceBungee);
 								gotReward = true;
 								plugin.debug(
 										user.getPlayerName() + " got VoteStreak " + streakRequired + "* for " + type);
@@ -239,13 +236,7 @@ public class SpecialRewards {
 
 	}
 
-	/**
-	 * Give all sites rewards.
-	 *
-	 * @param user   the user
-	 * @param online the online
-	 */
-	public void giveAllSitesRewards(VotingPluginUser user, boolean online) {
+	public void giveAllSitesRewards(VotingPluginUser user, boolean online, boolean forceBungee) {
 		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user, SpecialRewardType.ALLSITE);
 		Bukkit.getPluginManager().callEvent(event);
 
@@ -253,17 +244,11 @@ public class SpecialRewards {
 			return;
 		}
 		RewardHandler.getInstance().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getAllSitesRewardPath(), new RewardOptions().setOnline(online));
+				plugin.getSpecialRewardsConfig().getAllSitesRewardPath(),
+				new RewardOptions().setServer(forceBungee).setOnline(online));
 	}
 
-	/**
-	 * Give cumulative vote reward.
-	 *
-	 * @param user       the user
-	 * @param online     the online
-	 * @param cumulative the cumulative
-	 */
-	public void giveCumulativeVoteReward(VotingPluginUser user, boolean online, int cumulative) {
+	public void giveCumulativeVoteReward(VotingPluginUser user, boolean online, int cumulative, boolean forceBungee) {
 		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user,
 				SpecialRewardType.CUMMULATIVE.setAmount(cumulative));
 		Bukkit.getPluginManager().callEvent(event);
@@ -273,17 +258,11 @@ public class SpecialRewards {
 		}
 
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getCumulativeRewardsPath(cumulative)).setOnline(online)
-						.withPlaceHolder("Cumulative", "" + cumulative).send(user);
+				plugin.getSpecialRewardsConfig().getCumulativeRewardsPath(cumulative)).setServer(forceBungee)
+						.setOnline(online).withPlaceHolder("Cumulative", "" + cumulative).send(user);
 	}
 
-	/**
-	 * Give first vote rewards.
-	 *
-	 * @param user   the user
-	 * @param online the online
-	 */
-	public void giveFirstVoteRewards(VotingPluginUser user, boolean online) {
+	public void giveFirstVoteRewards(VotingPluginUser user, boolean online, boolean forceBungee) {
 		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user, SpecialRewardType.FIRSTVOTE);
 		Bukkit.getPluginManager().callEvent(event);
 
@@ -291,17 +270,11 @@ public class SpecialRewards {
 			return;
 		}
 		RewardHandler.getInstance().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath(), new RewardOptions().setOnline(online));
+				plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath(),
+				new RewardOptions().setServer(forceBungee).setOnline(online));
 	}
 
-	/**
-	 * Give milestone vote reward.
-	 *
-	 * @param user      the user
-	 * @param online    the online
-	 * @param milestone the milestone
-	 */
-	public void giveMilestoneVoteReward(VotingPluginUser user, boolean online, int milestone) {
+	public void giveMilestoneVoteReward(VotingPluginUser user, boolean online, int milestone, boolean forceBungee) {
 		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user,
 				SpecialRewardType.MILESTONE.setAmount(milestone));
 		Bukkit.getPluginManager().callEvent(event);
@@ -311,10 +284,11 @@ public class SpecialRewards {
 		}
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getMilestoneRewardsPath(milestone)).setOnline(online)
-						.withPlaceHolder("Milestone", "" + milestone).send(user);
+						.withPlaceHolder("Milestone", "" + milestone).setServer(forceBungee).send(user);
 	}
 
-	public void giveVoteStreakReward(VotingPluginUser user, boolean online, String type, String string, int votes) {
+	public void giveVoteStreakReward(VotingPluginUser user, boolean online, String type, String string, int votes,
+			boolean forceBungee) {
 		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user,
 				SpecialRewardType.VOTESTREAK.setType(type).setAmount(votes));
 		Bukkit.getPluginManager().callEvent(event);
@@ -324,7 +298,8 @@ public class SpecialRewards {
 		}
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath(type, string)).setOnline(online)
-						.withPlaceHolder("Type", type).withPlaceHolder("Streak", "" + votes).send(user);
+						.withPlaceHolder("Type", type).setServer(forceBungee).withPlaceHolder("Streak", "" + votes)
+						.send(user);
 	}
 
 }

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

@@ -60,7 +60,7 @@ public enum TopVoter {
 				if (next > list.size() - 1) {
 					next = 0;
 				}
-				return TopVoter.values()[next];
+				return list.get(next);
 			}
 		}
 		return TopVoter.AllTime;
@@ -86,9 +86,25 @@ public enum TopVoter {
 				if (prev < 0) {
 					prev = list.size() - 1;
 				}
-				return TopVoter.values()[prev];
+				return list.get(prev);
 			}
 		}
 		return TopVoter.AllTime;
 	}
+
+	public String getColumnName() {
+		switch (this) {
+		case AllTime:
+			return "AllTimeTotal";
+		case Daily:
+			return "DailyTotal";
+		case Monthly:
+			return "MonthTotal";
+		case Weekly:
+			return "WeeklyTotal";
+		default:
+			return null;
+		
+		}
+	}
 }

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

@@ -18,12 +18,14 @@ import org.bukkit.event.Listener;
 
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.time.TimeType;
 import com.bencodez.advancedcore.api.time.events.DateChangedEvent;
 import com.bencodez.advancedcore.api.time.events.DayChangeEvent;
 import com.bencodez.advancedcore.api.time.events.MonthChangeEvent;
 import com.bencodez.advancedcore.api.time.events.PreDateChangedEvent;
 import com.bencodez.advancedcore.api.time.events.WeekChangeEvent;
 import com.bencodez.advancedcore.api.user.UUID;
+import com.bencodez.advancedcore.api.user.UserStorage;
 import com.bencodez.advancedcore.api.yml.YMLFileHandler;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.UserManager;
@@ -104,7 +106,12 @@ public class TopVoterHandler implements Listener {
 	public void onDateChanged(DateChangedEvent event) {
 		plugin.setUpdate(true);
 		plugin.update();
-		loadLastMonth();
+		if (event.getTimeType().equals(TimeType.MONTH)) {
+			loadLastMonth();
+		}
+		if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
+			plugin.getMysql().clearCache();
+		}
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -112,14 +119,18 @@ public class TopVoterHandler implements Listener {
 		synchronized (VotingPluginMain.plugin) {
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				if (!user.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
-					if (user.getDayVoteStreak() != 0) {
-						user.setDayVoteStreak(0);
+				if (plugin.getConfigFile().isUseVoteStreaks()) {
+					if (!user.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
+						if (user.getDayVoteStreak() != 0) {
+							user.setDayVoteStreak(0);
+						}
 					}
 				}
 
-				if (user.getHighestDailyTotal() < user.getTotal(TopVoter.Daily)) {
-					user.setHighestDailyTotal(user.getTotal(TopVoter.Daily));
+				if (plugin.getConfigFile().isUseHighestTotals()) {
+					if (user.getHighestDailyTotal() < user.getTotal(TopVoter.Daily)) {
+						user.setHighestDailyTotal(user.getTotal(TopVoter.Daily));
+					}
 				}
 				for (String shopIdent : plugin.getGui().getChestShopIdentifiers()) {
 					if (plugin.getGui().getChestVoteShopResetDaily(shopIdent)) {
@@ -163,6 +174,10 @@ public class TopVoterHandler implements Listener {
 			}
 
 			resetTotals(TopVoter.Daily);
+
+			if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
+				plugin.getMysql().clearCache();
+			}
 		}
 	}
 
@@ -171,15 +186,18 @@ public class TopVoterHandler implements Listener {
 		synchronized (VotingPluginMain.plugin) {
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				if (user.getTotal(TopVoter.Monthly) == 0 && user.getMonthVoteStreak() != 0) {
-					user.setMonthVoteStreak(0);
-				} else {
-					if (!plugin.getSpecialRewardsConfig().isVoteStreakRequirementUsePercentage()
-							|| user.hasPercentageTotal(TopVoter.Monthly,
-									plugin.getSpecialRewardsConfig().getVoteStreakRequirementMonth(),
-									LocalDateTime.now().minusDays(1))) {
-						user.addMonthVoteStreak();
-						plugin.getSpecialRewards().checkVoteStreak(user, "Month");
+				if (plugin.getConfigFile().isUseVoteStreaks()) {
+					if (user.getTotal(TopVoter.Monthly) == 0 && user.getMonthVoteStreak() != 0) {
+						user.setMonthVoteStreak(0);
+					} else {
+						if (!plugin.getSpecialRewardsConfig().isVoteStreakRequirementUsePercentage()
+								|| user.hasPercentageTotal(TopVoter.Monthly,
+										plugin.getSpecialRewardsConfig().getVoteStreakRequirementMonth(),
+										LocalDateTime.now().minusDays(1))) {
+							user.addMonthVoteStreak();
+							plugin.getSpecialRewards().checkVoteStreak(user, "Month",
+									plugin.getBungeeSettings().isUseBungeecoord());
+						}
 					}
 				}
 
@@ -191,8 +209,10 @@ public class TopVoterHandler implements Listener {
 
 				user.setLastMonthTotal(user.getTotal(TopVoter.Monthly));
 
-				if (user.getHighestMonthlyTotal() < user.getTotal(TopVoter.Monthly)) {
-					user.setHighestMonthlyTotal(user.getTotal(TopVoter.Monthly));
+				if (plugin.getConfigFile().isUseHighestTotals()) {
+					if (user.getHighestMonthlyTotal() < user.getTotal(TopVoter.Monthly)) {
+						user.setHighestMonthlyTotal(user.getTotal(TopVoter.Monthly));
+					}
 				}
 			}
 
@@ -243,6 +263,10 @@ public class TopVoterHandler implements Listener {
 				}
 
 			}
+
+			if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
+				plugin.getMysql().clearCache();
+			}
 		}
 	}
 
@@ -257,14 +281,17 @@ public class TopVoterHandler implements Listener {
 		synchronized (VotingPluginMain.plugin) {
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				if (user.getTotal(TopVoter.Weekly) == 0 && user.getWeekVoteStreak() != 0) {
-					user.setWeekVoteStreak(0);
-				} else {
-					if (!plugin.getSpecialRewardsConfig().isVoteStreakRequirementUsePercentage()
-							|| user.hasPercentageTotal(TopVoter.Weekly,
-									plugin.getSpecialRewardsConfig().getVoteStreakRequirementWeek(), null)) {
-						user.addWeekVoteStreak();
-						plugin.getSpecialRewards().checkVoteStreak(user, "Week");
+				if (plugin.getConfigFile().isUseVoteStreaks()) {
+					if (user.getTotal(TopVoter.Weekly) == 0 && user.getWeekVoteStreak() != 0) {
+						user.setWeekVoteStreak(0);
+					} else {
+						if (!plugin.getSpecialRewardsConfig().isVoteStreakRequirementUsePercentage()
+								|| user.hasPercentageTotal(TopVoter.Weekly,
+										plugin.getSpecialRewardsConfig().getVoteStreakRequirementWeek(), null)) {
+							user.addWeekVoteStreak();
+							plugin.getSpecialRewards().checkVoteStreak(user, "Week",
+									plugin.getBungeeSettings().isUseBungeecoord());
+						}
 					}
 				}
 
@@ -274,8 +301,10 @@ public class TopVoterHandler implements Listener {
 					}
 				}
 
-				if (user.getHighestWeeklyTotal() < user.getTotal(TopVoter.Weekly)) {
-					user.setHighestWeeklyTotal(user.getTotal(TopVoter.Weekly));
+				if (plugin.getConfigFile().isUseHighestTotals()) {
+					if (user.getHighestWeeklyTotal() < user.getTotal(TopVoter.Weekly)) {
+						user.setHighestWeeklyTotal(user.getTotal(TopVoter.Weekly));
+					}
 				}
 			}
 
@@ -313,6 +342,10 @@ public class TopVoterHandler implements Listener {
 				e.printStackTrace();
 			}
 			resetTotals(TopVoter.Weekly);
+
+			if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
+				plugin.getMysql().clearCache();
+			}
 		}
 	}
 
@@ -321,11 +354,15 @@ public class TopVoterHandler implements Listener {
 	}
 
 	public void resetTotals(TopVoter topVoter) {
-		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-			VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getTotal(topVoter) != 0) {
-				user.resetTotals(topVoter);
+		if (!plugin.getStorageType().equals(UserStorage.MYSQL)) {
+			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				if (user.getTotal(topVoter) != 0) {
+					user.resetTotals(topVoter);
+				}
 			}
+		} else {
+			plugin.getMysql().wipeColumnData(topVoter.getColumnName());
 		}
 	}
 
@@ -370,17 +407,19 @@ public class TopVoterHandler implements Listener {
 		} else if (top.equals(TopVoter.Weekly)) {
 			fileName += "_" + week;
 		}
-		fileName += ".yml";
+		fileName += "_" + System.currentTimeMillis() + ".yml";
 
 		YMLFileHandler file = new YMLFileHandler(plugin, new File(plugin.getDataFolder(), fileName));
 		file.setup();
-		ArrayList<String> topVoters = new ArrayList<String>();
-		int count = 1;
-		for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(top).entrySet()) {
-			topVoters.add(count + ": " + entry.getKey().getPlayerName() + ": " + entry.getValue());
-			count++;
+		for (TopVoter cTop : TopVoter.values()) {
+			ArrayList<String> topVoters = new ArrayList<String>();
+			int count = 1;
+			for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(cTop).entrySet()) {
+				topVoters.add(count + ": " + entry.getKey().getPlayerName() + ": " + entry.getValue());
+				count++;
+			}
+			file.getData().set(cTop.toString(), topVoters);
 		}
-		file.getData().set(top.toString(), topVoters);
 		file.saveData();
 	}
 
@@ -412,7 +451,7 @@ public class TopVoterHandler implements Listener {
 		String title = plugin.getConfigFile().getFormatCommandVoteTopTitle();
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
-		title = title.replace("%Top%", "All Time");
+		title = title.replace("%Top%", plugin.getConfigFile().getFormatTopVoterAllTime());
 		msg.add(StringParser.getInstance().colorize(title));
 
 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
@@ -451,7 +490,7 @@ public class TopVoterHandler implements Listener {
 		String title = plugin.getConfigFile().getFormatCommandVoteTopTitle();
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
-		title = title.replace("%Top%", "Daily");
+		title = title.replace("%Top%", plugin.getConfigFile().getFormatTopVoterDaily());
 		msg.add(StringParser.getInstance().colorize(title));
 
 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
@@ -490,7 +529,7 @@ public class TopVoterHandler implements Listener {
 		String title = plugin.getConfigFile().getFormatCommandVoteTopTitle();
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
-		title = title.replace("%Top%", "Monthly");
+		title = title.replace("%Top%", plugin.getConfigFile().getFormatTopVoterMonthly());
 		msg.add(StringParser.getInstance().colorize(title));
 
 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
@@ -610,7 +649,7 @@ public class TopVoterHandler implements Listener {
 		String title = plugin.getConfigFile().getFormatCommandVoteTopTitle();
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
-		title = title.replace("%Top%", "Weekly");
+		title = title.replace("%Top%", plugin.getConfigFile().getFormatTopVoterWeekly());
 		msg.add(StringParser.getInstance().colorize(title));
 
 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {

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

@@ -26,7 +26,7 @@ public class UserManager {
 	public UserManager() {
 		super();
 	}
-	
+
 	public ArrayList<String> getAllUUIDs() {
 		return com.bencodez.advancedcore.api.user.UserManager.getInstance().getAllUUIDs();
 	}
@@ -39,8 +39,13 @@ public class UserManager {
 		return getVotingPluginUser(new UUID(uuid.toString()));
 	}
 
+	@SuppressWarnings("deprecation")
+	public VotingPluginUser getVotingPluginUser(java.util.UUID uuid, String playerName) {
+		return new VotingPluginUser(plugin, new UUID(uuid.toString()), playerName);
+	}
+
 	public VotingPluginUser getVotingPluginUser(OfflinePlayer player) {
-		return getVotingPluginUser(player.getName());
+		return getVotingPluginUser(player.getUniqueId(), player.getName());
 	}
 
 	public VotingPluginUser getVotingPluginUser(Player player) {

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

@@ -25,6 +25,7 @@ import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.user.UUID;
 import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.events.PlayerReceivePointsEvent;
 import com.bencodez.votingplugin.events.PlayerVoteCoolDownEndEvent;
@@ -59,6 +60,12 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		this.plugin = plugin;
 	}
 
+	@Deprecated
+	public VotingPluginUser(VotingPluginMain plugin, UUID uuid, String playerName) {
+		super(plugin, uuid, playerName);
+		this.plugin = plugin;
+	}
+
 	@Deprecated
 	public VotingPluginUser(VotingPluginMain plugin, UUID uuid, boolean loadName) {
 		super(plugin, uuid, loadName);
@@ -81,12 +88,6 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		setMonthVoteStreak(getMonthVoteStreak() + 1);
 	}
 
-	public void addOfflineOtherReward(String reward) {
-		ArrayList<String> offlineOtherRewards = getOfflineOtherRewards();
-		offlineOtherRewards.add(reward);
-		setOfflineOtherRewards(offlineOtherRewards);
-	}
-
 	public void addOfflineVote(String voteSiteName) {
 		ArrayList<String> offlineVotes = getOfflineVotes();
 		offlineVotes.add(voteSiteName);
@@ -150,7 +151,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		setWeekVoteStreak(getWeekVoteStreak() + 1);
 	}
 
-	public void bungeeVote(String service) {
+	public void bungeeVote(String service, BungeeMessageData text, boolean setTotals) {
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
 			VotingPluginMain.plugin.debug("Bungee vote for " + getPlayerName() + " on " + service);
 
@@ -158,6 +159,9 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 					true);
 			voteEvent.setBungee(true);
 			voteEvent.setForceBungee(true);
+			voteEvent.setAddTotals(setTotals);
+			voteEvent.setBungeeTextTotals(text);
+			voteEvent.setVotingPluginUser(this);
 			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 				@Override
@@ -168,14 +172,17 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		}
 	}
 
-	public void bungeeVoteOnline(String service) {
+	public void bungeeVoteOnline(String service, BungeeMessageData text, boolean setTotals) {
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
 			VotingPluginMain.plugin.debug("Bungee online vote for " + getPlayerName() + " on " + service);
 
 			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
 					true);
 			voteEvent.setBungee(true);
-			voteEvent.setForceBungee(false);
+			voteEvent.setForceBungee(true);
+			voteEvent.setAddTotals(setTotals);
+			voteEvent.setBungeeTextTotals(text);
+			voteEvent.setVotingPluginUser(this);
 			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 				@Override
@@ -186,17 +193,18 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		}
 	}
 
-	public void bungeeVotePluginMessaging(String service, long time, String bungeeTextTotals) {
+	public void bungeeVotePluginMessaging(String service, long time, BungeeMessageData text, boolean setTotals) {
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
 			VotingPluginMain.plugin.debug("Pluginmessaging vote for " + getPlayerName() + " on " + service);
 
 			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
 					true);
 			voteEvent.setBungee(true);
+			voteEvent.setVotingPluginUser(this);
 			voteEvent.setForceBungee(true);
 			voteEvent.setTime(time);
-			voteEvent.setAddTotals(false);
-			voteEvent.setBungeeTextTotals(bungeeTextTotals);
+			voteEvent.setAddTotals(setTotals);
+			voteEvent.setBungeeTextTotals(text);
 			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 				@Override
@@ -232,6 +240,22 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		return false;
 	}
 
+	public int getGottenAllSitesDay() {
+		if (plugin.getBungeeSettings().isUseBungeecoord()) {
+			return getData().getInt("AllSitesLast_" + plugin.getBungeeSettings().getServer(), 0, true);
+		} else {
+			return getData().getInt("AllSitesLast", 0, true);
+		}
+	}
+
+	public void setGottenAllSitesDay(int day) {
+		if (plugin.getBungeeSettings().isUseBungeecoord()) {
+			getData().setInt("AllSitesLast_" + plugin.getBungeeSettings().getServer(), day);
+		} else {
+			getData().setInt("AllSitesLast", day);
+		}
+	}
+
 	/**
 	 * Can vote site.
 	 *
@@ -322,12 +346,12 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		}
 	}
 
-	public void checkDayVoteStreak() {
+	public void checkDayVoteStreak(boolean forceBungee) {
 		if (!voteStreakUpdatedToday(LocalDateTime.now())) {
 			if (!plugin.getSpecialRewardsConfig().isVoteStreakRequirementUsePercentage() || hasPercentageTotal(
 					TopVoter.Daily, plugin.getSpecialRewardsConfig().getVoteStreakRequirementDay(), null)) {
 				addDayVoteStreak();
-				plugin.getSpecialRewards().checkVoteStreak(this, "Day");
+				plugin.getSpecialRewards().checkVoteStreak(this, "Day", forceBungee);
 				setDayVoteStreakLastUpdate(System.currentTimeMillis());
 			}
 		}
@@ -493,10 +517,6 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		return getData().getInt("MonthVoteStreak", isWaitForCache());
 	}
 
-	public ArrayList<String> getOfflineOtherRewards() {
-		return getUserData().getStringList("OfflineOtherRewards");
-	}
-
 	public ArrayList<String> getOfflineVotes() {
 		return getUserData().getStringList("OfflineVotes");
 	}
@@ -610,57 +630,6 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 						.withPlaceHolder("votes", "" + getTotal(TopVoter.Monthly)).setOnline(isOnline()).send(this);
 	}
 
-	public void giveOfflineOtherRewards() {
-		// old reward api, will be removed in the future
-		ArrayList<String> offlineRewards = getOfflineOtherRewards();
-		for (String str : offlineRewards) {
-			if (str.equalsIgnoreCase("FirstVote")) {
-				plugin.getSpecialRewards().giveFirstVoteRewards(this, false);
-			} else if (str.equalsIgnoreCase("AllSites")) {
-				plugin.getSpecialRewards().giveAllSitesRewards(this, false);
-			} else if (str.equalsIgnoreCase("VoteParty")) {
-				plugin.getVoteParty().giveReward(this, false);
-			} else if (str.contains("Cumulative")) {
-				String st = str.substring("Cumulative".length());
-				if (StringParser.getInstance().isInt(st)) {
-					int votesRequired = Integer.parseInt(st);
-					if (votesRequired != 0) {
-						if (plugin.getSpecialRewardsConfig().getCumulativeRewardEnabled(votesRequired)) {
-							plugin.getSpecialRewards().giveCumulativeVoteReward(this, false, votesRequired);
-						}
-					}
-				}
-			} else if (str.contains("MileStone")) {
-				String st = str.substring("MileStone".length());
-				if (StringParser.getInstance().isInt(st)) {
-					int votesRequired = Integer.parseInt(st);
-					if (votesRequired > 0) {
-						if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(votesRequired)) {
-							plugin.getSpecialRewards().giveMilestoneVoteReward(this, true, votesRequired);
-						}
-					}
-				}
-			} else if (str.contains("VoteStreak")) {
-				String[] args = str.split("_");
-				if (args.length > 2) {
-					String type = args[1];
-					String st = args[2];
-
-					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled(type, st)) {
-						plugin.getSpecialRewards().giveVoteStreakReward(this, false, type, "" + st, -1);
-					}
-
-				}
-			} else {
-				plugin.debug("Reward handle for " + str + " does not exist!");
-			}
-
-		}
-		if (!offlineRewards.isEmpty()) {
-			setOfflineOtherRewards(new ArrayList<String>());
-		}
-	}
-
 	public void giveWeeklyTopVoterAward(int place, String path) {
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getWeeklyAwardRewardsPath(path)).withPlaceHolder("place", "" + place)
@@ -769,8 +738,6 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 					plugin.debug("Site doesn't exist: " + offlineVotes.get(i));
 				}
 			}
-
-			giveOfflineOtherRewards();
 		}
 	}
 

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

@@ -15,6 +15,7 @@ import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.time.events.DayChangeEvent;
 import com.bencodez.advancedcore.api.time.events.MonthChangeEvent;
+import com.bencodez.advancedcore.api.time.events.WeekChangeEvent;
 import com.bencodez.advancedcore.api.user.UUID;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.events.VotePartyEvent;
@@ -55,25 +56,30 @@ public class VoteParty implements Listener {
 		}
 	}
 
-	/**
-	 * Check.
-	 */
-	public void check() {
-		if (getTotalVotes() >= getVotesRequired()) {
-			setTotalVotes(getTotalVotes() - getVotesRequired());
+	public void check(boolean forceBungee) {
+		if (getTotalVotes() >= getVotesRequired() && ((plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerDay()
+				&& plugin.getServerData().isLastVotePartySameDay())
+				|| !plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerDay())) {
+			if (plugin.getSpecialRewardsConfig().isVotePartyResetCount()) {
+				setTotalVotes(getTotalVotes() - getVotesRequired());
+			}
 
 			VotePartyEvent event = new VotePartyEvent();
 			Bukkit.getPluginManager().callEvent(event);
 			if (event.isCancelled()) {
 				return;
 			}
-			MiscUtils.getInstance().broadcast(plugin.getSpecialRewardsConfig().getVotePartyBroadcast());
-			giveRewards();
+
+			giveRewards(forceBungee);
 
 			if (plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRquired() > 0) {
 				plugin.getServerData().setVotePartyExtraRequired(plugin.getServerData().getVotePartyExtraRequired()
 						+ plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRquired());
 			}
+
+			if (plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerDay()) {
+				plugin.getServerData().updateLastVoteParty();
+			}
 		}
 
 	}
@@ -144,27 +150,27 @@ public class VoteParty implements Listener {
 		return required;
 	}
 
-	public void giveReward(VotingPluginUser user) {
+	public void giveReward(VotingPluginUser user, boolean useBungee) {
 		if (plugin.getSpecialRewardsConfig().getVotePartyUserVotesRequired() > 0) {
 			if (user.getVotePartyVotes() < plugin.getSpecialRewardsConfig().getVotePartyUserVotesRequired()) {
 				return;
 			}
 		}
-		giveReward(user, user.isOnline());
+		giveReward(user, user.isOnline(), useBungee);
 	}
 
-	public void giveReward(VotingPluginUser user, boolean online) {
+	public void giveReward(VotingPluginUser user, boolean online, boolean useBungee) {
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getVotePartyRewardsPath()).setOnline(online)
+				plugin.getSpecialRewardsConfig().getVotePartyRewardsPath())
+						.setOnline(online)
 						.withPlaceHolder("VotesRequired",
 								"" + plugin.getSpecialRewardsConfig().getVotePartyVotesRequired())
-						.send(user);
+						.setServer(useBungee).send(user);
 	}
 
-	/**
-	 * Give rewards.
-	 */
-	public void giveRewards() {
+	public void giveRewards(boolean forceBungee) {
+		MiscUtils.getInstance().broadcast(plugin.getSpecialRewardsConfig().getVotePartyBroadcast());
+
 		for (final String cmd : plugin.getSpecialRewardsConfig().getVotePartyCommands()) {
 			Bukkit.getScheduler().runTask(plugin, new Runnable() {
 
@@ -180,30 +186,37 @@ public class VoteParty implements Listener {
 			plugin.debug("Trying to give all players vote party");
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				giveReward(user);
+				giveReward(user, forceBungee);
 			}
 		} else {
-			plugin.debug("Trying to give all online players vote party");
+			plugin.debug("Trying to give all voted players vote party");
 			plugin.debug(ArrayUtils.getInstance().makeStringList(getVotedUsers()));
 			for (String uuid : getVotedUsers()) {
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				giveReward(user);
+				giveReward(user, forceBungee);
 			}
 		}
-		reset();
+		reset(false);
 	}
 
 	@EventHandler
 	public void onDayChange(DayChangeEvent event) {
 		if (plugin.getSpecialRewardsConfig().getVotePartyResetEachDay()) {
-			reset();
+			reset(true);
+		}
+	}
+
+	@EventHandler
+	public void onWeekChange(WeekChangeEvent event) {
+		if (plugin.getSpecialRewardsConfig().getVotePartyResetWeekly()) {
+			reset(true);
 		}
 	}
 
 	@EventHandler
 	public void onMonthChange(MonthChangeEvent event) {
 		if (plugin.getSpecialRewardsConfig().getVotePartyResetMontly()) {
-			reset();
+			reset(true);
 		}
 
 		if (plugin.getSpecialRewardsConfig().isVotePartyResetExtraVotesMonthly()) {
@@ -215,9 +228,11 @@ public class VoteParty implements Listener {
 		plugin.getServer().getPluginManager().registerEvents(this, plugin);
 	}
 
-	public void reset() {
+	public void reset(boolean override) {
+		if (override) {
+			setTotalVotes(0);
+		}
 		setVotedUsers(new ArrayList<String>());
-		setTotalVotes(0);
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
 			if (user.getVotePartyVotes() != 0) {
@@ -247,13 +262,13 @@ public class VoteParty implements Listener {
 		plugin.getServerData().saveData();
 	}
 
-	public synchronized void vote(VotingPluginUser user, boolean realVote) {
+	public synchronized void vote(VotingPluginUser user, boolean realVote, boolean forceBungee) {
 		if (plugin.getSpecialRewardsConfig().getVotePartyEnabled()) {
 			if (plugin.getSpecialRewardsConfig().getVotePartyCountFakeVotes() || realVote) {
 				if (plugin.getSpecialRewardsConfig().getVotePartyCountOfflineVotes() || user.isOnline()) {
 					addTotal(user);
 					addVotePlayer(user);
-					check();
+					check(forceBungee);
 				}
 			}
 		}

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

@@ -95,7 +95,8 @@ public class VoteReminding {
 			if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
 				user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
 			}
-			if ((!UserManager.getInstance().getAllUUIDs().contains(user.getUUID()) || user.canVoteAll())
+			if ((!UserManager.getInstance().getAllUUIDs().contains(user.getUUID()) || (user.canVoteAll()
+					|| (user.canVoteAny() && user.hasPermission("VotingPlugin.Login.RemindVotes.Any"))))
 					&& user.shouldBeReminded()) {
 				giveReward(user);
 				if (user.getData().hasData()) {