Fixed missing column types for mysql

README.md

@@ -2,10 +2,6 @@
 Plugin on SpigotMC
 https://www.spigotmc.org/resources/votingplugin.15358/
 
-![img](http://badge.henrya.org/spigot/downloads?id=15358&color=green)
-
-![img2](http://badge.henrya.org/spigot/version?id=15358&color=red)
-
 ## License
 ### Creative Commons Arttribution 3.0 Unported
 https://github.com/BenCodez/VotingPlugin/blob/master/VotingPlugin/Resources/LICENSE.txt
@@ -23,19 +19,6 @@ https://github.com/BenCodez/VotingPlugin/blob/master/VotingPlugin/Resources/LICE
 	    <version>LATEST</version>
 	    <scope>provided</scope>
     </dependency>
-
-    BACKUP/OLD WAY
-    <repository>
-        <id>jitpack.io</id>
-        <url>https://jitpack.io</url>
-    </repository>
-    
-    <dependency>
-	    <groupId>com.github.BenCodez</groupId>
-	    <artifactId>VotingPlugin</artifactId>
-	    <version>LATEST</version>
-	    <scope>provided</scope>
-	</dependency>
   
   Versions:  
   LATEST - latest stable release  

VotingPlugin/Resources/BungeeSettings.yml

@@ -1,8 +1,8 @@
-# --------------------------
+##########################################
 # Bungee Setup 
 # Only if using votingplugin bungee to send votes
 # REQUIRES RESTART FOR CHANGES TO TAKE EFFECT
-# --------------------------
+##########################################
 
 # Plugin using bungee, requires plugin on bungee server
 UseBungeecord: false
@@ -12,7 +12,7 @@ UseBungeecord: false
 # https://github.com/BenCodez/VotingPlugin/wiki/Bungeecord-Setups
 # Available:
 # SOCKETS
-# PLUGINMESSAGING
+# PLUGINMESSAGING (Recommended)
 # MYSQL
 BungeeMethod: PLUGINMESSAGING
 
@@ -62,7 +62,11 @@ Server: PleaseSet
 # Can edit via /av gui
 BungeeVotePartyRewards: {}
 
-# ----------------------------------------------------------------
+# List of commands to run on bungee party
+# This runs a one time command only
+BungeeVotePartyGlobalCommands: []
+
+####################################################################################
 # Global mysql data handle for between server commmunications
 # This is NOT required for bungee voting to work
 # This is still a WIP, use with caution
@@ -97,8 +101,10 @@ GlobalData:
   #Attempt to use mariadb driver
   #UseMariaDB: false
 
-# -----------------------------
-# For socket setup below only
-# -----------------------------
+##########################################
+# For socket setup
+# Recommend to try PLUGINMESSAGING setup first
+# Options hidden by default to avoid confusion
+##########################################
 # Options available here:
 # https://github.com/BenCodez/VotingPlugin/wiki/Bungee-Setup-SOCKETS

VotingPlugin/Resources/Config.yml

@@ -4,7 +4,11 @@
 # https://github.com/BenCodez/VotingPlugin/wiki
 # Config is sorted in sections
 # Use Control + F to search with Notepad++
-# 
+
+
+###########################################
+# User storage
+###########################################
 # Valid Options:
 # - SQLITE 
 # - FLAT
@@ -33,22 +37,10 @@ MySQL:
   #Attempt to use mariadb driver
   #UseMariaDB: false
 
-# --------------------
-# 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)
-AllowUnjoined: false
-
-# Use server lookup for when allowunjoined is set to false
-# Recommend leaving enabled unless you face issues
-AllowUnJoinedCheckServer: true
-
-# ------------------------------------------------
+###########################################
 # VoteReminding
-# ------------------------------------------------
+###########################################
 
 # Configuration for VoteReminding
 # By default this should be all setup to work
@@ -91,9 +83,9 @@ VoteReminding:
       Message: '&cRemember to vote'
       Delay: 30
     
-# ------------------------------------------------
-# Format
-# ------------------------------------------------
+###########################################
+# Format options
+###########################################
     
 # Common PlacesHolders:
 # Special PlaceHolders will be commented where available
@@ -329,11 +321,19 @@ Format:
     Weekly: 'Weekly'
     Monthly: 'Monthly'
     AllTime: 'AllTime'
+    
+# Playernames to not be broadcasted when voting
+# case sensitive
+VotingBroadcastBlacklist: []
 
-# ------------------------------------------------
+# Playernames to not be broadcasted when broadcast comes from reward file
+# case sensitive
+BroadcastBlacklist: []
+
+###########################################
 # Top Voter
 # Top voter rewards available in specialrewards.yml
-# ------------------------------------------------
+###########################################
 
 # Top voter blacklist
 # Hide these names from top voter lists
@@ -369,146 +369,13 @@ MaxiumNumberOfTopVotersToLoad: 1000
 StoreTopVoters:
   Weekly: false
   Daily: false
-    
-# ------------------------------------------------
-# Advanced
-# Most of these values can be left untouched for most setups
-# ------------------------------------------------
-
-# Enable per site cooldown events, requires more resources to use
-# Requires restart
-PerSiteCoolDownEvents: false
-
-# If true vanished players are treated as if they are offline
-TreatVanishAsOffline: false
-
-# If true, cooldown check is disabled
-DisableCoolDownCheck: false
-
-# If true, disable PlayerInteractEvent (for clicking signs and skulls)
-DisableInteractEvent: false
-
-# If false plugin will use offline player UUIDs
-OnlineMode: true
-
-# Delays login event, delays vote reminding and more
-# In miliseconds, 1000 = 1 second
-DelayLoginEvent: 0
-
-# 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
-
-# Set this to false to disable the plugin adding totals
-# 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: 
-  Sound: 'UI_BUTTON_CLICK'
-  Volume: 1.0
-  Pitch: 1.0
-  
-# Playernames to not be broadcasted when voting
-# case sensitive
-VotingBroadcastBlacklist: []
-
-# Playernames to not be broadcasted when broadcast comes from reward file
-# case sensitive
-BroadcastBlacklist: []
-
-# 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
 
-# This is an extra safe guard to prevent milestones 
-# from being executed more than once
-# Shoudn't be needed, but enable if you have trouble with milestones
-PreventRepeatMilestones: false
-
-# Close inventory on player vote
-# This is to prevent any possible exploits
-CloseInventoryOnVote: true
-
-# If true, permissions will be handled differently
-MultiplePermissionsCheck: false
-
-AddCustomCommands: false
-
-# Injects custom command to /vote
-# Requires AddCustomCommand: true to be set
-CustomCommands:
-  # identifier, not specific name
-  command1:
-    Args:
-    - token
-    # Message to send on command
-    Message: 'token message'
-    # Permission for this command
-    Permission: 'votingplugin.commands.vote.token'
-    # help message
-    HelpMessage: 'See tokens'
-    # Forces player to run this command
-    Commands:
-    - tokencommand
-    
-# ---------------------------------------
-# Placeholderapi placeholders settings
-# ---------------------------------------
-
-# When enabled the command /vote setprimaryaccount (playername)
-# will be shown (after restart)
-# Primary account will be used instead of the players account to get
-# placeholder and other data such as vote reminding
-# Mainly to be used for alts and such
-UsePrimaryAccountForPlaceholders: false
-
-# Always force placeholders to return value if the value isn't cached
-# This should prevent server from crashing when pulling placeholders on main thread
-# Only affects placeholderapi placeholders
-AlwaysWaitForCachePlaceholders: false
-
-# Always force placeholders to be processed and return a proper value
-# This has small chance of crashing the server (mainly with mysql and using placeholders on main thread)
-AlwaysProcessPlaceholders: false
-
-# Enable auto caching placeholders
-# Generally this works well, but if you need to cache placeholders manually set them below
-AutoCachePlaceholders: false
-
-# Set which placeholders to cache at all times
-# Use for placeholders to are pulled constantly or on the main thread
-# Mainly aimed for scoreboards
-# Placeholders may auto cache in certain conditions
-# Will use additional memory, but not a lot
-# Still in early stages, please report bugs
-# Please remove VotingPlugin_ from the placeholder listed here
-CachedPlaceholders: []
-#- Total_AllTime
-
-######################
+###########################################
 # Debug
-######################
+###########################################
 
 # Debug levels:
 # NONE
@@ -530,16 +397,70 @@ DebugInGame: false
 # Not recommended though
 LogVotesToFile: false
 
-# Only update in the background when needed when set to false
-AlwaysUpdate: false
+###########################################
+# Placeholderapi placeholders settings
+###########################################
 
-# Update in the background only if players are online
-UpdateWithPlayersOnlineOnly: false
+# When enabled the command /vote setprimaryaccount (playername)
+# will be shown (after restart)
+# Primary account will be used instead of the players account to get
+# placeholder and other data such as vote reminding
+# Mainly to be used for alts and such
+UsePrimaryAccountForPlaceholders: false
 
-# Delay between background updates like signs and more
-# Default: 3 Minutes
-# Longer times result in longer wait in stuff updating after a vote, like topvoter
-DelayBetweenUpdates: 3
+# Valid Options:
+# AUTO - Auto cache after they have been used (Recommended)
+# SPECIFIC - Only cache certain placeholders 
+# NONE - Don't cache any placeholders
+PlaceholderCacheLevel: AUTO
+
+# Placeholder controls
+# Add _process to end of placeholder to force a return value rather than . or .. if no cached value is ready
+# Add _nocache to end of placeholder to skip cache and retrive a live value, uses a direct mysql connection, do not use on main thread
+#
+
+# Set which placeholders to cache at all times
+# Use for placeholders to are pulled constantly or on the main thread
+# Mainly aimed for scoreboards that pull placeholders often
+# Placeholders may auto cache in certain conditions (if enabled above)
+# Will use additional memory, but not a lot
+# Still in early stages, please report bugs
+# Please remove VotingPlugin_ from the placeholder listed here
+CachedPlaceholders: []
+#- Total_AllTime
+
+# When enabled, javascript will be parsed on placeholders (from placeholderapi)
+# allows more fancy placeholders with math for example
+UseJavascriptPlaceholders: false
+
+###########################################
+# Login options
+###########################################
+
+# If true vanished players are treated as if they are offline
+TreatVanishAsOffline: false
+
+# Delays login event, delays vote reminding and more
+# In miliseconds, 1000 = 1 second
+DelayLoginEvent: 0
+
+# Wait until user is logged in with AuthMe
+# Requires AuthMe
+WaitUntilLoggedIn: true
+
+###########################################
+# Disable/Enable features
+###########################################
+
+# If true, cooldown check is disabled
+DisableCoolDownCheck: false
+
+# If true, disable PlayerInteractEvent (for clicking signs and skulls)
+DisableInteractEvent: false
+
+# Disable this on a hub server for example
+# Still processes rewards for offline rewards (just won't give any)
+ProcessRewards: true
 
 # Set to true to disable no service site message on voting
 # You should never have to touch this if everything is setup properly
@@ -550,55 +471,57 @@ DisableNoServiceSiteMessage: false
 # If true fake votes will give points and totals
 CountFakeVotes: true
 
-# Give VotingPlugin.Player by default
-# Requires restart to take affect
-GiveDefaultPermission: true
+# Whether or not to disable update checks
+DisableUpdateChecking: false
 
-# Permissions given by VotingPlugin.Player by default
-# Permissions listed here will no be accessible with the default permission
-DisabledDefaultPermissions: []
+# Enable per site cooldown events, requires more resources to use
+# Requires restart
+PerSiteCoolDownEvents: false
 
-# Remove old player files
-# Happens on startup or /av purge
-PurgeOldData: false
-
-# Minimum number of days offline in order to purge
-PurgeMin: 90
-
-# Whether or not to create daily backups. (Only the most recent ones get kept)
-CreateBackups: true
+# Queue votes during a time change (doesn't apply to bungee voting)
+# Votes will be given when time change is completed
+QueueVotesDuringTimeChange: false
 
 # If true, plugin will automaticly generate votesites
 # Disable this if you experience issues with sites being created randomly
 # Most cases this will work all the time
 AutoCreateVoteSites: true
 
+# Set this to false to disable the plugin adding totals
+# Not really recommended
+AddTotals: true
+
+# If false, votestreaks will be disabled
+UseVoteStreaks: true
+
+# If false, storing best totals will be disabled
+UseHighestTotals: true
+
+# Enable Geyser prefix support
+# Geyser support is hit or miss currently
+# May work best if players vote with prefix
+GeyserPrefixSupport: false
+GeyserPrefix: '*'
+
+# Whether or not to create daily backups. (Only the most recent ones get kept)
+CreateBackups: true
+
 # Automaticly download the latest version
 # Will require a restart to actually update
 # Note: It takes 30-40 minutes before being able to download the latest build
 # You can also use /av download
 AutoDownload: false
 
-# Whether or not to disable update checks
-DisableUpdateChecking: false
+# If false plugin will use offline player UUIDs
+OnlineMode: true
 
-# Allow transfer of vote points between players
-AllowVotePointTransfers: false
+# Disable checking on world change
+# May improve performance
+#DisableCheckOnWorldChange: false
 
-# Disable this on a hub server for example
-# Still processes rewards for offline rewards (just won't give any)
-ProcessRewards: true
-
-# Disable checking permissions on tab complete
-DisableAdvancedTab: false
-
-# Load command aliases, such as /avgui
-# Requires restart to take effect
-LoadCommandAliases: true
-
-# Wait until user is logged in with AuthMe
-# Requires AuthMe
-WaitUntilLoggedIn: true
+###########################################
+# Skull settings
+###########################################
 
 # Preload skulls to improve performance for vote top
 # when using skulls as the item to display players
@@ -610,10 +533,53 @@ PreloadSkulls: false
 # Will reduce ram usage (very little) if disabled, but slow GUI speeds when using skulls
 LoadSkulls: true
 
-# Limit number of users to load in a second
-# Effects background tasks mainly
-# set to -1 to disable (default value)
-#PlayerDataLoadLimit: 500
+###########################################
+# Extra checks on vote
+###########################################
+
+# If true, allsites will have an extra check to prevent duplicate allsites from being given
+ExtraAllSitesCheck: false
+
+# This is an extra safe guard to prevent milestones 
+# from being executed more than once
+# Shoudn't be needed, but enable if you have trouble with milestones
+PreventRepeatMilestones: false
+
+# Number of points to give on vote
+# Set to 0 to give no points
+PointsOnVote: 1
+
+# May need to enable this for bungee setups
+# Let players who never joined before vote
+# Recommend: False (Will prevent creating random user data)
+AllowUnjoined: false
+
+# Use server lookup for when allowunjoined is set to false
+# Recommend leaving enabled unless you face issues
+AllowUnJoinedCheckServer: true
+
+##############################################
+# Command/Permission settings
+##############################################
+
+# Give VotingPlugin.Player by default
+# Requires restart to take affect
+GiveDefaultPermission: true
+
+# Permissions given by VotingPlugin.Player by default
+# Permissions listed here will no be accessible with the default permission
+DisabledDefaultPermissions: []
+
+# If true, /vote will open /vote gui by default
+UseVoteGUIMainCommand: false
+
+# Disable checking permissions on tab complete
+# Could increase performance slightly, but probably not
+DisableAdvancedTab: false
+
+# Load command aliases, such as /avgui
+# Requires restart to take effect
+LoadCommandAliases: true
 
 # Use vault for permission checks
 # May not work on some plugins
@@ -625,14 +591,72 @@ UseVaultPermissions: false
 # - PERMISSION
 DisabledCommands: []
 
-# Enable Geyser prefix support
-GeyserPrefixSupport: false
-GeyserPrefix: '*'
+# If true, permissions will be handled differently
+MultiplePermissionsCheck: false
+
+# Allow transfer of vote points between players
+# Requires restart for command to load
+# Command: /vote givepoints (player) (points)
+AllowVotePointTransfers: false
+
+AddCustomCommands: false
+
+# Injects custom command to /vote
+# Requires AddCustomCommand: true to be set
+CustomCommands:
+  # identifier, not specific name
+  command1:
+    Args:
+    - token
+    # Message to send on command
+    Message: 'token message'
+    # Permission for this command
+    Permission: 'votingplugin.commands.vote.token'
+    # help message
+    HelpMessage: 'See tokens'
+    # Forces player to run this command
+    Commands:
+    - tokencommand
+
+##############################################
+# Background task settings
+##############################################
+
+# Only update in the background when needed when set to false
+AlwaysUpdate: false
+
+# Update in the background only if players are online
+UpdateWithPlayersOnlineOnly: false
+
+# Delay between background updates like signs and more
+# Default: 3 Minutes
+# Longer times result in longer wait in stuff updating after a vote, like topvoter
+DelayBetweenUpdates: 3
 
 # Enable to true for extra player checks
 # Recommend leaving this to false
 ExtraBackgroundUpdate: false
 
+# Limit number of users to load in a second
+# Effects background tasks mainly
+# set to -1 to disable (default value)
+#PlayerDataLoadLimit: 500
+
+##########################################
+# Inventory controls
+##########################################
+
+# Click sound when using gui
+# Set to none for no sound
+ClickSound: 
+  Sound: 'UI_BUTTON_CLICK'
+  Volume: 1.0
+  Pitch: 1.0
+
+# If true, items given for rewards are dropped on the ground
+# If false, items will be given when there is space
+DropOnFullInv: true
+
 # This will prevent spam clicking GUI's to prevent exploits
 # Number is time in between clicking in milliseconds
 SpamClickTime: 150
@@ -640,12 +664,28 @@ SpamClickTime: 150
 # Uncomment to use
 #SpamClickMessage: '&cDetected spam clicking GUI, closing to prevent exploits'
 
-# ###############################################################
-# Deprecated options, don't recommend using any of these
-
 # Will force GUI's to close on every click
 AlwaysCloseInventory: false
 
+# Close inventory on player vote
+# This is to prevent any possible exploits
+CloseInventoryOnVote: true
+
+###########################################
+# Purge settings
+###########################################
+# Remove old player files
+# Happens on startup or /av purge
+PurgeOldData: false
+
+# Minimum number of days offline in order to purge
+PurgeMin: 90
+
+##########################################
+# Extra options
+# Options below don't need to be touched
+##########################################
+
 # Options for request api
 # Current methods:
 # ANVIL
@@ -656,9 +696,3 @@ RequestAPI:
   DefaultMethod: 'Anvil'
   DisabledMethods: []
 
-# Shouldn't need to change this
-#AutoKillInvs: true
-
-# Disable checking on world change
-# May improve performance
-#DisableCheckOnWorldChange: false

VotingPlugin/Resources/GUI.yml

@@ -123,6 +123,7 @@ CHEST:
     # URL when clicking item in /vote (GUI version)
     URLText: '%VoteUrl%'
     # #Add Extra items
+    # This extra item format works across other gui settings below
     # ExtraItems:
       # Item1:
         # Material: DIRT

VotingPlugin/Resources/SpecialRewards.yml

@@ -13,7 +13,8 @@ FirstVote:
 FirstVoteToday: {}
 
 # All vote rewards
-# Reward for voting on all sites in one day
+# One time reward for voting on all sites in one day
+# Enable ExtraAllSitesCheck if you get double rewards
 AllSites: 
   Messages:
     Player: '&aYou voted on all sites in 1 day!'
@@ -94,7 +95,7 @@ VoteParty:
   Broadcast: '&cReached the vote party amount!'
   # List of commands to execute, these only execute once.
   # %player% does not work here
-  Commands: []
+  GlobalCommands: []
   # Rewards to give per player
   Rewards: 
     # Uncomment below for online players to be rewarded only

VotingPlugin/Resources/VoteSites.yml

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

VotingPlugin/Resources/bungeeconfig.yml

@@ -24,7 +24,7 @@ Prefix: ''
 OnlineMode: true
 
 
-# ----------------------------------------------------------------
+####################################################################################
 # Global mysql data handle for between server commmunications
 # This is NOT required for bungee voting to work
 # This is still a WIP, use with caution
@@ -62,7 +62,8 @@ GlobalData:
 # Time offset for time changes
 # Must match on all servers
 TimeHourOffSet: 0
-# ----------------------------------------------------------------
+
+####################################################################################
 
 Debug: false
 # Have a reward on each server
@@ -73,12 +74,17 @@ SendVotesToAllServers: true
 BlockedServers:
 - hub
 
+
+# Similar to BlockServers
+# If a server is listed then blockedservers is ignored
+WhiteListedServers: []
+
 # What type of bungee setup
 # Requires restart and set on all servers
 # https://github.com/BenCodez/VotingPlugin/wiki/Bungeecoord-Setups
 # Available:
 # SOCKETS 
-# PLUGINMESSAGING 
+# PLUGINMESSAGING (Recommended)
 # MYSQL
 BungeeMethod: PLUGINMESSAGING
 
@@ -92,8 +98,8 @@ PointsOnVote: 1
 
 # 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
+# If false, AllowUnJoined should be enabled on bungee, spigot servers will handle that
+# Recommeneded to leave enabled, setups with this disabled are currently unsupported
 BungeeManageTotals: true
 
 # Tell servers to broadcast
@@ -125,42 +131,42 @@ VoteParty:
   Broadcast: '&aVote party has been reached!'
   
 
-# ----------------------------
+##########################################
 # PLUGINMESSAGING Settings
-# ----------------------------
+##########################################
 
 # Applies to PLUGINMESSAGING only
 # Votes will be forwarded when specific player is online
 WaitForUserOnline: false
 
-# ----------------------------
-# SOCKET Settings
-# ONLY for SOCKET method
-# ----------------------------
-# Options available here:
-# https://github.com/BenCodez/VotingPlugin/wiki/Bungee-Setup-SOCKETS
 
-
-# ----------------------------
-# Redis setup
-# Experimental
-# Primary server for redis needs votifier
-# Set socket host on each proxy and redissockets on primary redis only
-# All servers on pluginmessaging
-# ----------------------------
+##########################################
+# Multi-proxy setup
+# This is still a WIP, use with caution
+# Primary server  needs votifier and config option enabled
+# Set socket host on each proxy and primary server set sub proxies
+# All servers should be on pluginmessaging or sockets setup
+##########################################
 
 # Support for redis
 # experimental
-RedisSupport: false
+MultiProxySupport: false
 
-# Enable on primary server with votifier
+# Enable on primary proxy server with votifier
 PrimaryServer: false
 
-RedisSocketHost:
+# If enabled, player will only get 1 reward on a server on the network
+# Must be enabled on all proxies for this to work
+# Must also disable sendtoallservers
+MultiProxyOneGlobalReward: false
+
+# Set this for each proxy
+MultiProxySocketHost:
   Host: 0.0.0.0
   Port: 1234
 
-RedisServers:
+# Set other sub proxies here
+MultiProxyServers:
   secondproxy:
     Host: 0.0.0.0
     Port: 1235

VotingPlugin/Resources/plugin.yml

@@ -9,7 +9,6 @@ softdepend:
 - Votifier
 - VotifierPlus
 - NuVotifier
-- CMI
 - Vault
 - PlaceholderAPI
 - ProtocolLib

VotingPlugin/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>votingplugin</artifactId>
-	<version>6.11</version>
+	<version>6.12</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -194,7 +194,6 @@
 			<id>spigot-repo</id>
 			<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
 		</repository>
-
 		<repository>
 			<id>maven-central</id>
 			<url>https://oss.sonatype.org/content/groups/public</url>
@@ -211,22 +210,12 @@
 			<id>bencodez repo</id>
 			<url>https://nexus.bencodez.com/repository/maven-public/</url>
 		</repository>
-		<repository>
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
-		</repository>
 	</repositories>
 	<dependencies>
-		<dependency>
-			<groupId>com.github.limework</groupId>
-			<artifactId>redisbungee</artifactId>
-			<version>0.6.5</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.19.3-R0.1-SNAPSHOT</version>
+			<version>1.19.4-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -265,31 +254,14 @@
 			<version>2.2.1</version>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.bencodez</groupId>
+			<artifactId>advancedcore</artifactId>
+			<version>LATEST</version>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>
 	<profiles>
-		<profile>
-			<id>prod</id>
-			<properties>
-				<build.profile.id>prod</build.profile.id>
-			</properties>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<repositories>
-				<repository>
-					<id>jitpack.io</id>
-					<url>https://jitpack.io</url>
-				</repository>
-			</repositories>
-			<dependencies>
-				<dependency>
-					<groupId>com.github.bencodez</groupId>
-					<artifactId>advancedcore</artifactId>
-					<version>master-SNAPSHOT</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-		</profile>
 		<profile>
 			<id>prod2</id>
 			<properties>
@@ -302,42 +274,59 @@
 					<url>file://${project.build.directory}/mvn-repo</url>
 				</repository>
 			</distributionManagement>
-			<dependencies>
-				<dependency>
-					<groupId>com.bencodez</groupId>
-					<artifactId>advancedcore</artifactId>
-					<version>LATEST</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
 		</profile>
 		<profile>
-			<id>dev</id>
+			<id>deploy-snapshot</id>
 			<properties>
-				<build.profile.id>dev</build.profile.id>
+				<build.profile.id>deploy-snapshot</build.profile.id>
 			</properties>
-			<dependencies>
-				<dependency>
-					<groupId>com.bencodez</groupId>
-					<artifactId>advancedcore</artifactId>
-					<version>LATEST</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
+			<distributionManagement>
+				<snapshotRepository>
+					<id>nexus</id>
+					<url>https://nexus.bencodez.com/repository/maven-snapshots/</url>
+				</snapshotRepository>
+				<repository>
+					<id>nexus</id>
+					<url>https://nexus.bencodez.com/repository/maven-snapshots/</url>
+				</repository>
+			</distributionManagement>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-deploy-plugin</artifactId>
+						<version>3.0.0-M1</version>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<version>1.5.1</version>
+						<executions>
+							<execution>
+								<id>default-deploy</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>deploy</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<serverId>nexus</serverId>
+							<nexusUrl>https://nexus.bencodez.com/nexus/</nexusUrl>
+							<skipStaging>true</skipStaging>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
 		</profile>
 		<profile>
 			<id>deploy</id>
 			<properties>
 				<build.profile.id>deploy</build.profile.id>
 			</properties>
-			<dependencies>
-				<dependency>
-					<groupId>com.bencodez</groupId>
-					<artifactId>advancedcore</artifactId>
-					<version>LATEST</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
 			<distributionManagement>
 				<snapshotRepository>
 					<id>nexus</id>

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

@@ -315,18 +315,30 @@ public class BungeeHandler implements Listener {
 						if (args.size() > 10) {
 							num = Integer.valueOf(args.get(10));
 						}
+						int numberOfVotes = 1;
+						if (args.size() > 11) {
+							numberOfVotes = Integer.valueOf(args.get(11));
+						}
 
 						if (!bungeeBroadcast) {
 							if (!plugin.getBungeeSettings().isBungeeBroadcast()
 									&& !plugin.getBungeeSettings().isDisableBroadcast()) {
 								if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-									VoteSite site = plugin.getVoteSite(service, true);
-									if (site != null) {
-										site.broadcastVote(user, false);
-										broadcast = false;
+									if (plugin.getConfigFile().isFormatOnlyOneOfflineBroadcast() && !wasOnline) {
+										if (num == 1) {
+											user.offlineBroadcast(user, plugin.getBungeeSettings().isUseBungeecoord(),
+													numberOfVotes);
+										}
 									} else {
-										plugin.getLogger().warning("No votesite for " + service);
+										VoteSite site = plugin.getVoteSite(service, true);
+										if (site != null) {
+											site.broadcastVote(user, false);
+											broadcast = false;
+										} else {
+											plugin.getLogger().warning("No votesite for " + service);
+										}
 									}
+
 								}
 							}
 						} else {
@@ -395,18 +407,30 @@ public class BungeeHandler implements Listener {
 							num = Integer.valueOf(args.get(10));
 						}
 
+						int numberOfVotes = 1;
+						if (args.size() > 11) {
+							numberOfVotes = Integer.valueOf(args.get(11));
+						}
+
 						if (!bungeeBroadcast) {
 							if (!plugin.getBungeeSettings().isBungeeBroadcast()
 									&& !plugin.getBungeeSettings().isDisableBroadcast()) {
-								if (Boolean.valueOf(args.get(4))
-										|| plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-									VoteSite site = plugin.getVoteSite(service, true);
-									if (site != null) {
-										site.broadcastVote(user, false);
-										broadcast = false;
+								if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
+									if (plugin.getConfigFile().isFormatOnlyOneOfflineBroadcast() && !wasOnline) {
+										if (num == 1) {
+											user.offlineBroadcast(user, plugin.getBungeeSettings().isUseBungeecoord(),
+													numberOfVotes);
+										}
 									} else {
-										plugin.getLogger().warning("No votesite for " + service);
+										VoteSite site = plugin.getVoteSite(service, true);
+										if (site != null) {
+											site.broadcastVote(user, false);
+											broadcast = false;
+										} else {
+											plugin.getLogger().warning("No votesite for " + service);
+										}
 									}
+
 								}
 							}
 						} else {
@@ -498,6 +522,16 @@ public class BungeeHandler implements Listener {
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VotePartyBungee") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
+					for (final String cmd : plugin.getBungeeSettings().getBungeeVotePartyGlobalCommands()) {
+						Bukkit.getScheduler().runTask(plugin, new Runnable() {
+
+							@Override
+							public void run() {
+								Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), cmd);
+							}
+
+						});
+					}
 					for (Player p : Bukkit.getOnlinePlayers()) {
 						new RewardBuilder(plugin.getBungeeSettings().getData(), "BungeeVotePartyRewards").send(p);
 					}

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

@@ -211,7 +211,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	private boolean ymlError = false;
 
 	@Getter
-	private ScheduledExecutorService voteTimer = Executors.newScheduledThreadPool(1);
+	private ScheduledExecutorService voteTimer;
 
 	@Getter
 	private UserManager votingPluginUserManager;
@@ -1001,6 +1001,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		new VotingPluginMetrics().load(plugin);
 	}
 
+	private void loadVoteTimer() {
+		voteTimer = Executors.newSingleThreadScheduledExecutor();
+	}
+
 	@Getter
 	private TimeQueueHandler timeQueueHandler;
 
@@ -1008,6 +1012,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	public void onPostLoad() {
 		loadVersionFile();
 		getOptions().setServer(bungeeSettings.getServer());
+
+		loadVoteTimer();
+
 		if (bungeeSettings.isUseBungeecoord()) {
 			bungeeHandler = new BungeeHandler(this);
 			bungeeHandler.load();
@@ -1254,6 +1261,13 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 				debug(e);
 			}
 		}
+		voteTimer.shutdown();
+		try {
+			voteTimer.awaitTermination(10, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		voteTimer.shutdownNow();
 		if (timeQueueHandler != null) {
 			timeQueueHandler.save();
 		}
@@ -1344,8 +1358,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	}
 
 	private void reloadPlugin(boolean userStorage) {
-		setUpdate(true);
-
 		configFile.reloadData();
 		configFile.loadValues();
 
@@ -1377,14 +1389,8 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		voteReminding.loadRemindChecking();
 		coolDownCheck.checkEnabled();
-
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				update();
-			}
-		});
+		placeholders.reload();
+		setUpdate(true);
 	}
 
 	private void setupFiles() {
@@ -1450,57 +1456,64 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 								int currentDay = LocalDateTime.now().getDayOfMonth();
 								int currentDataLoad = 0;
 								for (String uuid : uuids) {
-									if (uuid != null && !uuid.isEmpty()) {
-										VotingPluginUser user = UserManager.getInstance()
-												.getVotingPluginUser(UUID.fromString(uuid), false);
-										user.dontCache();
-										user.tempCache();
-										user.getUserData().updateCacheWithTemp();
-										if (!user.isBanned() && !blackList.contains(user.getPlayerName())) {
+									if (plugin != null && plugin.isEnabled()) {
+										if (uuid != null && !uuid.isEmpty()) {
+											VotingPluginUser user = UserManager.getInstance()
+													.getVotingPluginUser(UUID.fromString(uuid), false);
+											user.dontCache();
+											user.tempCache();
+											user.getUserData().updateCacheWithTemp();
+											if (!user.isBanned() && !blackList.contains(user.getPlayerName())) {
 
-											if (!topVoterIgnorePermissionUse || !user.isTopVoterIgnore()) {
-												for (TopVoter top : topVotersToCheck) {
-													int total = user.getTotal(top);
-													if (total > 0) {
-														tempTopVoter.get(top).put(user.getTopVoterPlayer(), total);
+												if (!topVoterIgnorePermissionUse || !user.isTopVoterIgnore()) {
+													for (TopVoter top : topVotersToCheck) {
+														int total = user.getTotal(top);
+														if (total > 0) {
+															tempTopVoter.get(top).put(user.getTopVoterPlayer(), total);
+														}
 													}
 												}
-											}
 
-											HashMap<VoteSite, LocalDateTime> times = new HashMap<VoteSite, LocalDateTime>();
-											for (Entry<VoteSite, Long> entry : user.getLastVotes().entrySet()) {
-												if (entry.getKey().isEnabled() && !entry.getKey().isHidden()) {
-													long time = entry.getValue();
-													if ((currentDay == MiscUtils.getInstance().getDayFromMili(time))
-															&& (LocalDateTime.now().getMonthValue() == MiscUtils
-																	.getInstance().getMonthFromMili(time))
-															&& (LocalDateTime.now().getYear() == MiscUtils.getInstance()
-																	.getYearFromMili(time))) {
+												HashMap<VoteSite, LocalDateTime> times = new HashMap<VoteSite, LocalDateTime>();
+												for (Entry<VoteSite, Long> entry : user.getLastVotes().entrySet()) {
+													if (entry.getKey().isEnabled() && !entry.getKey().isHidden()) {
+														long time = entry.getValue();
+														if ((currentDay == MiscUtils.getInstance().getDayFromMili(time))
+																&& (LocalDateTime.now().getMonthValue() == MiscUtils
+																		.getInstance().getMonthFromMili(time))
+																&& (LocalDateTime.now().getYear() == MiscUtils
+																		.getInstance().getYearFromMili(time))) {
 
-														times.put(entry.getKey(), LocalDateTime.ofInstant(
-																Instant.ofEpochMilli(time), ZoneId.systemDefault()));
+															times.put(entry.getKey(),
+																	LocalDateTime.ofInstant(Instant.ofEpochMilli(time),
+																			ZoneId.systemDefault()));
+														}
 													}
 												}
+												if (times.keySet().size() > 0) {
+													voteToday.put(user.getTopVoterPlayer(), times);
+												}
 											}
-											if (times.keySet().size() > 0) {
-												voteToday.put(user.getTopVoterPlayer(), times);
-											}
-										}
-										if (!extraBackgroundUpdate) {
-											if (user.isOnline()) {
-												user.offVote();
-											}
-										}
-										plugin.getPlaceholders().onUpdate(user);
-										user.clearTempCache();
-										user = null;
-										if (dataLoadLimit > 0) {
-											currentDataLoad++;
-											if (currentDataLoad >= dataLoadLimit) {
-												currentDataLoad -= dataLoadLimit;
-												Thread.sleep(1000);
+											if (extraBackgroundUpdate) {
+												if (user.isOnline()) {
+													user.offVote();
+												}
+											}
+											if (plugin != null) {
+												plugin.getPlaceholders().onUpdate(user);
+											}
+											user.clearTempCache();
+											user = null;
+											if (dataLoadLimit > 0) {
+												currentDataLoad++;
+												if (currentDataLoad >= dataLoadLimit) {
+													currentDataLoad -= dataLoadLimit;
+													Thread.sleep(1000);
+												}
 											}
 										}
+									} else {
+										return;
 									}
 								}
 								update = false;
@@ -1518,13 +1531,15 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 								tempTopVoter = null;
 
+								checkFirstTimeLoaded();
+
 								time1 = ((System.currentTimeMillis() - time1) / 1000);
 								long totalTime = ((System.currentTimeMillis() - startTime) / 1000);
 								plugin.debug("Background task finished. Final processing took " + time1
 										+ " seconds. Total time: " + totalTime + " seconds");
+								plugin.getUserManager().getDataManager().clearNonNeededCachedUsers();
 								plugin.extraDebug("Current cached users: "
 										+ plugin.getUserManager().getDataManager().getUserDataCache().keySet().size());
-								checkFirstTimeLoaded();
 							} catch (Exception ex) {
 								if (plugin != null) {
 									plugin.getLogger().info("Looks like something went wrong");
@@ -1544,6 +1559,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	public void checkFirstTimeLoaded() {
 		if (!firstTimeLoaded) {
+
 			if (getGui().isChestVoteTopUseSkull()) {
 				int maxToLoad = 200;
 				for (TopVoter top : topVoter.keySet()) {

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

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

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

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

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

@@ -19,9 +19,11 @@ import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Queue;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -52,6 +54,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
 import lombok.Getter;
+import lombok.Setter;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.TextComponent;
@@ -74,7 +77,9 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 	private HashMap<String, ClientHandler> clientHandles;
 
-	private HashMap<String, ClientHandler> redisClientHandles;
+	private HashMap<String, ClientHandler> multiproxyClientHandles;
+
+	private SocketHandler multiproxySocketHandler;
 
 	@Getter
 	private Config config;
@@ -91,8 +96,6 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 	private SocketHandler socketHandler;
 
-	private SocketHandler redisSocketHandler;
-
 	private VoteCache voteCacheFile;
 
 	private boolean votifierEnabled = true;
@@ -115,11 +118,12 @@ public class VotingPluginBungee extends Plugin implements Listener {
 					ArrayList<OfflineBungeeVote> newSet = new ArrayList<OfflineBungeeVote>();
 					if (!c.isEmpty()) {
 						int num = 1;
+						int numberOfVotes = c.size();
 						for (OfflineBungeeVote cache : c) {
 							boolean toSend = true;
 							if (getConfig().getWaitForUserOnline()) {
 								ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(cache.getUuid()));
-								if (isOnline(p)) {
+								if (!isOnline(p)) {
 									toSend = false;
 								} else if (p != null && p.isConnected()
 										&& !p.getServer().getInfo().getName().equals(server)) {
@@ -133,7 +137,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 										"" + cache.isRealVote(), cache.getText(),
 										"" + getConfig().getBungeeManageTotals(),
 										"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(),
-										"" + num);
+										"" + num, "" + numberOfVotes);
 								num++;
 							} else {
 								debug("Not sending vote because user isn't on server " + server + ": "
@@ -158,14 +162,19 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				}
 				if (!config.getBlockedServers().contains(server)) {
 					int num = 1;
+					int numberOfVotes = c.size();
 					for (OfflineBungeeVote cache : c) {
 						sendPluginMessageServer(server, "VoteOnline", cache.getPlayerName(), cache.getUuid(),
 								cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
 								"" + cache.isRealVote(), cache.getText(), "" + getConfig().getBungeeManageTotals(),
-								"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "" + num);
+								"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "" + num,
+								"" + numberOfVotes);
 						num++;
 					}
 					cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
+					if (getConfig().getMultiProxySupport() && getConfig().getMultiProxyOneGlobalReward()) {
+						sendMultiProxyServerMessage("ClearVote", player.getName(), uuid);
+					}
 				}
 			}
 		}
@@ -288,10 +297,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		};
 
 		ArrayList<String> servers = new ArrayList<String>();
-		for (String s : getProxy().getServers().keySet()) {
-			if (!config.getBlockedServers().contains(s)) {
-				servers.add(s);
-			}
+		for (String s : getAvailableAllServers()) {
+			servers.add(s);
 		}
 
 		if (config.getGlobalDataEnabled()) {
@@ -321,21 +328,23 @@ public class VotingPluginBungee extends Plugin implements Listener {
 								debug2(text);
 							}
 						}, servers) {
+
 					@Override
 					public void onTimeChangedFinished(TimeType type) {
+						if (type.equals(TimeType.MONTH)) {
+							getMysql().copyColumnData(TopVoter.Monthly.getColumnName(), "LastMonthTotal");
+						}
 						getMysql().wipeColumnData(TopVoter.of(type).getColumnName());
 
 						if (!config.getGlobalDataEnabled()) {
 							return;
 						}
-						for (String s : getProxy().getServers().keySet()) {
-							if (!config.getBlockedServers().contains(s)) {
-								getGlobalDataHandler().setBoolean(s, "ForceUpdate", true);
-								if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-									sendPluginMessageServer(s, "BungeeTimeChange", "");
-								} else if (method.equals(BungeeMethod.SOCKETS)) {
-									sendServerMessage(s, "BungeeTimeChange");
-								}
+						for (String s : getAvailableAllServers()) {
+							getGlobalDataHandler().setBoolean(s, "ForceUpdate", true);
+							if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+								sendPluginMessageServer(s, "BungeeTimeChange", "");
+							} else if (method.equals(BungeeMethod.SOCKETS)) {
+								sendServerMessage(s, "BungeeTimeChange");
 							}
 						}
 
@@ -374,21 +383,23 @@ public class VotingPluginBungee extends Plugin implements Listener {
 						debug2(text);
 					}
 				}, servers) {
+
 					@Override
 					public void onTimeChangedFinished(TimeType type) {
+						if (type.equals(TimeType.MONTH)) {
+							getMysql().copyColumnData(TopVoter.Monthly.getColumnName(), "LastMonthTotal");
+						}
 						getMysql().wipeColumnData(TopVoter.of(type).getColumnName());
 
 						if (!config.getGlobalDataEnabled()) {
 							return;
 						}
-						for (String s : getProxy().getServers().keySet()) {
-							if (!config.getBlockedServers().contains(s)) {
-								getGlobalDataHandler().setBoolean(s, "ForceUpdate", true);
-								if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-									sendPluginMessageServer(s, "BungeeTimeChange", "");
-								} else if (method.equals(BungeeMethod.SOCKETS)) {
-									sendServerMessage(s, "BungeeTimeChange");
-								}
+						for (String s : getAvailableAllServers()) {
+							getGlobalDataHandler().setBoolean(s, "ForceUpdate", true);
+							if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+								sendPluginMessageServer(s, "BungeeTimeChange", "");
+							} else if (method.equals(BungeeMethod.SOCKETS)) {
+								sendServerMessage(s, "BungeeTimeChange");
 							}
 						}
 
@@ -435,6 +446,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		getMysql().alterColumnType("MonthTotal", "INT DEFAULT '0'");
 		getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
 		getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("LastWeeklyTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("LastDailyTotal", "INT DEFAULT '0'");
 		getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
 		getMysql().alterColumnType("DayVoteStreakLastUpdate", "MEDIUMTEXT");
 	}
@@ -525,16 +538,16 @@ public class VotingPluginBungee extends Plugin implements Listener {
 			Class.forName("com.vexsoftware.votifier.bungee.events.VotifierEvent");
 		} catch (ClassNotFoundException e) {
 			votifierEnabled = false;
-			getLogger().warning("Votifier event not found, not loading votifier event");
 		}
 		if (votifierEnabled) {
 			try {
 				voteEventBungee = new VoteEventBungee(this);
 				getProxy().getPluginManager().registerListener(this, voteEventBungee);
-				getProxy().getPluginManager().registerListener(this, this);
 			} catch (Exception e) {
+				votifierEnabled = false;
 			}
 		}
+		getProxy().getPluginManager().registerListener(this, this);
 
 		config = new Config(this);
 		config.load();
@@ -571,39 +584,37 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				if (!config.getGlobalDataEnabled()) {
 					return;
 				}
-				for (String s : getProxy().getServers().keySet()) {
-					if (!config.getBlockedServers().contains(s)) {
-						if (getGlobalDataHandler().getGlobalMysql().containsKey(s)) {
-							String lastOnlineStr = getGlobalDataHandler().getString(s, "LastOnline");
-							long lastOnline = 0;
-							try {
-								lastOnline = Long.valueOf(lastOnlineStr);
-							} catch (NumberFormatException e) {
-								e.printStackTrace();
-							}
-
-							if (LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli()
-									- lastOnline < 1000 * 60 * 60 * 12) {
-								// server has been online within the 12 hours
-								HashMap<String, DataValue> dataToSet = new HashMap<String, DataValue>();
-								dataToSet.put("LastUpdated", new DataValueString(
-										"" + LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli()));
-								dataToSet.put("FinishedProcessing", new DataValueBoolean(false));
-								dataToSet.put(type.toString(), new DataValueBoolean(true));
-								getGlobalDataHandler().setData(s, dataToSet);
-								if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-									sendPluginMessageServer(s, "BungeeTimeChange", "");
-								} else if (method.equals(BungeeMethod.SOCKETS)) {
-									sendServerMessage(s, "BungeeTimeChange");
-								}
-							} else {
-								getLogger().warning("Server " + s + " hasn't been online recently");
-							}
-						} else {
-							getLogger().warning("Server " + s + " global data handler disabled?");
+				for (String s : getAvailableAllServers()) {
+					if (getGlobalDataHandler().getGlobalMysql().containsKey(s)) {
+						String lastOnlineStr = getGlobalDataHandler().getString(s, "LastOnline");
+						long lastOnline = 0;
+						try {
+							lastOnline = Long.valueOf(lastOnlineStr);
+						} catch (NumberFormatException e) {
+							e.printStackTrace();
 						}
 
+						if (LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli() - lastOnline < 1000
+								* 60 * 60 * 12) {
+							// server has been online within the 12 hours
+							HashMap<String, DataValue> dataToSet = new HashMap<String, DataValue>();
+							dataToSet.put("LastUpdated", new DataValueString(
+									"" + LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli()));
+							dataToSet.put("FinishedProcessing", new DataValueBoolean(false));
+							dataToSet.put(type.toString(), new DataValueBoolean(true));
+							getGlobalDataHandler().setData(s, dataToSet);
+							if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+								sendPluginMessageServer(s, "BungeeTimeChange", "");
+							} else if (method.equals(BungeeMethod.SOCKETS)) {
+								sendServerMessage(s, "BungeeTimeChange");
+							}
+						} else {
+							getLogger().warning("Server " + s + " hasn't been online recently");
+						}
+					} else {
+						getLogger().warning("Server " + s + " global data handler disabled?");
 					}
+
 				}
 				globalDataHandler.onTimeChange(type);
 			}
@@ -752,7 +763,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 							checkOnlineVotes(getProxy().getPlayer(UUID.fromString(player)), player, null);
 						}
 					}
-				}, 15l, 30l, TimeUnit.SECONDS);
+				}, 60l, 60l, TimeUnit.SECONDS);
 
 				getProxy().getScheduler().schedule(this, new Runnable() {
 
@@ -820,44 +831,11 @@ public class VotingPluginBungee extends Plugin implements Listener {
 			votePartyVotes = voteCacheFile.getVotePartyCurrentVotes();
 		}
 
-		if (getConfig().getRedisSupport()) {
-			if (encryptionHandler == null) {
-				encryptionHandler = new EncryptionHandler(new File(getDataFolder(), "secretkey.key"));
-			}
+		loadMultiProxySupport();
 
-			redisSocketHandler = new SocketHandler(getDescription().getVersion(), config.getRedisSocketHostHost(),
-					config.getRedisSocketHostPort(), encryptionHandler, config.getDebug()) {
-
-				@Override
-				public void log(String str) {
-					getLogger().info(str);
-				}
-			};
-
-			redisSocketHandler.add(new SocketReceiver() {
-
-				@Override
-				public void onReceive(String[] data) {
-					if (data.length > 8) {
-						if (data[0].equalsIgnoreCase("Vote")) {
-							// todo
-							// sendRedisServerMessage("Vote", uuid, player, service, "" + votePartyVotes,""
-							// + currentVotePartyVotesRequired, "" + time, "" + realVote, text.toString());
-							vote(data[2], data[3], Boolean.valueOf(data[7]), true, 0, new BungeeMessageData(data[8]),
-									data[1]);
-						}
-					}
-
-				}
-			});
-
-			clientHandles = new HashMap<String, ClientHandler>();
-			for (
-
-			String s : config.getRedisServers()) {
-				Configuration d = config.getRedisServersConfiguration(s);
-				redisClientHandles.put(s, new ClientHandler(d.getString("Host", ""), d.getInt("Port", 1234),
-						encryptionHandler, config.getDebug()));
+		if (!votifierEnabled) {
+			if (!(getConfig().getMultiProxySupport() && !getConfig().getPrimaryServer())) {
+				getLogger().warning("Votifier event not found, not loading votifier event");
 			}
 		}
 
@@ -888,6 +866,9 @@ public class VotingPluginBungee extends Plugin implements Listener {
 					() -> "" + getConfig().getGlobalDataUseMainMySQL()));
 		}
 
+		metrics.addCustomChart(new BStatsMetricsBungee.SimplePie("multi_proxy_support_enabled",
+				() -> "" + getConfig().getMultiProxySupport()));
+
 		if (!buildNumber.equals("NOTSET")) {
 			metrics.addCustomChart(new BStatsMetricsBungee.SimplePie("dev_build_number", () -> "" + buildNumber));
 		}
@@ -901,6 +882,63 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		}
 	}
 
+	public void loadMultiProxySupport() {
+		if (getConfig().getMultiProxySupport()) {
+			if (encryptionHandler == null) {
+				encryptionHandler = new EncryptionHandler(new File(getDataFolder(), "secretkey.key"));
+			}
+
+			if (multiproxySocketHandler != null) {
+				multiproxySocketHandler.getServer().close();
+				multiproxySocketHandler = null;
+			}
+			multiproxySocketHandler = new SocketHandler(getDescription().getVersion(),
+					config.getMultiProxySocketHostHost(), config.getMultiProxySocketHostPort(), encryptionHandler,
+					config.getDebug()) {
+
+				@Override
+				public void log(String str) {
+					getLogger().info(str);
+				}
+			};
+
+			multiproxySocketHandler.add(new SocketReceiver() {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 0) {
+						if (data[0].equalsIgnoreCase("Status")) {
+							getLogger().info("Multi-proxy status message received");
+						} else if (data[0].equalsIgnoreCase("ClearVote")) {
+							cachedOnlineVotes.remove(data[2]);
+						}
+					}
+					if (data.length > 8) {
+						if (data[0].equalsIgnoreCase("Vote")) {
+							vote(data[2], data[3], Boolean.valueOf(data[7]), true, 0, new BungeeMessageData(data[8]),
+									data[1]);
+						} else if (data[0].equalsIgnoreCase("VoteOnline")) {
+							vote(data[2], data[3], Boolean.valueOf(data[7]), true, 0, new BungeeMessageData(data[8]),
+									data[1]);
+						}
+					}
+
+				}
+			});
+
+			multiproxyClientHandles = new HashMap<String, ClientHandler>();
+			for (
+
+			String s : config.getMultiProxyServers()) {
+				Configuration d = config.getMultiProxyServersConfiguration(s);
+				multiproxyClientHandles.put(s, new ClientHandler(d.getString("Host", ""), d.getInt("Port", 1234),
+						encryptionHandler, config.getDebug()));
+			}
+
+			getLogger().info("Loaded multi-proxy support");
+		}
+	}
+
 	@EventHandler
 	public void onLogin(PostLoginEvent event) {
 		getProxy().getScheduler().runAsync(this, new Runnable() {
@@ -924,20 +962,21 @@ public class VotingPluginBungee extends Plugin implements Listener {
 	}
 
 	public void login(ProxiedPlayer p) {
-		if (isOnline(p)) {
-			if (p.getServer() != null && p.getServer().getInfo() != null) {
-				final String server = p.getServer().getInfo().getName();
-				final ProxiedPlayer proixedPlayer = p;
-				getProxy().getScheduler().runAsync(this, new Runnable() {
+		if (p != null && p.getServer() != null && p.getServer().getInfo() != null) {
+			final String server = p.getServer().getInfo().getName();
+			final ProxiedPlayer proixedPlayer = p;
+			getProxy().getScheduler().schedule(this, new Runnable() {
 
-					@Override
-					public void run() {
+				@Override
+				public void run() {
+					if (isOnline(p)) {
 						checkCachedVotes(server);
 						checkOnlineVotes(proixedPlayer, proixedPlayer.getUniqueId().toString(), server);
 					}
-				});
-			}
+				}
+			}, 1, TimeUnit.SECONDS);
 		}
+
 	}
 
 	@EventHandler
@@ -970,7 +1009,12 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				return;
 			} else if (subchannel.equalsIgnoreCase("login")) {
 				String player = in.readUTF();
-				debug("Login: " + player);
+				String uuid = in.readUTF();
+				String server = "";
+				if (size > 2) {
+					server = in.readUTF();
+				}
+				debug("Login: " + player + "/" + uuid + " " + server);
 				ProxiedPlayer p = getProxy().getPlayer(player);
 				login(p);
 				return;
@@ -981,7 +1025,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				for (int i = 0; i < size; i++) {
 					out.writeUTF(in.readUTF());
 				}
-				for (String send : getProxy().getServers().keySet()) {
+				for (String send : getAvailableAllServers()) {
 					if (getProxy().getServers().get(send).getPlayers().size() > 0) {
 						getProxy().getServers().get(send).sendData("vp:vp".toLowerCase(), outstream.toByteArray());
 					}
@@ -1025,6 +1069,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				e.printStackTrace();
 			}
 		}
+		loadMultiProxySupport();
 	}
 
 	public void sendPluginMessageServer(String server, String channel, String... messageData) {
@@ -1054,8 +1099,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		}
 	}
 
-	public void sendRedisServerMessage(String... messageData) {
-		for (ClientHandler h : redisClientHandles.values()) {
+	public void sendMultiProxyServerMessage(String... messageData) {
+		for (ClientHandler h : multiproxyClientHandles.values()) {
 			h.sendMessage(messageData);
 		}
 	}
@@ -1103,18 +1148,14 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		if (method.equals(BungeeMethod.SOCKETS)) {
 			sendServerMessage("status");
 		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-			for (String s : getProxy().getServers().keySet()) {
-				if (!config.getBlockedServers().contains(s)) {
-					ServerInfo info = getProxy().getServerInfo(s);
-					if (info.getPlayers().isEmpty()) {
-						getLogger().info("No players on server " + s + " to send test status message");
-					} else {
-						// send
-						getLogger().info("Sending request for status message on " + s);
-						sendPluginMessageServer(s, "Status", s);
-					}
+			for (String s : getAvailableAllServers()) {
+				ServerInfo info = getProxy().getServerInfo(s);
+				if (info.getPlayers().isEmpty()) {
+					getLogger().info("No players on server " + s + " to send test status message");
 				} else {
-					getLogger().info("Ignoring blocked server " + s);
+					// send
+					getLogger().info("Sending request for status message on " + s);
+					sendPluginMessageServer(s, "Status", s);
 				}
 			}
 		}
@@ -1179,7 +1220,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 			player = getProperName(uuid, player);
 
-			if (!getConfig().getPrimaryServer()) {
+			if (getConfig().getPrimaryServer() || !getConfig().getMultiProxySupport()) {
 				addVoteParty();
 				if (getConfig().getBungeeManageTotals()) {
 
@@ -1222,49 +1263,49 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				time = queueTime;
 			}
 
+			ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
 			if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
 
 				if (config.getSendVotesToAllServers()) {
-					for (String s : getProxy().getServers().keySet()) {
-						if (!config.getBlockedServers().contains(s)) {
-							ServerInfo info = getProxy().getServerInfo(s);
-							boolean forceCache = false;
-							ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
-							if (!isOnline(p) && getConfig().getWaitForUserOnline()) {
-								forceCache = true;
-								debug("Forcing vote to cache");
-							}
-							if (config.getBroadcast()) {
-								sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
-							}
-							if (info.getPlayers().isEmpty() || forceCache) {
-								// cache
-								if (!cachedVotes.containsKey(s)) {
-									cachedVotes.put(s, new ArrayList<OfflineBungeeVote>());
-								}
-								ArrayList<OfflineBungeeVote> list = cachedVotes.get(s);
-								list.add(new OfflineBungeeVote(player, uuid, service, time, realVote, text.toString()));
-								cachedVotes.put(s, list);
-
-								debug("Caching vote for " + player + " on " + service + " for " + s);
-
-							} else {
-								// send
-								sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
-										Boolean.TRUE.toString(), "" + realVote, text.toString(),
-										"" + getConfig().getBungeeManageTotals(),
-										"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "1");
-							}
-
+					for (String s : getAvailableAllServers()) {
+						ServerInfo info = getProxy().getServerInfo(s);
+						boolean forceCache = false;
+						if (!isOnline(p) && getConfig().getWaitForUserOnline()) {
+							forceCache = true;
+							debug("Forcing vote to cache");
 						}
+						if (config.getBroadcast()) {
+							sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
+						}
+						if (info.getPlayers().isEmpty() || forceCache) {
+							// cache
+							if (!cachedVotes.containsKey(s)) {
+								cachedVotes.put(s, new ArrayList<OfflineBungeeVote>());
+							}
+							ArrayList<OfflineBungeeVote> list = cachedVotes.get(s);
+							list.add(new OfflineBungeeVote(player, uuid, service, time, realVote, text.toString()));
+							cachedVotes.put(s, list);
+
+							debug("Caching vote for " + player + " on " + service + " for " + s);
+
+						} else {
+							// send
+							sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
+									Boolean.TRUE.toString(), "" + realVote, text.toString(),
+									"" + getConfig().getBungeeManageTotals(),
+									"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast(), "1", "1");
+						}
+
 					}
 				} else {
-					ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
 					if (isOnline(p) && !config.getBlockedServers().contains(p.getServer().getInfo().getName())) {
 						sendPluginMessageServer(p.getServer().getInfo().getName(), "VoteOnline", player, uuid, service,
 								"" + time, Boolean.TRUE.toString(), "" + realVote, text.toString(),
 								"" + getConfig().getBungeeManageTotals(), "" + BungeeVersion.getPluginMessageVersion(),
-								"" + config.getBroadcast(), "1");
+								"" + config.getBroadcast(), "1", "1");
+						if (getConfig().getMultiProxySupport() && getConfig().getMultiProxyOneGlobalReward()) {
+							sendMultiProxyServerMessage("ClearVote", player, uuid);
+						}
 					} else {
 						if (!cachedOnlineVotes.containsKey(uuid)) {
 							cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
@@ -1277,7 +1318,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 						cachedOnlineVotes.put(uuid, list);
 						debug("Caching online vote for " + player + " on " + service);
 					}
-					for (String s : getProxy().getServers().keySet()) {
+					for (String s : getAvailableAllServers()) {
 						if (config.getBroadcast()) {
 							sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
 						}
@@ -1289,9 +1330,22 @@ public class VotingPluginBungee extends Plugin implements Listener {
 			} else if (method.equals(BungeeMethod.SOCKETS)) {
 				sendSocketVote(player, service, text);
 			}
-			if (getConfig().getRedisSupport() && getConfig().getPrimaryServer()) {
-				sendRedisServerMessage("Vote", uuid, player, service, "" + votePartyVotes,
-						"" + currentVotePartyVotesRequired, "" + time, "" + realVote, text.toString());
+			if (getConfig().getMultiProxySupport() && getConfig().getPrimaryServer()) {
+				if (!getConfig().getMultiProxyOneGlobalReward()) {
+					debug("Seending global proxy vote message");
+					sendMultiProxyServerMessage("Vote", uuid, player, service, "" + votePartyVotes,
+							"" + currentVotePartyVotesRequired, "" + time, "" + realVote, text.toString());
+				} else {
+					// check if reward should've already been given
+					if (!(isOnline(p) && !config.getBlockedServers().contains(p.getServer().getInfo().getName()))) {
+						debug("Sending global proxy voteonline message");
+						sendMultiProxyServerMessage("VoteOnline", uuid, player, service, "" + votePartyVotes,
+								"" + currentVotePartyVotesRequired, "" + time, "" + realVote, text.toString());
+					} else {
+						debug("Not sending global proxy message for voteonline, player already got reward");
+					}
+				}
+
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -1299,7 +1353,25 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 	}
 
+	public Set<String> getAvailableAllServers() {
+		Set<String> servers = new HashSet<String>();
+		if (config.getWhiteListedServers().isEmpty()) {
+			for (String s : getProxy().getServers().keySet()) {
+				if (!config.getBlockedServers().contains(s)) {
+					servers.add(s);
+				}
+			}
+		} else {
+			servers.addAll(config.getWhiteListedServers());
+		}
+
+		return servers;
+	}
+
+	@Getter
 	private int votePartyVotes = 0;
+	@Getter
+	@Setter
 	private int currentVotePartyVotesRequired = 0;
 
 	public void addCurrentVotePartyVotes(int amount) {
@@ -1308,10 +1380,14 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		debug("Current vote party total: " + votePartyVotes);
 	}
 
-	public void addVoteParty() {
-		if (getConfig().getVotePartyEnabled()) {
-			addCurrentVotePartyVotes(1);
+	public void setCurrentVotePartyVotes(int amount) {
+		votePartyVotes = amount;
+		voteCacheFile.setVotePartyCurrentVotes(votePartyVotes);
+		debug("Current vote party total: " + votePartyVotes);
+	}
 
+	public void checkVoteParty() {
+		if (getConfig().getVotePartyEnabled()) {
 			if (votePartyVotes >= currentVotePartyVotesRequired) {
 				debug("Vote party reached");
 				addCurrentVotePartyVotes(-currentVotePartyVotesRequired);
@@ -1348,6 +1424,14 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		}
 	}
 
+	public void addVoteParty() {
+		if (getConfig().getVotePartyEnabled()) {
+			addCurrentVotePartyVotes(1);
+
+			checkVoteParty();
+		}
+	}
+
 	public void sendVoteParty(String server, ServerInfo serverInfo) {
 		if (!serverInfo.getPlayers().isEmpty()) {
 			if (method.equals(BungeeMethod.PLUGINMESSAGING)) {

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

@@ -54,17 +54,56 @@ public class VotingPluginBungeeCommand extends Command {
 								new TextComponent("&aNot using socket/pluginmessage method, command unavailable"));
 					}
 				}
+				if (args[0].equalsIgnoreCase("multiproxystatus")) {
+					bungee.sendMultiProxyServerMessage("Status");
+					sender.sendMessage(new TextComponent("&aSending status message"));
+				}
 				if (args[0].equalsIgnoreCase("help")) {
-					TextComponent[] msg = new TextComponent[4];
+					TextComponent[] msg = new TextComponent[7];
 					msg[0] = new TextComponent("&avotingpluginbungee reload - Reload plugin");
 					msg[1] = new TextComponent("&avotingpluginbungee reloadmysql - Reload plugin including mysql");
 					msg[2] = new TextComponent("&avotingpluginbungee vote (player) (servicesite) - Send bungee vote");
 					msg[3] = new TextComponent("&avotingpluginbungee status - Check socket connection status");
+					msg[4] = new TextComponent("&avotingpluginbungee forcetimechange (timetype) - Force a time change");
+					msg[5] = new TextComponent("&avotingpluginbungee voteparty force - Force a vote party");
+					msg[6] = new TextComponent(
+							"&avotingpluginbungee voteparty setvotecount (number) - Set current vote party votes");
 					sender.sendMessage(msg);
 				}
+				if (args[0].equalsIgnoreCase("voteparty")) {
+					if (args.length > 1) {
+						if (args[1].equalsIgnoreCase("Force")) {
+							bungee.setCurrentVotePartyVotes(bungee.getCurrentVotePartyVotesRequired());
+							bungee.checkVoteParty();
+							sender.sendMessage(new TextComponent("Vote party forced"));
+						}
+						if (args.length > 2) {
+							if (args[1].equalsIgnoreCase("SetVoteCount")) {
+								if (isInt(args[2])) {
+									bungee.setCurrentVotePartyVotes(Integer.parseInt(args[2]));
+									sender.sendMessage(new TextComponent("Set current vote party votes to " + args[2]));
+								}
+							}
+						}
+					}
+				}
 			}
 		} else {
 			sender.sendMessage(new TextComponent("&cYou do not have permission to do this!"));
 		}
 	}
+
+	public boolean isInt(String st) {
+		if (st == null) {
+			return false;
+		}
+		try {
+			@SuppressWarnings("unused")
+			int num = Integer.parseInt(st);
+			return true;
+
+		} catch (NumberFormatException ex) {
+			return false;
+		}
+	}
 }

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

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

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

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

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

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

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

@@ -34,7 +34,7 @@ public class VotingPluginVelocityCommand implements SimpleCommand {
 				if (args.length >= 2) {
 					String user = args[1];
 					String site = args[2];
-					plugin.vote(user, site, false, true, 0);
+					plugin.vote(user, site, false, true, 0, null, null);
 					source.sendMessage(Component.text("Sending vote").color(NamedTextColor.AQUA));
 				}
 			}
@@ -60,17 +60,55 @@ public class VotingPluginVelocityCommand implements SimpleCommand {
 							.color(NamedTextColor.AQUA));
 				}
 			}
+			if (args[0].equalsIgnoreCase("multiproxystatus")) {
+				plugin.sendMultiProxyServerMessage("Status");
+				source.sendMessage(Component.text("Sending status message").color(NamedTextColor.AQUA));
+			}
 			if (args[0].equalsIgnoreCase("help")) {
-				String[] msg = new String[4];
+				String[] msg = new String[7];
 				msg[0] = "votingpluginbungee reload - Reload plugin";
 				msg[1] = "votingpluginbungee reloadmysql - Reload plugin including mysql";
 				msg[2] = "votingpluginbungee vote (player) (servicesite) - Send bungee vote";
 				msg[3] = "votingpluginbungee status - Check socket connection status";
+				msg[4] = "&avotingpluginbungee forcetimechange (timetype) - Force a time change";
+				msg[5] = "&avotingpluginbungee voteparty force - Force a vote party";
+				msg[6] = "&avotingpluginbungee voteparty setvotecount (number) - Set current vote party votes";
 				for (String m : msg) {
 					source.sendMessage(Component.text(m).color(NamedTextColor.AQUA));
 				}
-
 			}
+			if (args[0].equalsIgnoreCase("voteparty")) {
+				if (args.length > 1) {
+					if (args[1].equalsIgnoreCase("Force")) {
+						plugin.setCurrentVotePartyVotes(plugin.getCurrentVotePartyVotesRequired());
+						plugin.checkVoteParty();
+						source.sendMessage(Component.text("Vote party forced").color(NamedTextColor.AQUA));
+					}
+					if (args.length > 2) {
+						if (args[1].equalsIgnoreCase("SetVoteCount")) {
+							if (isInt(args[2])) {
+								plugin.setCurrentVotePartyVotes(Integer.parseInt(args[2]));
+								source.sendMessage(Component.text("Set current vote party votes to " + args[2])
+										.color(NamedTextColor.AQUA));
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	public boolean isInt(String st) {
+		if (st == null) {
+			return false;
+		}
+		try {
+			@SuppressWarnings("unused")
+			int num = Integer.parseInt(st);
+			return true;
+
+		} catch (NumberFormatException ex) {
+			return false;
 		}
 	}
 

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

@@ -30,6 +30,7 @@ import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.PlayerUtils;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.updater.Updater;
+import com.bencodez.advancedcore.api.user.UserStorage;
 import com.bencodez.advancedcore.api.user.userstorage.DataType;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.listeners.BooleanListener;
@@ -255,36 +256,37 @@ public class CommandLoader {
 					}
 				});
 
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ResyncMilestones" },
-				"VotingPlugin.Commands.AdminVote.ResyncMilestones|" + adminPerm, "Resync Milestones") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				sendMessage(sender, "&cStarting...");
-				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-					user.dontCache();
-					user.setMilestoneCount(user.getTotal(TopVoter.AllTime));
-				}
-				sendMessage(sender, "&cFinished sync milestonecount with all time total");
-
-			}
-		});
-
 		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "ResetMilestoneCount" },
-						"VotingPlugin.Commands.AdminVote.ResetMilestoneCount|" + adminPerm,
-						"Resets milestone count to alltimetotal") {
+				.add(new CommandHandler(new String[] { "ResyncMilestones" },
+						"VotingPlugin.Commands.AdminVote.ResyncMilestones|" + adminPerm,
+						"Resync Milestones to all time total") {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						sendMessage(sender, "&cStarting to clear milestonecounts...");
-						plugin.getTopVoterHandler().resetMilestoneCount();
-						sendMessage(sender, "&cFinished");
+						sendMessage(sender, "&cStarting...");
+						for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+							VotingPluginUser user = UserManager.getInstance()
+									.getVotingPluginUser(UUID.fromString(uuid));
+							user.dontCache();
+							user.setMilestoneCount(user.getTotal(TopVoter.AllTime));
+						}
+						sendMessage(sender, "&cFinished sync milestonecount with all time total");
 
 					}
 				});
 
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ResetMilestoneCount" },
+				"VotingPlugin.Commands.AdminVote.ResetMilestoneCount|" + adminPerm, "Resets milestone count to 0") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				sendMessage(sender, "&cStarting to clear milestonecounts...");
+				plugin.getTopVoterHandler().resetMilestoneCount();
+				sendMessage(sender, "&cFinished");
+
+			}
+		});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "ResyncMilestonesAlreadyGiven" },
 						"VotingPlugin.Commands.AdminVote.ResyncMilestonesGiven|" + adminPerm,
@@ -868,15 +870,22 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				sendMessage(sender, "&cTriggering vote for all voting sites...");
 				for (VoteSite site : plugin.getVoteSites()) {
-					PlayerVoteEvent voteEvent = new PlayerVoteEvent(site, args[1], site.getServiceSite(), false);
-					if (voteEvent.getVoteSite() != null) {
-						if (!voteEvent.getVoteSite().isVaidServiceSite()) {
-							sendMessage(sender,
-									"&cPossible issue with service site, has the server gotten the vote from "
-											+ voteEvent.getServiceSite() + "?");
+					plugin.getVoteTimer().submit(new Runnable() {
+
+						@Override
+						public void run() {
+							PlayerVoteEvent voteEvent = new PlayerVoteEvent(site, args[1], site.getServiceSite(),
+									false);
+							if (voteEvent.getVoteSite() != null) {
+								if (!voteEvent.getVoteSite().isVaidServiceSite()) {
+									sendMessage(sender,
+											"&cPossible issue with service site, has the server gotten the vote from "
+													+ voteEvent.getServiceSite() + "?");
+								}
+							}
+							plugin.getServer().getPluginManager().callEvent(voteEvent);
 						}
-					}
-					plugin.getServer().getPluginManager().callEvent(voteEvent);
+					});
 				}
 
 				if (plugin.isYmlError()) {
@@ -893,17 +902,24 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[2], true), args[1], args[2],
 						false);
-				sendMessage(sender, "&cTriggering vote...");
 				if (voteEvent.getVoteSite() != null) {
 					if (!voteEvent.getVoteSite().isVaidServiceSite()) {
 						sendMessage(sender, "&cPossible issue with service site, has the server gotten the vote from "
 								+ voteEvent.getServiceSite() + "?");
 					}
-				}
-				plugin.getServer().getPluginManager().callEvent(voteEvent);
+					sendMessage(sender, "&cTriggering vote...");
 
-				if (plugin.isYmlError()) {
-					sendMessage(sender, "&3Detected yml error, please check server log for details");
+					plugin.getVoteTimer().submit(new Runnable() {
+
+						@Override
+						public void run() {
+							plugin.getServer().getPluginManager().callEvent(voteEvent);
+						}
+					});
+
+					if (plugin.isYmlError()) {
+						sendMessage(sender, "&3Detected yml error, please check server log for details");
+					}
 				}
 
 			}
@@ -926,7 +942,13 @@ public class CommandLoader {
 												+ voteEvent.getServiceSite() + "?");
 							}
 						}
-						plugin.getServer().getPluginManager().callEvent(voteEvent);
+						plugin.getVoteTimer().submit(new Runnable() {
+
+							@Override
+							public void run() {
+								plugin.getServer().getPluginManager().callEvent(voteEvent);
+							}
+						});
 
 						if (plugin.isYmlError()) {
 							sendMessage(sender, "&3Detected yml error, please check server log for details");
@@ -1216,7 +1238,7 @@ public class CommandLoader {
 
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "Test", "(Player)", "(sitename)", "(number)" },
-						"VotingPlugin.Commands.AdminVote.Test|" + adminPerm, "Test voting times") {
+						"VotingPlugin.Commands.AdminVote.Test|" + adminPerm, "Test voting speed, for debug") {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
@@ -1227,9 +1249,22 @@ public class CommandLoader {
 					}
 				});
 
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "TestSpam", "(Player)", "(sitename)", "(number)" },
+						"VotingPlugin.Commands.AdminVote.TestSpam|" + adminPerm, "Test voting spam speed, for debug") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						VoteTester.getInstance().testSpam(Integer.parseInt(args[3]), args[1], args[2]);
+						if (isPlayer(sender)) {
+							sendMessage(sender, "&cSee console for details");
+						}
+					}
+				});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "TestReward", "(Player)", "(reward)", "(number)" },
-						"VotingPlugin.Commands.AdminVote.TestReward|" + adminPerm, "Test reward times") {
+						"VotingPlugin.Commands.AdminVote.TestReward|" + adminPerm, "Test reward speed, for debug") {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
@@ -1258,7 +1293,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						plugin.getVoteParty().giveRewards(plugin.getBungeeSettings().isUseBungeecoord());
+						plugin.getVoteParty().giveRewards(null, plugin.getBungeeSettings().isUseBungeecoord());
 					}
 				});
 
@@ -2172,13 +2207,41 @@ public class CommandLoader {
 				int month = 0;
 				int all = 0;
 
-				for (String uuid : uuids) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-					user.dontCache();
-					daily += user.getTotal(TopVoter.Daily);
-					weekly += user.getTotal(TopVoter.Weekly);
-					month += user.getTotal(TopVoter.Monthly);
-					all += user.getTotal(TopVoter.AllTime);
+				if (plugin.getOptions().getStorageType().equals(UserStorage.MYSQL)) {
+					for (TopVoter top : TopVoter.values()) {
+						int cTotal = 0;
+						ArrayList<Integer> nums = plugin.getMysql().getNumbersInColumn(top.getColumnName());
+						for (Integer num : nums) {
+							cTotal += num.intValue();
+						}
+						switch (top) {
+						case AllTime:
+							all = cTotal;
+							break;
+						case Daily:
+							daily = cTotal;
+							break;
+						case Monthly:
+							month = cTotal;
+							break;
+						case Weekly:
+							weekly = cTotal;
+							break;
+						default:
+							break;
+
+						}
+					}
+				} else {
+
+					for (String uuid : uuids) {
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+						user.dontCache();
+						daily += user.getTotal(TopVoter.Daily);
+						weekly += user.getTotal(TopVoter.Weekly);
+						month += user.getTotal(TopVoter.Monthly);
+						all += user.getTotal(TopVoter.AllTime);
+					}
 				}
 
 				for (String s : plugin.getConfigFile().getFormatCommandsVoteTotalAll()) {

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

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

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

@@ -196,7 +196,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
-				new EditGUIValueList("Commands", plugin.getSpecialRewardsConfig().getVotePartyCommands()) {
+				new EditGUIValueList("Commands", plugin.getSpecialRewardsConfig().getVotePartyGlobalCommands()) {
 
 					@Override
 					public void setValue(Player player, ArrayList<String> value) {

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

@@ -13,6 +13,7 @@ import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
@@ -91,6 +92,21 @@ public class VoteBest extends GUIHandler {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 
+		String guiPath = "VoteBest";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + ".Rewards").setGiveOffline(false)
+									.send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
 		inv.openInventory(player);
 	}
 

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

@@ -8,11 +8,13 @@ import org.bukkit.entity.Player;
 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.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.user.UserManager;
@@ -97,6 +99,21 @@ public class VoteLast extends GUIHandler {
 			}
 		}
 
+		String guiPath = "VoteLast";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + ".Rewards").setGiveOffline(false)
+									.send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
 		if (plugin.getGui().getChestVoteLastBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}

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

@@ -11,10 +11,12 @@ 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.StringParser;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -106,6 +108,21 @@ public class VoteNext extends GUIHandler {
 			}
 		}
 
+		String guiPath = "VoteNext";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + ".Rewards").setGiveOffline(false)
+									.send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
 		if (plugin.getGui().getChestVoteNextBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}

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

@@ -13,6 +13,7 @@ import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
@@ -118,6 +119,21 @@ public class VoteStreak extends GUIHandler {
 
 			}
 		});
+		
+		String guiPath = "VoteStreak";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + ".Rewards").setGiveOffline(false)
+									.send(clickEvent.getPlayer());
+
+						}
+					});
+		}
 
 		if (plugin.getGui().getChestVoteStreakBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));

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

@@ -18,6 +18,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.rewards.RewardBuilder;
 import com.bencodez.advancedcore.nms.NMSManager;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
@@ -116,6 +117,21 @@ public class VoteToday extends GUIHandler {
 				});
 			}
 		}
+		
+		String guiPath = "VoteToday";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + ".Rewards").setGiveOffline(false)
+									.send(clickEvent.getPlayer());
+
+						}
+					});
+		}
 
 		if (plugin.getGui().getChestVoteTodayBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));

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

@@ -8,11 +8,13 @@ import org.bukkit.entity.Player;
 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.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -84,6 +86,21 @@ public class VoteTotal extends GUIHandler {
 			});
 		}
 
+		String guiPath = "VoteTotal";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + ".Rewards").setGiveOffline(false)
+									.send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
 		if (plugin.getGui().getChestVoteTotalBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}

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

@@ -1,11 +1,13 @@
 package com.bencodez.votingplugin.config;
 
 import java.io.File;
+import java.util.ArrayList;
 
 import com.bencodez.advancedcore.api.yml.YMLFile;
 import com.bencodez.advancedcore.api.yml.annotation.AnnotationHandler;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataBoolean;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataInt;
+import com.bencodez.advancedcore.api.yml.annotation.ConfigDataListString;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataString;
 import com.bencodez.votingplugin.VotingPluginMain;
 
@@ -89,6 +91,10 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private boolean globlalDataEnabled = false;
 
+	@ConfigDataListString(path = "BungeeVotePartyGlobalCommands")
+	@Getter
+	private ArrayList<String> bungeeVotePartyGlobalCommands = new ArrayList<String>();
+
 	public BungeeSettings(VotingPluginMain plugin) {
 		super(plugin, new File(plugin.getDataFolder(), "BungeeSettings.yml"));
 	}

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

@@ -15,6 +15,7 @@ import com.bencodez.advancedcore.api.yml.annotation.ConfigDataInt;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataListString;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataString;
 import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.placeholders.PlaceholderCacheLevel;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 
 import lombok.Getter;
@@ -37,6 +38,10 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean perSiteCoolDownEvents = false;
 
+	@ConfigDataBoolean(path = "QueueVotesDuringTimeChange")
+	@Getter
+	private boolean queueVotesDuringTimeChange = false;
+
 	@ConfigDataBoolean(path = "AllowUnjoined")
 	@Getter
 	private boolean allowUnjoined = false;
@@ -45,10 +50,6 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean preloadSkulls = false;
 
-	@ConfigDataBoolean(path = "AutoCachePlaceholders")
-	@Getter
-	private boolean autoCachePlaceholders = true;
-
 	@ConfigDataBoolean(path = "AllowUnJoinedCheckServer")
 	@Getter
 	private boolean allowUnJoinedCheckServer = true;
@@ -73,14 +74,6 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean alwaysUpdate = false;
 
-	@ConfigDataBoolean(path = "AlwaysWaitForCachePlaceholders")
-	@Getter
-	private boolean alwaysWaitForCachePlaceholders = false;
-
-	@ConfigDataBoolean(path = "AlwaysProcessPlaceholders")
-	@Getter
-	private boolean alwaysProcessPlaceholders = false;
-
 	@ConfigDataBoolean(path = "AutoCreateVoteSites")
 	@Getter
 	private boolean autoCreateVoteSites = true;
@@ -432,6 +425,10 @@ public class Config extends YMLFile {
 				"%hours% Hours and %minutes% Minutes");
 	}
 
+	public PlaceholderCacheLevel getPlaceholderCacheLevel() {
+		return PlaceholderCacheLevel.getCache(getData().getString("PlaceholderCacheLevel", "AUTO"));
+	}
+
 	/**
 	 * Gets the commands vote next layout.
 	 *

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

@@ -499,6 +499,17 @@ public class GUI extends YMLFile {
 		return getData().getConfigurationSection("CHEST.VoteURL.ExtraItems." + item);
 	}
 
+	public Set<String> getChestGUIExtraItems(String gui) {
+		if (getData().isConfigurationSection("CHEST." + gui + ".ExtraItems")) {
+			return getData().getConfigurationSection("CHEST." + gui + ".ExtraItems").getKeys(false);
+		}
+		return new HashSet<String>();
+	}
+
+	public ConfigurationSection getChestGUIExtraItemsItem(String gui, String item) {
+		return getData().getConfigurationSection("CHEST." + gui + ".ExtraItems." + item);
+	}
+
 	/**
 	 * Gets the vote URL site name.
 	 *

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

@@ -19,7 +19,7 @@ public class SpecialRewardsConfig extends YMLFile {
 
 	@Getter
 	private String allSitesRewardPath = "AllSites";
-	
+
 	@Getter
 	private String almostAllSitesRewardPath = "AlmostAllSites";
 
@@ -236,8 +236,9 @@ public class SpecialRewardsConfig extends YMLFile {
 	}
 
 	@SuppressWarnings("unchecked")
-	public ArrayList<String> getVotePartyCommands() {
-		return (ArrayList<String>) getData().getList("VoteParty.Commands", new ArrayList<String>());
+	public ArrayList<String> getVotePartyGlobalCommands() {
+		return (ArrayList<String>) getData().getList("VoteParty.GlobalCommands",
+				(ArrayList<String>) getData().getList("VoteParty.Commands", new ArrayList<String>()));
 	}
 
 	public boolean getVotePartyCountFakeVotes() {

VotingPlugin/src/com/bencodez/votingplugin/cooldown/CoolDownCheck.java

@@ -113,7 +113,9 @@ public class CoolDownCheck implements Listener {
 
 				@Override
 				public void run() {
-					checkPerSite(uuid);
+					if (plugin != null && plugin.isEnabled()) {
+						checkPerSite(uuid);
+					}
 				}
 			}, time + 2, TimeUnit.SECONDS);
 			perSiteTasks.put(uuid, scheduledFuture);

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

@@ -30,7 +30,7 @@ public class ServerData {
 
 	public void addAutoCachedPlaceholder(String placeholder) {
 		List<String> p = getAutoCachedPlaceholder();
-		if (!p.contains(placeholder)) {
+		if (!ArrayUtils.getInstance().containsIgnoreCase(p, placeholder)) {
 			p.add(placeholder);
 			setAutoCachedPlaceholder(p);
 		}

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

@@ -47,9 +47,12 @@ public class PlayerJoinEvent implements Listener {
 
 		user.loginRewards();
 
+		plugin.getPlaceholders().onUpdate(user);
+
 		if (plugin.getBungeeSettings().isUseBungeecoord()
 				&& plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
-			plugin.getPluginMessaging().sendPluginMessage("Login", user.getPlayerName(), user.getUUID());
+			plugin.getPluginMessaging().sendPluginMessage("Login", user.getPlayerName(), user.getUUID(),
+					plugin.getBungeeSettings().getServer());
 		}
 	}
 

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

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

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

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

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

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

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

@@ -13,7 +13,6 @@ import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
@@ -47,17 +46,39 @@ public class PlaceHolders {
 
 	public PlaceHolders(VotingPluginMain plugin) {
 		this.plugin = plugin;
+		cacheLevel = plugin.getConfigFile().getPlaceholderCacheLevel();
+	}
+
+	public void reload() {
+		cacheLevel = plugin.getConfigFile().getPlaceholderCacheLevel();
 	}
 
 	private ArrayList<String> cachedPlaceholders = new ArrayList<String>();
 
 	private ConcurrentLinkedQueue<String> placeholdersToSetCacheOn = new ConcurrentLinkedQueue<String>();
 
+	@Getter
+	private PlaceholderCacheLevel cacheLevel;
+
 	public String getPlaceHolder(OfflinePlayer p, String identifier) {
 		return getPlaceHolder(p, identifier, true);
 	}
 
 	public String getPlaceHolder(OfflinePlayer p, String identifier, boolean javascript) {
+		boolean forceProcess = false;
+		boolean useCache = true;
+		if (identifier.endsWith("_process")) {
+			forceProcess = true;
+			identifier = identifier.replaceAll("_process", "");
+		}
+		if (identifier.endsWith("_nocache")) {
+			useCache = false;
+			identifier = identifier.replaceAll("_nocache", "");
+		}
+		if (getCacheLevel().equals(PlaceholderCacheLevel.NONE)) {
+			useCache = false;
+		}
+
 		if (plugin.getConfigFile().isUseJavascriptPlaceholders() && javascript && p != null) {
 			identifier = StringParser.getInstance().replaceJavascript(p, identifier);
 		}
@@ -76,18 +97,25 @@ public class PlaceHolders {
 		if (p == null) {
 			return "no player";
 		}
+
 		VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(p);
-		if (!cachedPlaceholders.contains(identifier)) {
-			if (Bukkit.isPrimaryThread() || plugin.getConfigFile().isAlwaysWaitForCachePlaceholders()) {
-				user.setWaitForCache(false);
-				if (!user.isCached()) {
-					user.loadCache();
-					if (plugin.getConfigFile().isAutoCachePlaceholders()) {
-						placeholdersToSetCacheOn.add(identifier);
-					}
-					if (!plugin.getConfigFile().isAlwaysProcessPlaceholders()) {
-						return "..";
+		if (useCache) {
+			if (!cachedPlaceholders.contains(identifier)) {
+				// not cached placeholder
+				if (!forceProcess) {
+					for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
+						if (placeholder.matches(identifier)) {
+							if (getCacheLevel().shouldCache()) {
+								if (!placeholdersToSetCacheOn.contains(identifier)) {
+									placeholdersToSetCacheOn.add(identifier);
+									schedulePlaceholderCheck(user);
+								}
+							}
+							return "..";
+						}
 					}
+					return "Not a valid placeholder";
+
 				}
 			}
 		}
@@ -100,17 +128,36 @@ public class PlaceHolders {
 		for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
 			try {
 				if (placeholder.matches(identifier)) {
-					if (placeholder.isUsesCache() && placeholder.isCached(identifier)) {
-						ConcurrentHashMap<UUID, String> cache = placeholder.getCache().get(identifier);
-						if (cache.containsKey(p.getUniqueId())) {
-							return cache.get(p.getUniqueId());
-						} else {
-							if (!plugin.getConfigFile().isAlwaysProcessPlaceholders()) {
-								return "....";
-							} else {
-								return placeholder.placeholderRequest(user, identifier);
+					if (useCache) {
+						if (placeholder.isUsesCache() && placeholder.isCached(identifier)) {
+							ConcurrentHashMap<UUID, String> cache = placeholder.getCache().get(identifier);
+							if (cache.containsKey(p.getUniqueId())) {
+								return cache.get(p.getUniqueId());
+							} else if (!forceProcess) {
+								schedulePlaceholderCheck(user);
+								return "...";
 							}
 						}
+
+						if (forceProcess) {
+							if (getCacheLevel().shouldCache()) {
+								if (!placeholdersToSetCacheOn.contains(identifier)
+										&& !cachedPlaceholders.contains(identifier)) {
+									placeholdersToSetCacheOn.add(identifier);
+									schedulePlaceholderCheck(user);
+								}
+							}
+							return placeholder.placeholderRequest(user, identifier);
+						} else {
+							if (getCacheLevel().shouldCache()) {
+								if (!placeholdersToSetCacheOn.contains(identifier)
+										&& !cachedPlaceholders.contains(identifier)) {
+									placeholdersToSetCacheOn.add(identifier);
+									schedulePlaceholderCheck(user);
+								}
+							}
+							return ".";
+						}
 					} else {
 						return placeholder.placeholderRequest(user, identifier);
 					}
@@ -122,6 +169,7 @@ public class PlaceHolders {
 		}
 
 		return "Not a valid placeholder";
+
 	}
 
 	public String getPlaceHolder(Player p, String identifier) {
@@ -718,43 +766,27 @@ public class PlaceHolders {
 
 		Set<String> placeholdersSet = new HashSet<String>();
 		placeholdersSet.addAll(plugin.getConfigFile().getCachedPlaceholders());
-		if (plugin.getConfigFile().isAutoCachePlaceholders()) {
+		if (getCacheLevel().equals(PlaceholderCacheLevel.AUTO)) {
 			placeholdersSet.addAll(plugin.getServerData().getAutoCachedPlaceholder());
 		}
 
 		for (String toCache : placeholdersSet) {
-			if (toCache.startsWith("VotingPlugin")) {
-				toCache = toCache.substring("VotingPlugin_".length());
+			if (toCache.startsWith("votingplugin")) {
+				toCache = toCache.substring("votingplugin_".length());
 			}
 			for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : nonPlayerPlaceholders) {
-				if (placeholder.isUseStartsWith()) {
-					if (toCache.startsWith(placeholder.getIdentifier())) {
-						placeholder.setUseCache(true, toCache);
-						cachedPlaceholders.add(toCache);
-						plugin.extraDebug("Caching placeholder " + toCache);
-					}
-				} else {
-					if (placeholder.getIdentifier().equalsIgnoreCase(toCache)) {
-						placeholder.setUseCache(true, toCache);
-						cachedPlaceholders.add(toCache);
-						plugin.extraDebug("Caching placeholder " + toCache);
-					}
+				if (placeholder.matches(toCache)) {
+					placeholder.setUseCache(true, toCache);
+					cachedPlaceholders.add(toCache);
+					plugin.extraDebug("Caching placeholder " + toCache);
 				}
 			}
 
 			for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
-				if (placeholder.isUseStartsWith()) {
-					if (toCache.startsWith(placeholder.getIdentifier())) {
-						placeholder.setUseCache(true, toCache);
-						cachedPlaceholders.add(toCache);
-						plugin.extraDebug("Caching placeholder " + toCache);
-					}
-				} else {
-					if (placeholder.getIdentifier().equalsIgnoreCase(toCache)) {
-						placeholder.setUseCache(true, toCache);
-						cachedPlaceholders.add(toCache);
-						plugin.extraDebug("Caching placeholder " + toCache);
-					}
+				if (placeholder.matches(toCache)) {
+					placeholder.setUseCache(true, toCache);
+					cachedPlaceholders.add(toCache);
+					plugin.extraDebug("Caching placeholder " + toCache);
 				}
 			}
 		}
@@ -763,16 +795,19 @@ public class PlaceHolders {
 
 			@Override
 			public void onChange(AdvancedCoreUser user, String... keys) {
+				VotingPluginUser vpUser = UserManager.getInstance().getVotingPluginUser(user);
+				if (!vpUser.isCached()) {
+					vpUser.dontCache();
+				}
 				for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
 					if (placeholder.isUsesCache()) {
 						for (String key : keys) {
 							if (placeholder.getUpdateDataKey().equalsIgnoreCase(key)) {
-								VotingPluginUser vpUser = UserManager.getInstance().getVotingPluginUser(user);
-								vpUser.dontCache();
 								for (String ident : placeholder.getCache().keySet()) {
-									placeholder.getCache().get(ident).put(vpUser.getJavaUUID(),
-											placeholder.placeholderRequest(vpUser, ident));
-									plugin.devDebug("Updated placeholder cache for " + vpUser.getUUID() + " on " + key);
+									String value = placeholder.placeholderRequest(vpUser, ident);
+									placeholder.getCache().get(ident).put(vpUser.getJavaUUID(), value);
+									plugin.devDebug("Updated placeholder cache for " + vpUser.getUUID() + " on " + key
+											+ " with " + value);
 
 								}
 
@@ -819,27 +854,46 @@ public class PlaceHolders {
 		}
 	}
 
-	public void onUpdate() {
+	public void checkNonCachedPlaceholders() {
 		while (!placeholdersToSetCacheOn.isEmpty()) {
-			String toCache = placeholdersToSetCacheOn.poll();
+			String toCache = placeholdersToSetCacheOn.poll().toLowerCase();
+			if (toCache.startsWith("votingplugin")) {
+				toCache = toCache.substring("votingplugin_".length());
+			}
 			for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : nonPlayerPlaceholders) {
 				if (placeholder.matches(toCache)) {
 					placeholder.setUseCache(true, toCache);
 					cachedPlaceholders.add(toCache);
 					plugin.getServerData().addAutoCachedPlaceholder(toCache);
-					plugin.debug("Auto caching placeholder: " + toCache);
+					plugin.extraDebug("Auto Caching placeholder " + toCache);
 				}
+
 			}
 			for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
 				if (placeholder.matches(toCache)) {
 					placeholder.setUseCache(true, toCache);
 					cachedPlaceholders.add(toCache);
 					plugin.getServerData().addAutoCachedPlaceholder(toCache);
-					plugin.debug("Auto caching placeholder: " + toCache);
+					plugin.extraDebug("Auto Caching placeholder " + toCache);
 				}
 			}
 
 		}
+	}
+
+	public void schedulePlaceholderCheck(VotingPluginUser user) {
+		plugin.getTimer().execute(new Runnable() {
+
+			@Override
+			public void run() {
+				checkNonCachedPlaceholders();
+				onUpdate(user);
+			}
+		});
+	}
+
+	public void onUpdate() {
+		checkNonCachedPlaceholders();
 		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : nonPlayerPlaceholders) {
 			if (placeholder.isUsesCache()) {
 				for (String ident : placeholder.getCache().keySet()) {

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

@@ -0,0 +1,28 @@
+package com.bencodez.votingplugin.placeholders;
+
+public enum PlaceholderCacheLevel {
+	NONE, SPECIFC, AUTO;
+
+	public static PlaceholderCacheLevel getCache(String str) {
+		for (PlaceholderCacheLevel v : PlaceholderCacheLevel.values()) {
+			if (v.toString().equalsIgnoreCase(str)) {
+				return v;
+			}
+		}
+		return AUTO;
+	}
+
+	public boolean shouldCache() {
+		switch (this) {
+		case AUTO:
+			return true;
+		case NONE:
+			return false;
+		case SPECIFC:
+			return false;
+		default:
+			return false;
+		}
+	}
+
+}

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

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

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

@@ -44,6 +44,22 @@ public enum TopVoter {
 
 		}
 	}
+	
+	public String getLastColumnName() {
+		switch (this) {
+		case AllTime:
+			return null;
+		case Daily:
+			return "LastDailyTotal";
+		case Monthly:
+			return "LastMonthTotal";
+		case Weekly:
+			return "LastWeeklyTotal";
+		default:
+			return null;
+
+		}
+	}
 
 	public String getName() {
 		if (this.equals(TopVoter.Monthly)) {

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

@@ -125,25 +125,28 @@ public class TopVoterHandler implements Listener {
 				storeTopVoters(TopVoter.Daily);
 			}
 
-			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid), false);
-				user.dontCache();
-				user.tempCache();
-				user.getUserData().updateCacheWithTemp();
-				if (plugin.getConfigFile().isUseVoteStreaks()) {
-					if (!user.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
-						if (user.getDayVoteStreak() != 0) {
-							user.setDayVoteStreak(0);
+			plugin.getUserManager().copyColumnData(TopVoter.Daily.getColumnName(), TopVoter.Daily.getLastColumnName());
+			if (plugin.getConfigFile().isUseVoteStreaks() || plugin.getConfigFile().isUseHighestTotals()) {
+				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid), false);
+					user.dontCache();
+					user.tempCache();
+					user.getUserData().updateCacheWithTemp();
+					if (plugin.getConfigFile().isUseVoteStreaks()) {
+						if (!user.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
+							if (user.getDayVoteStreak() != 0) {
+								user.setDayVoteStreak(0);
+							}
 						}
 					}
-				}
 
-				if (plugin.getConfigFile().isUseHighestTotals()) {
-					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));
+						}
 					}
+					user.clearTempCache();
 				}
-				user.clearTempCache();
 			}
 
 			try {
@@ -156,17 +159,17 @@ public class TopVoterHandler implements Listener {
 					LinkedHashMap<TopVoterPlayer, Integer> clone = (LinkedHashMap<TopVoterPlayer, Integer>) plugin
 							.getTopVoter(TopVoter.Daily).clone();
 					for (Entry<TopVoterPlayer, Integer> entry : clone.entrySet()) {
-						VotingPluginUser user = entry.getKey().getUser();
-						user.dontCache();
-						if (!plugin.getConfigFile().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-							if (plugin.getConfigFile().getTopVoterAwardsTies()) {
-								if (entry.getValue().intValue() != lastTotal) {
-									i++;
-								}
-							} else {
+						if (plugin.getConfigFile().getTopVoterAwardsTies()) {
+							if (entry.getValue().intValue() != lastTotal) {
 								i++;
 							}
-							if (places.containsKey(i)) {
+						} else {
+							i++;
+						}
+						if (places.containsKey(i)) {
+							VotingPluginUser user = entry.getKey().getUser();
+							user.dontCache();
+							if (!plugin.getConfigFile().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
 								user.giveDailyTopVoterAward(i, places.get(i));
 							}
 						}
@@ -182,15 +185,18 @@ public class TopVoterHandler implements Listener {
 					resetVoteShopLimit(shopIdent);
 				}
 			}
-			
-			try {
-				Thread.sleep(30000);
-			} catch (InterruptedException e) {
-				e.printStackTrace();
+
+			if (!plugin.getBungeeSettings().isGloblalDataEnabled() && plugin.getBungeeSettings().isUseBungeecoord()) {
+				// give time for other servers to catch up
+				try {
+					Thread.sleep(30000);
+				} catch (InterruptedException e) {
+					e.printStackTrace();
+				}
 			}
 
 			// give time for other servers to catch up
-			if (plugin.getBungeeSettings().isUseBungeecoord() && !plugin.getTopVoterHandler().bungeeHandleResets()) {
+			if (!plugin.getTopVoterHandler().bungeeHandleResets()) {
 				plugin.debug("Delaying time change 10 seconds for other servers to catchup");
 				try {
 					Thread.sleep(10000);
@@ -218,34 +224,42 @@ public class TopVoterHandler implements Listener {
 		synchronized (VotingPluginMain.plugin) {
 			plugin.getLogger().info("Saving TopVoters Monthly");
 			storeTopVoters(TopVoter.Monthly);
-			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid), false);
-				user.dontCache();
-				user.tempCache();
-				user.getUserData().updateCacheWithTemp();
-				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());
+			if (!bungeeHandleResets()) {
+				plugin.getUserManager().copyColumnData(TopVoter.Monthly.getColumnName(),
+						TopVoter.Monthly.getLastColumnName());
+			}
+			if (plugin.getConfigFile().isUseHighestTotals() || plugin.getConfigFile().isUseVoteStreaks()) {
+				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid), false);
+					user.dontCache();
+					user.tempCache();
+					user.getUserData().updateCacheWithTemp();
+					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());
+							}
 						}
 					}
-				}
 
-				user.setLastMonthTotal(user.getTotal(TopVoter.Monthly));
+					// using new system
+					// user.setLastMonthTotal(user.getTotal(TopVoter.Monthly));
 
-				if (plugin.getConfigFile().isUseHighestTotals()) {
-					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));
+						}
 					}
+					user.clearTempCache();
 				}
-				user.clearTempCache();
+
 			}
 
 			try {
@@ -259,17 +273,19 @@ public class TopVoterHandler implements Listener {
 					LinkedHashMap<TopVoterPlayer, Integer> clone = (LinkedHashMap<TopVoterPlayer, Integer>) plugin
 							.getTopVoter(TopVoter.Monthly).clone();
 					for (Entry<TopVoterPlayer, Integer> entry : clone.entrySet()) {
-						VotingPluginUser user = entry.getKey().getUser();
-						user.dontCache();
-						if (!plugin.getConfigFile().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-							if (plugin.getConfigFile().getTopVoterAwardsTies()) {
-								if (entry.getValue().intValue() != lastTotal) {
-									i++;
-								}
-							} else {
+						if (plugin.getConfigFile().getTopVoterAwardsTies()) {
+							if (entry.getValue().intValue() != lastTotal) {
 								i++;
 							}
-							if (places.containsKey(i)) {
+						} else {
+							i++;
+						}
+
+						if (places.containsKey(i)) {
+							VotingPluginUser user = entry.getKey().getUser();
+							user.dontCache();
+							if (!plugin.getConfigFile().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
+
 								user.giveMonthlyTopVoterAward(i, places.get(i));
 							}
 						}
@@ -293,7 +309,7 @@ public class TopVoterHandler implements Listener {
 			}
 
 			// give time for other servers to catch up
-			if (plugin.getBungeeSettings().isUseBungeecoord() && !plugin.getTopVoterHandler().bungeeHandleResets()) {
+			if (!bungeeHandleResets()) {
 				plugin.debug("Delaying time change 10 seconds for other servers to catchup");
 				try {
 					Thread.sleep(10000);
@@ -329,31 +345,35 @@ public class TopVoterHandler implements Listener {
 				storeTopVoters(TopVoter.Weekly);
 			}
 
-			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid), false);
-				user.dontCache();
-				user.tempCache();
-				user.getUserData().updateCacheWithTemp();
-				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());
+			plugin.getUserManager().copyColumnData(TopVoter.Weekly.getColumnName(),
+					TopVoter.Weekly.getLastColumnName());
+			if (plugin.getConfigFile().isUseVoteStreaks() || plugin.getConfigFile().isUseHighestTotals()) {
+				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid), false);
+					user.dontCache();
+					user.tempCache();
+					user.getUserData().updateCacheWithTemp();
+					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());
+							}
 						}
 					}
-				}
 
-				if (plugin.getConfigFile().isUseHighestTotals()) {
-					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));
+						}
 					}
+					user.clearTempCache();
 				}
-				user.clearTempCache();
 			}
 
 			try {
@@ -366,17 +386,18 @@ public class TopVoterHandler implements Listener {
 					LinkedHashMap<TopVoterPlayer, Integer> clone = (LinkedHashMap<TopVoterPlayer, Integer>) plugin
 							.getTopVoter(TopVoter.Weekly).clone();
 					for (Entry<TopVoterPlayer, Integer> entry : clone.entrySet()) {
-						VotingPluginUser user = entry.getKey().getUser();
-						user.dontCache();
-						if (!plugin.getConfigFile().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-							if (plugin.getConfigFile().getTopVoterAwardsTies()) {
-								if (entry.getValue().intValue() != lastTotal) {
-									i++;
-								}
-							} else {
+						if (plugin.getConfigFile().getTopVoterAwardsTies()) {
+							if (entry.getValue().intValue() != lastTotal) {
 								i++;
 							}
-							if (places.containsKey(i)) {
+						} else {
+							i++;
+						}
+						if (places.containsKey(i)) {
+							VotingPluginUser user = entry.getKey().getUser();
+							user.dontCache();
+							if (!plugin.getConfigFile().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
+
 								user.giveWeeklyTopVoterAward(i, places.get(i));
 							}
 						}
@@ -394,7 +415,7 @@ public class TopVoterHandler implements Listener {
 			}
 
 			// give time for other servers to catch up
-			if (plugin.getBungeeSettings().isUseBungeecoord() && !plugin.getTopVoterHandler().bungeeHandleResets()) {
+			if (!plugin.getTopVoterHandler().bungeeHandleResets()) {
 				plugin.debug("Delaying time change 10 seconds for other servers to catchup");
 				try {
 					Thread.sleep(10000);
@@ -500,8 +521,15 @@ public class TopVoterHandler implements Listener {
 		file.setup();
 		file.header("Saving top voters for " + top.toString() + ", file also contains other top voter info as backup");
 		for (TopVoter cTop : TopVoter.values()) {
+			ArrayList<String> topVoters = new ArrayList<String>();
+			int cTotal = 0;
+			ArrayList<Integer> nums = plugin.getMysql().getNumbersInColumn(cTop.getColumnName());
+			for (Integer num : nums) {
+				cTotal += num.intValue();
+			}
+			topVoters.add("Combined total: " + cTotal);
 			if (plugin.getTopVoter().containsKey(cTop)) {
-				ArrayList<String> topVoters = new ArrayList<String>();
+
 				int count = 1;
 				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(cTop).entrySet()) {
 					topVoters.add(count + ": " + entry.getKey().getPlayerName() + ": " + entry.getValue());

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

@@ -55,6 +55,8 @@ public class UserManager {
 		manager.addKey(new UserDataKeyInt("HighestMonthlyTotal"));
 		manager.addKey(new UserDataKeyInt("HighestWeeklyTotal"));
 		manager.addKey(new UserDataKeyInt("LastMonthTotal"));
+		manager.addKey(new UserDataKeyInt("LastWeeklyTotal"));
+		manager.addKey(new UserDataKeyInt("LastDailyTotal"));
 		manager.addKey(new UserDataKeyInt("BestMonthVoteStreak"));
 		if (plugin.getOptions().isPerServerRewards()) {
 			manager.addKey(new UserDataKeyString("OfflineRewards" + plugin.getOptions().getServer())
@@ -63,6 +65,7 @@ public class UserManager {
 		if (plugin.getConfigFile().isExtraAllSitesCheck()) {
 			manager.addKey(new UserDataKeyInt(getGottenAllSitesDayPath()));
 		}
+		manager.addKey(new UserDataKeyInt(getGottenAlmostAllSitesDayPath()));
 	}
 
 	public String getGottenAllSitesDayPath() {
@@ -97,7 +100,7 @@ public class UserManager {
 	}
 
 	public VotingPluginUser getVotingPluginUser(Player player) {
-		return getVotingPluginUser(player.getName());
+		return getVotingPluginUser(player.getUniqueId(), player.getName());
 	}
 
 	@SuppressWarnings("deprecation")

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

@@ -171,6 +171,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			voteEvent.setBungeeTextTotals(text);
 			voteEvent.setVotingPluginUser(this);
 			plugin.getServer().getPluginManager().callEvent(voteEvent);
+
 		}
 	}
 
@@ -186,12 +187,14 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			voteEvent.setBungeeTextTotals(text);
 			voteEvent.setVotingPluginUser(this);
 			plugin.getServer().getPluginManager().callEvent(voteEvent);
+
 		}
 	}
 
 	public void bungeeVotePluginMessaging(String service, long time, BungeeMessageData text, boolean setTotals,
 			boolean wasOnline, boolean broadcast, int num) {
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
+
 			plugin.debug("Pluginmessaging vote for " + getPlayerName() + " on " + service);
 
 			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service, true), getPlayerName(), service,
@@ -206,6 +209,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			voteEvent.setBroadcast(broadcast);
 			voteEvent.setVoteNumber(num);
 			plugin.getServer().getPluginManager().callEvent(voteEvent);
+
 		}
 	}
 
@@ -693,11 +697,15 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	}
 
 	public void loginRewards() {
-		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(), "LoginRewards").send(this);
+		if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(), "LoginRewards")) {
+			new RewardBuilder(plugin.getSpecialRewardsConfig().getData(), "LoginRewards").send(this);
+		}
 	}
 
 	public void logoutRewards() {
-		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(), "LogoutRewards").send(this);
+		if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(), "LogoutRewards")) {
+			new RewardBuilder(plugin.getSpecialRewardsConfig().getData(), "LogoutRewards").send(this);
+		}
 	}
 
 	/**
@@ -711,7 +719,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 
 		Player player = getPlayer();
 		if (player != null) {
-			plugin.extraDebug("Checking offline vote site votes for " + player.getName());
+			plugin.extraDebug("Checking offline votes for " + player.getName());
 
 			boolean topVoterIngorePerm = player.hasPermission("VotingPlugin.TopVoter.Ignore");
 			if (isTopVoterIgnore() != topVoterIngorePerm) {

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

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

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

@@ -73,7 +73,9 @@ public class VoteReminding {
 					if (plugin != null && plugin.isEnabled()) {
 						for (Player player : Bukkit.getServer().getOnlinePlayers()) {
 							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-							checkRemind(user);
+							if (!plugin.getOptions().isTreatVanishAsOffline() || !user.isVanished()) {
+								checkRemind(user);
+							}
 						}
 					} else {
 						timer.shutdown();