Update version number to 6.13

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,8 +62,49 @@ Server: PleaseSet
 # Can edit via /av gui
 BungeeVotePartyRewards: {}
 
-# -----------------------------
-# For socket setup below only
-# -----------------------------
+# 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
+# This will create a different table then from users storing server info to process
+#
+# If you use this you need to enable this on BungeeSettings.yml on each server with votingplugin
+# Make sure server name is set correctly in BungeeSettings.yml or this will not work correctly
+# 
+# Please use PLUGINMESSAGING for this, SOCKETS should work as well, but not fully tested
+#
+# This will make votes cache until time change has finished processing
+# In the event a server is offline or time change fails, the time change process
+# will continue after a set amount of time (in essense skipping a specific server)
+# This will also respect blocked servers in bungeeconfig.yml
+GlobalData:
+  Enabled: false
+  # Use existing mysql connection from config.yml
+  UseMainMySQL: true
+  # Mysql settings only used if above is false
+  Host: ''
+  # Default port is 3306
+  Port: 3306 
+  Database: ''
+  Username: ''
+  Password: ''
+  # Max number of connections
+  MaxConnections: 1
+  # Must be the same on all servers
+  Prefix: ''
+  #UseSSL: true
+  #PublicKeyRetrieval: false
+  #Attempt to use mariadb driver
+  #UseMariaDB: false
+
+##########################################
+# 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,10 +4,13 @@
 # https://github.com/BenCodez/VotingPlugin/wiki
 # Config is sorted in sections
 # Use Control + F to search with Notepad++
-# 
+
+
+###########################################
+# User storage
+###########################################
 # Valid Options:
 # - SQLITE 
-# - FLAT
 # - MYSQL
 DataStorage: SQLITE
 
@@ -33,22 +36,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 +82,9 @@ VoteReminding:
       Message: '&cRemember to vote'
       Delay: 30
     
-# ------------------------------------------------
-# Format
-# ------------------------------------------------
+###########################################
+# Format options
+###########################################
     
 # Common PlacesHolders:
 # Special PlaceHolders will be commented where available
@@ -109,7 +100,11 @@ Format:
 
   # Broadcast vote message
   # Set to an empty message to disable
+  # Use %NewLine% for a new line
   BroadcastMsg: '&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %SiteName%'
+  # If true uses broadcast setting below for offline votes
+  OnlyOneOfflineBroadcast: false
+  OfflineBroadcast: '&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %numberofvotes% times!'
   
   # Broadcast only when player is online
   BroadcastWhenOnline: false
@@ -117,6 +112,8 @@ Format:
   # Broadcast every x number of minutes with number of players that voted
   AlternateBroadcast:
     Enabled: false
+    # Use %players% for all players names
+    # Use %numberofplayers% for number of players that voted
     Broadcast: '&6[&4Broadcast&6] &2%numberofplayers% voted in the last half hour! /vote'
     # Delay in minutes
     Delay: 30
@@ -299,6 +296,7 @@ Format:
   # Shop messages when using the /vote shop
   ShopPurchase: '&aYou bought the %Identifier% for %Points% Points!'
   ShopFailed: '&cYou do not have %Points% points to purchase this!'
+  ShopNotPurchasable: '&cThis item is not buyable!'
   
   # User not exist message, from commands such as /vote next (player)
   UserNotExist: '&cUser does not exist: %player%'
@@ -323,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
@@ -363,131 +369,13 @@ MaxiumNumberOfTopVotersToLoad: 1000
 StoreTopVoters:
   Weekly: false
   Daily: false
-    
-# ------------------------------------------------
-# Advanced
-# Most of these values can be left untouched for most setups
-# ------------------------------------------------
-
-# 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
-
-# Delays login event, delays vote reminding and more
-# In ticks
-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
-
-# 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
-
-# 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
-
-# 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
-
-######################
+###########################################
 # Debug
-######################
+###########################################
 
 # Debug levels:
 # NONE
@@ -509,16 +397,79 @@ 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
+
+# Custom placeholder returns
+# For the example below use %votingplugin_custom_enoughpoints_5%
+# DO NOT USE ON MAIN THREAD IF POSSIBLE
+# Keep everything lowercase
+#CustomPlaceholderReturns:
+#  'enoughpoints_5':
+#    'true': 'User has enough points'
+#    'false': 'User does not have enough points'
+
+###########################################
+# 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
@@ -529,55 +480,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
@@ -589,10 +542,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
@@ -604,14 +600,67 @@ 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
 
+##########################################
+# 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
@@ -619,12 +668,32 @@ 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
+
+# This will close GUI's if you shift click them rather than a regular
+# This can help prevent exploits
+CloseGUIOnShiftClick: false
+
+###########################################
+# 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
@@ -635,9 +704,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
@@ -138,9 +139,14 @@ CHEST:
     # %time% = time, using timeformat below
     # %timesince% = time since vote
     Line: '&6%timeSince%'
+    ClickableLinks: true
   VoteNext:
     Name: 'VoteNext: %player%'
     BackButton: true
+    # Extra customization for displaying site names in GUI only
+    #CustomSiteNamesDisplays:
+    #  Site1: site name display
+    LoreLine: '%time%'
   VoteToday:
     Name: 'VoteToday'
     Line: '&6%VoteSite% : %Time%'
@@ -160,11 +166,17 @@ CHEST:
       Lore: '&3&lVotes: &3%votes%'
     # Opens main GUI of the specific player that gets clicked
     OpenMainGUIOnClick: true
+    # Close GUI when clicking on a player item
+    CloseGUIOnClick: true
     SwitchItem:
       Name: '&3Switch TopVoter'
       Lore: '&bCurrently: %Top%'
       Material: 'OAK_SIGN'
       Amount: 1
+      # Top voters for the switch item to use
+      #TopVoters:
+      #- ALLTIME
+      #- MONTHLY
       # 8 Slots over from the bottom left
       # Bottom of GUI
       Slot: 7
@@ -175,6 +187,15 @@ CHEST:
     # Item for player in GUI if use skull is false
     PlayerItem:
       Material: 'PAPER'
+    Customization:
+      Enabled: false
+      # List of slots for top voter
+      PlayerSlots: []
+      # Add extra items
+      ExtraItems: {}
+      RemoveBottomBar: false
+      # Set slot for backbutton
+      BackButtonSlot: 0
   VoteTotal:
     Name: 'VoteTotal: %player%'
     BackButton: true
@@ -277,6 +298,8 @@ CHEST:
     OpenVoteURL: false
     # If true, backbutton will be the last slot of the GUI
     EndOfGUI: false
+    # If true, this item will become an exit button instead
+    Exit: false
 
   VoteShopBackButton: true
   VoteShopEnabled: true
@@ -286,6 +309,10 @@ CHEST:
   VoteShopLimitReached: '&aYou reached your limit'
   VoteShopRequireConfirmation: false
   VoteShopDisabled: '&cVote shop disabled'
+  # VoteShop extra items for display only
+  #VoteShopExtraItems:
+    #Item:
+      #...
   Shop:
     # Identifier
     # Used in placeholders for formats

VotingPlugin/Resources/SpecialRewards.yml

@@ -13,10 +13,17 @@ 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!'
+    
+# Give a reward for voting on all sites minus 1
+# Similar to allsites
+#AlmostAllSites:
+#  Messages:
+#    Player: '&aYou almost voted on all sites in 1 day!'
 
 
 # If true only cumulative reward at a time can be given
@@ -33,7 +40,7 @@ Cumulative:
   # Can have multiple listed here
   '20':
     Enabled: false
-    # Wether or not votes must be made in same day/week
+    # Whether or not votes must be made in same day/week
     # Useful if you want to require a certain number of voting sites to be voted on
     # for a daily/weekly reward instead of all of them
     # Valid options
@@ -42,6 +49,11 @@ Cumulative:
     # Weekly
     # Daily
     TotalToUse: AllTime
+    # Blacklist recurring votes
+    #BlackList:
+    #- 40
+    # Whether or not to gives cumulative reward for every x number of votes, default: true
+    #Recurring: true
     Rewards: 
       Messages:
         Player: '&aYou got %cumulative% cumulative votes!'
@@ -69,6 +81,8 @@ VoteParty:
   ResetMonthly: false
   # If true, will give voteparty only once per day
   OnlyOncePerDay: false
+  # If true, will give voteparty once per week only
+  OnlyOncePerWeek: false
   # Reset extra votes
   ResetExtraVotesMonthly: false
   # Count votes from /av vote?
@@ -81,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
@@ -60,6 +61,12 @@ VoteSites:
     DisplayItem:
       Material: 'DIAMOND'
       Amount: 1
+      
+    # Reward to run when cooldown ends for this votesite
+    # Enable PerSiteCoolDownEvents in Config.yml to use this
+    #CoolDownEndRewards:
+    #  Messages:
+    #    Player: '&aTime to go vote on site1'
 
     # Rewards to give
     # https://github.com/BenCodez/AdvancedCore/wiki/Rewards

VotingPlugin/Resources/bungeeconfig.yml

@@ -12,12 +12,59 @@ Password: ''
 # Max number of connections
 MaxConnections: 1
 # Table name prefix, for use with mutliple servers
+# Don't use with PLUGINMESSAGING bungee setup
 Prefix: ''
 #UseSSL: true
 #PublicKeyRetrieval: false
 #Attempt to use mariadb driver
 #UseMariaDB: false
 
+# Online mode for UUIDS
+# Offline mode setups are not fully tested and are not supported currently
+OnlineMode: true
+
+
+####################################################################################
+# Global mysql data handle for between server commmunications
+# This is NOT required for bungee voting to work
+# This is still a WIP, use with caution
+# This will create a different table then from users storing server info to process
+#
+# If you use this you need to enable this on BungeeSettings.yml on each server with votingplugin
+# Make sure server name is set correctly in BungeeSettings.yml or this will not work correctly
+# 
+# Please use PLUGINMESSAGING for this, SOCKETS should work as well, but not fully tested
+#
+# This will make votes cache until time change has finished processing
+# In the event a server is offline or time change fails, the time change process
+# will continue after a set amount of time (in essense skipping a specific server)
+# This will also respect blocked servers
+GlobalData:
+  Enabled: false
+  # Use existing connection above
+  UseMainMySQL: true
+  # Mysql settings only used if above is false
+  Host: ''
+  # Default port is 3306
+  Port: 3306 
+  Database: ''
+  Username: ''
+  Password: ''
+  # Max number of connections
+  MaxConnections: 1
+  # Must be the same on all servers
+  Prefix: ''
+  #UseSSL: true
+  #PublicKeyRetrieval: false
+  #Attempt to use mariadb driver
+  #UseMariaDB: false
+  
+# Time offset for time changes
+# Must match on all servers
+TimeHourOffSet: 0
+
+####################################################################################
+
 Debug: false
 # Have a reward on each server
 # If false, will send to online server only
@@ -27,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
 
@@ -46,18 +98,20 @@ 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
 
-# Support for redis
-# experimental
-RedisSupport: false
-
 # Tell servers to broadcast
 # Set DisableBroadcast to true on spigot servers (BungeeSettings.yml) as well
 Broadcast: true
 
+# Geyser settings
+# This may or may not work
+# Does not work on velocity currently
+GeyserSupport: false
+GeyserPrefix: '.'
+
 VoteParty:
   # If enabled, will trigger vote party reward 
   # in BungeeSettings.yml under BungeeVotePartyReward
@@ -77,17 +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
+
+##########################################
+# 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
+MultiProxySupport: false
+
+# Enable on primary proxy server with votifier
+PrimaryServer: false
+
+# 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
+
+# Set other sub proxies here
+MultiProxyServers:
+  secondproxy:
+    Host: 0.0.0.0
+    Port: 1235

VotingPlugin/Resources/plugin.yml

@@ -1,257 +1,270 @@
-name: ${project.name}
-version: ${project.version}
-main: com.bencodez.votingplugin.VotingPluginMain
-description: Highly Customizable Voting Listener!
-website: https://www.spigotmc.org/resources/votingplugin.15358/
-author: BenCodez
-softdepend: [MVdWPlaceholders, Votifier, VotifierPlus, NuVotifier, CMI, Vault, PlaceholderAPI, ProtocolLib, MVdWPlaceholderAPI, AuthMe, SuperVanish, PremiumVanish]
-loadbefore: [MCPerks]
-api-version: 1.13
-libraries:
-  - org.openjdk.nashorn:nashorn-core:15.3
-commands:
-  vote:
-    description: Vote command
-  adminvote:
-    description: Admin commands for VotingPlugin
-  av:
-    description: Admin commands for VotingPlugin
-  votehelp:
-    description: See access to a list of commands, Formated in Format.yml
-    aliases: vhelp
-  votetotal:
-    description: See totals of votes
-    aliases: vtotal
-  votelast:
-    description: See the last time you voted
-    aliases: vlast
-  votenext:
-    description: See when you can vote next
-    aliases: vnext
-  votetop:
-    description: See top voters
-    aliases: vtop
-  votetoday:
-    description: See who voted today
-    aliases: vtoday
-  votegui:
-    description: Open VoteGUI
-    aliases: vgui
-  voteurl:
-    description: Open VoteURL
-    aliases: vurl
-  votereward:
-    description: Open VoteReward GUI
-    aliases: vreward
-  vote?:
-    description: View Help
-    aliases: v?
-  voteparty:
-    description: A command
-    aliases: vparty
-  voteshop:
-    description: A command
-    aliases: vshop
-  votebest:
-    description: A command
-    aliases: vbest
-  votestreak:
-    description: A command
-    aliases: vstreak
-  votetogglebroadcast:
-    description: A command
-    aliases: vtogglebroadcast
-  votepoints:
-    description: A command
-    aliases: vpoints
-  votetogglereminders:
-    aliases: [vtogglereminder,vtoggle]
-  votelist:
-    description: A command
-    aliases: vlist
-  voteall:
-    description: A command
-    aliases: vall
-  votechoices:
-    description: A command
-    alaises: vchoices
-  votegivepoints:
-    description: A command
-    alaises: vgivepoints
-  adminvotehelp:
-    description: Open adminvote help
-    aliases: avhelp
-  adminvote?:
-    description: Open adminvote help
-    aliases: av?
-  adminvotereport:
-    description: Command Alias
-    aliases: avreport
-  adminvoteperms:
-    description: Command Alias
-    aliases: avperms
-  adminvotereload:
-    description: Command Alias
-    aliases: avreload
-  adminvotetestreward:
-    description: Command Alias
-    aliases: avtestreward
-  adminvoteversion:
-    description: Command Alias
-    aliases: avversion
-  adminvotesites:
-    description: Command Alias
-    aliases: avsites
-  adminvoterewards:
-    description: Command Alias
-    aliases: avrewards
-  adminvoteuuid:
-    description: Command Alias
-    aliases: avuuid
-  adminvotevotesite:
-    description: Command Alias
-    aliases: avvotesite
-  adminvoteconfig:
-    description: Command Alias
-    aliases: avconfig
-  adminvoteupdatecheck:
-    description: Command Alias
-    aliases: avupdatecheck
-  adminvotevote:
-    description: Command Alias
-    aliases: [avvote, fakevote]
-  adminvotegui:
-    description: Command Alias
-    aliases: avgui
-  adminvotegivereward:
-    description: Command Alias
-    aliases: avgivereward
-  adminvoteConvertFromData:
-    description: Command Alias
-    aliases: avConvertFromData
-  adminvoteConvertToData:
-    description: Command Alias
-    aliases: avConvertFromData
-  adminvoteClearTotal:
-    description: Command Alias
-  adminvoteBackgroundUpdate:
-    description: Command Alias
-    aliases: avBackgroundUpdate
-  adminvoteClearCache:
-    description: Command Alias
-    aliases: avClearCache
-  adminvoteServiceSites:
-    description: Command Alias
-    aliases: avServiceSites
-  adminvoteVoteParty:
-    description: Command Alias
-    aliases: avVoteParty
-  adminvoteChoices:
-    description: Command Alias
-    aliases: avChoices
-  adminvoteReloadAll:
-    description: Command Alias
-    aliases: avReloadAll
-  adminvotePermsPlayer:
-    description: Command Alias
-    aliases: avPermsPlayer
-  adminvoteResyncMilestonesAlreadyGiven:
-    description: Command Alias
-    aliases: avResyncMilestonesAlreadyGiven
-  voteSetPrimaryAccount:
-    description: Command Alias
-  adminvoteClearOfflineVotes:
-    description: Command Alias
-    aliases: avClearOfflineVotes
-  adminvoteGiveAll:
-    description: Command Alias
-    aliases: avGiveAll
-  adminvoteGiveAllOnline:
-    description: Command Alias
-    aliases: avGiveAllOnline
-  adminvoteForceTimeChanged:
-    description: Command Alias
-    aliases: avForceTimeChanged
-  adminvoteplayername:
-    description: Command Alias
-    aliases: avplayername
-  adminvoteResyncMilestones:
-    description: Command Alias
-    aliases: avResyncMilestones
-  adminvoteClearOfflineRewards:
-    description: Command Alias
-    aliases: avClearOfflineRewards
-  adminvoteUserRemove:
-    description: Command Alias
-    aliases: avUserRemove
-  adminvotePurge:
-    description: Command Alias
-    aliases: avPurge
-  adminvoteJavascript:
-    description: Command Alias
-    aliases: avJavascript
-  adminvoteStatus:
-    description: Command Alias
-    aliases: avStatus
-  adminvoteTest:
-    description: Command Alias
-    aliases: avTest
-  adminvotePlaceholders:
-    description: Command Alias
-    aliases: avPlaceholders
-  adminvoteDownloadJenkins:
-    description: Command Alias
-    aliases: avDownloadJenkins
-  adminvoteSetRequestMethod:
-    description: Command Alias
-    aliases: avSetRequestMethod
-  adminvoteUser:
-    description: Command Alias
-    aliases: avUser
-  adminvoteCurrentPluginTime:
-    description: Command Alias
-    aliases: avCurrentPluginTime
-  adminvoteResetPoints:
-    description: Command Alias
-    aliases: avResetPoints
-  adminvoteRunCMD:
-    description: Command Alias
-    aliases: avRunCMD
-  adminvoteuseruuidremove:
-    description: Command Alias
-    aliases: avuseruuidremove
-  adminvoteedit:
-    description: Command Alias
-    aliases: avedit
-  adminvoteResetMilestoneCount:
-    description: Command Alias
-    aliases: avResetMilestoneCount
-permissions:
-  VotingPlugin.Player:
-    description: Allows basic access player commands
-  VotingPlugin.Mod:
-    description: Allows mod commands
-  VotingPlugin.Admin:
-    description: Allows admincommands
-  VotingPlugin.Login.RemindVotes:
-    description: Allows players to get remined on login if they can vote
-    default: true
-  VotingPlugin.Admin.Debug:
-    description: Permission to view debug info ingame
-  VotingPlugin.Signs.Create:
-    description: Allows access to create signs
-  VotingPlugin.TopVoter.Ignore:
-    description: Allows you to be exempt from top voter
-  VotingPlugin.NoRemind:
-    description: Ignore vote reminding
-    default: false
-  VotingPlugin.Sign.Create:
-    description: Permission to create sign
-  VotingPlugin.Admin.GenerateServiceSite:
-    description: Permission for generating votesite message
-  VotingPlugin.Login.RemindVotes:
-    description: Permission to allow timed reminders
-  VotingPlugin.Login.RemindVotes.All:
-    description: Remind if player can vote on all votesites, rather than any
-    default: false
-  
+name: ${project.name}
+version: ${project.version}
+main: com.bencodez.votingplugin.VotingPluginMain
+description: Highly Customizable Voting Listener!
+website: https://www.spigotmc.org/resources/votingplugin.15358/
+author: BenCodez
+softdepend:
+- MVdWPlaceholders
+- Votifier
+- VotifierPlus
+- NuVotifier
+- Vault
+- PlaceholderAPI
+- ProtocolLib
+- MVdWPlaceholderAPI
+- AuthMe
+- SuperVanish
+- PremiumVanish
+- DiscordSRV
+loadbefore:
+- MCPerks
+api-version: 1.13
+libraries:
+- org.openjdk.nashorn:nashorn-core:15.3
+commands:
+  vote:
+    description: Vote command
+  adminvote:
+    description: Admin commands for VotingPlugin
+  av:
+    description: Admin commands for VotingPlugin
+  votehelp:
+    description: See access to a list of commands, Formated in Format.yml
+    aliases: vhelp
+  votetotal:
+    description: See totals of votes
+    aliases: vtotal
+  votelast:
+    description: See the last time you voted
+    aliases: vlast
+  votenext:
+    description: See when you can vote next
+    aliases: vnext
+  votetop:
+    description: See top voters
+    aliases: vtop
+  votetoday:
+    description: See who voted today
+    aliases: vtoday
+  votegui:
+    description: Open VoteGUI
+    aliases: vgui
+  voteurl:
+    description: Open VoteURL
+    aliases: vurl
+  votereward:
+    description: Open VoteReward GUI
+    aliases: vreward
+  vote?:
+    description: View Help
+    aliases: v?
+  voteparty:
+    description: A command
+    aliases: vparty
+  voteshop:
+    description: A command
+    aliases: vshop
+  votebest:
+    description: A command
+    aliases: vbest
+  votestreak:
+    description: A command
+    aliases: vstreak
+  votetogglebroadcast:
+    description: A command
+    aliases: vtogglebroadcast
+  votepoints:
+    description: A command
+    aliases: vpoints
+  votetogglereminders:
+    aliases:
+    - vtogglereminder
+    - vtoggle
+  votelist:
+    description: A command
+    aliases: vlist
+  voteall:
+    description: A command
+    aliases: vall
+  votechoices:
+    description: A command
+    alaises: vchoices
+  votegivepoints:
+    description: A command
+    alaises: vgivepoints
+  adminvotehelp:
+    description: Open adminvote help
+    aliases: avhelp
+  adminvote?:
+    description: Open adminvote help
+    aliases: av?
+  adminvotereport:
+    description: Command Alias
+    aliases: avreport
+  adminvoteperms:
+    description: Command Alias
+    aliases: avperms
+  adminvotereload:
+    description: Command Alias
+    aliases: avreload
+  adminvotetestreward:
+    description: Command Alias
+    aliases: avtestreward
+  adminvoteversion:
+    description: Command Alias
+    aliases: avversion
+  adminvotesites:
+    description: Command Alias
+    aliases: avsites
+  adminvoterewards:
+    description: Command Alias
+    aliases: avrewards
+  adminvoteuuid:
+    description: Command Alias
+    aliases: avuuid
+  adminvotevotesite:
+    description: Command Alias
+    aliases: avvotesite
+  adminvoteconfig:
+    description: Command Alias
+    aliases: avconfig
+  adminvoteupdatecheck:
+    description: Command Alias
+    aliases: avupdatecheck
+  adminvotevote:
+    description: Command Alias
+    aliases:
+    - avvote
+    - fakevote
+  adminvotegui:
+    description: Command Alias
+    aliases: avgui
+  adminvotegivereward:
+    description: Command Alias
+    aliases: avgivereward
+  adminvoteConvertFromData:
+    description: Command Alias
+    aliases: avConvertFromData
+  adminvoteConvertToData:
+    description: Command Alias
+    aliases: avConvertFromData
+  adminvoteClearTotal:
+    description: Command Alias
+  adminvoteBackgroundUpdate:
+    description: Command Alias
+    aliases: avBackgroundUpdate
+  adminvoteClearCache:
+    description: Command Alias
+    aliases: avClearCache
+  adminvoteServiceSites:
+    description: Command Alias
+    aliases: avServiceSites
+  adminvoteVoteParty:
+    description: Command Alias
+    aliases: avVoteParty
+  adminvoteChoices:
+    description: Command Alias
+    aliases: avChoices
+  adminvoteReloadAll:
+    description: Command Alias
+    aliases: avReloadAll
+  adminvotePermsPlayer:
+    description: Command Alias
+    aliases: avPermsPlayer
+  adminvoteResyncMilestonesAlreadyGiven:
+    description: Command Alias
+    aliases: avResyncMilestonesAlreadyGiven
+  voteSetPrimaryAccount:
+    description: Command Alias
+  adminvoteClearOfflineVotes:
+    description: Command Alias
+    aliases: avClearOfflineVotes
+  adminvoteGiveAll:
+    description: Command Alias
+    aliases: avGiveAll
+  adminvoteGiveAllOnline:
+    description: Command Alias
+    aliases: avGiveAllOnline
+  adminvoteForceTimeChanged:
+    description: Command Alias
+    aliases: avForceTimeChanged
+  adminvoteplayername:
+    description: Command Alias
+    aliases: avplayername
+  adminvoteResyncMilestones:
+    description: Command Alias
+    aliases: avResyncMilestones
+  adminvoteClearOfflineRewards:
+    description: Command Alias
+    aliases: avClearOfflineRewards
+  adminvoteUserRemove:
+    description: Command Alias
+    aliases: avUserRemove
+  adminvotePurge:
+    description: Command Alias
+    aliases: avPurge
+  adminvoteJavascript:
+    description: Command Alias
+    aliases: avJavascript
+  adminvoteStatus:
+    description: Command Alias
+    aliases: avStatus
+  adminvoteTest:
+    description: Command Alias
+    aliases: avTest
+  adminvotePlaceholders:
+    description: Command Alias
+    aliases: avPlaceholders
+  adminvoteDownloadJenkins:
+    description: Command Alias
+    aliases: avDownloadJenkins
+  adminvoteSetRequestMethod:
+    description: Command Alias
+    aliases: avSetRequestMethod
+  adminvoteUser:
+    description: Command Alias
+    aliases: avUser
+  adminvoteCurrentPluginTime:
+    description: Command Alias
+    aliases: avCurrentPluginTime
+  adminvoteResetPoints:
+    description: Command Alias
+    aliases: avResetPoints
+  adminvoteRunCMD:
+    description: Command Alias
+    aliases: avRunCMD
+  adminvoteuseruuidremove:
+    description: Command Alias
+    aliases: avuseruuidremove
+  adminvoteedit:
+    description: Command Alias
+    aliases: avedit
+  adminvoteResetMilestoneCount:
+    description: Command Alias
+    aliases: avResetMilestoneCount
+permissions:
+  VotingPlugin.Player:
+    description: Allows basic access player commands
+  VotingPlugin.Mod:
+    description: Allows mod commands
+  VotingPlugin.Admin:
+    description: Allows admincommands
+  VotingPlugin.Admin.Debug:
+    description: Permission to view debug info ingame
+  VotingPlugin.Signs.Create:
+    description: Allows access to create signs
+  VotingPlugin.TopVoter.Ignore:
+    description: Allows you to be exempt from top voter
+  VotingPlugin.NoRemind:
+    description: Ignore vote reminding
+    default: false
+  VotingPlugin.Sign.Create:
+    description: Permission to create sign
+  VotingPlugin.Admin.GenerateServiceSite:
+    description: Permission for generating votesite message
+  VotingPlugin.Login.RemindVotes:
+    description: Permission to allow timed reminders
+  VotingPlugin.Login.RemindVotes.All:
+    description: Remind if player can vote on all votesites, rather than any
+    default: false

VotingPlugin/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>votingplugin</artifactId>
-	<version>6.8.4</version>
+	<version>6.13</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.18.2-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

@@ -1,18 +1,29 @@
 package com.bencodez.votingplugin;
 
 import java.io.File;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
 import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.misc.encryption.EncryptionHandler;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
-import com.bencodez.advancedcore.api.time.events.DateChangedEvent;
+import com.bencodez.advancedcore.api.time.TimeType;
+import com.bencodez.advancedcore.api.user.UserStorage;
+import com.bencodez.advancedcore.api.user.usercache.value.DataValue;
+import com.bencodez.advancedcore.api.user.usercache.value.DataValueBoolean;
+import com.bencodez.advancedcore.api.user.userstorage.mysql.api.config.MysqlConfigSpigot;
+import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalDataHandler;
+import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalMySQL;
 import com.bencodez.advancedcore.bungeeapi.pluginmessage.PluginMessageHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.ClientHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
@@ -46,22 +57,199 @@ public class BungeeHandler implements Listener {
 	@Getter
 	private SocketHandler socketHandler;
 
+	private GlobalDataHandler globalDataHandler;
+
+	@Getter
+	private ScheduledExecutorService timer;
+
 	public BungeeHandler(VotingPluginMain plugin) {
 		this.plugin = plugin;
+
 	}
 
 	public void close() {
-		socketHandler.closeConnection();
-		clientHandler.stopConnection();
+		if (socketHandler != null) {
+			socketHandler.closeConnection();
+		}
+		if (clientHandler != null) {
+			clientHandler.stopConnection();
+		}
 		plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
 		plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
+		if (globalDataHandler != null) {
+			globalDataHandler.getGlobalMysql().close();
+		}
 	}
 
-	@EventHandler
-	public void onDateChange(DateChangedEvent event) {
-		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-			plugin.getPluginMessaging().sendPluginMessage("timeupdate", plugin.getServerDataFile().getPrevMonth() + "//"
-					+ plugin.getServerDataFile().getPrevDay() + "//" + plugin.getServerDataFile().getPrevWeekDay());
+	/*
+	 * @EventHandler public void onDateChange(DateChangedEvent event) { if
+	 * (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+	 * plugin.getPluginMessaging().sendPluginMessage("timeupdate",
+	 * plugin.getServerDataFile().getPrevMonth() + "//" +
+	 * plugin.getServerDataFile().getPrevDay() + "//" +
+	 * plugin.getServerDataFile().getPrevWeekDay()); } }
+	 */
+
+	public void checkGlobalData() {
+		HashMap<String, DataValue> data = globalDataHandler.getExact(plugin.getBungeeSettings().getServer());
+		// plugin.debug(data.toString());
+
+		if (data.containsKey("ForceUpdate")) {
+			boolean b = checkGlobalDataTimeValue(data.get("ForceUpdate"));
+			if (b) {
+				if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
+					plugin.getMysql().clearCacheBasic();
+				}
+				plugin.getUserManager().getDataManager().clearCache();
+				plugin.setUpdate(true);
+				plugin.update();
+				globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), "ForceUpdate", false);
+			}
+		}
+
+		boolean forceUpdate = false;
+
+		if (checkGlobalDataTime(TimeType.MONTH, data)) {
+			forceUpdate = true;
+		}
+		if (checkGlobalDataTime(TimeType.WEEK, data)) {
+			forceUpdate = true;
+		}
+		if (checkGlobalDataTime(TimeType.DAY, data)) {
+			forceUpdate = true;
+		}
+
+		if (forceUpdate) {
+			HashMap<String, DataValue> dataToSet = new HashMap<String, DataValue>();
+			dataToSet.put("FinishedProcessing", new DataValueBoolean(true));
+			dataToSet.put("Processing", new DataValueBoolean(false));
+			globalDataHandler.setData(plugin.getBungeeSettings().getServer(), dataToSet);
+		}
+	}
+
+	public boolean checkGlobalDataTimeValue(DataValue data) {
+		if (data.isBoolean()) {
+			return data.getBoolean();
+		}
+		return Boolean.valueOf(data.getString());
+	}
+
+	public boolean checkGlobalDataTime(TimeType type, HashMap<String, DataValue> data) {
+		boolean isProcessing = false;
+		if (data.containsKey(type.toString())) {
+
+			DataValue value = data.get(type.toString());
+			boolean b = checkGlobalDataTimeValue(value);
+			if (b) {
+				long lastUpdated = Long.valueOf(data.get("LastUpdated").getString()).longValue();
+				plugin.debug("LastUpdated: " + lastUpdated);
+				if (LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli() - lastUpdated > 1000 * 60 * 60
+						* 1) {
+					plugin.getLogger().warning("Ignore bungee time change since it was more than 1 hour ago");
+					return false;
+				}
+
+				globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), "Processing", true);
+				isProcessing = true;
+
+				plugin.debug("Detected time change from bungee: " + type.toString());
+				plugin.getTimeChecker().forceChanged(type, false, true, true);
+				globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), type.toString(), false);
+			}
+		}
+		return isProcessing;
+	}
+
+	public void loadGlobalMysql() {
+		if (plugin.getBungeeSettings().isGloblalDataEnabled()) {
+			if (timer != null) {
+				timer.shutdown();
+				try {
+					timer.awaitTermination(5, TimeUnit.SECONDS);
+				} catch (InterruptedException e) {
+					e.printStackTrace();
+				}
+				timer.shutdownNow();
+			}
+			timer = Executors.newScheduledThreadPool(1);
+			timer.scheduleWithFixedDelay(new Runnable() {
+
+				@Override
+				public void run() {
+					checkGlobalData();
+				}
+			}, 60, 10, TimeUnit.SECONDS);
+			timer.scheduleWithFixedDelay(new Runnable() {
+
+				@Override
+				public void run() {
+					globalDataHandler.setString(plugin.getBungeeSettings().getServer(), "LastOnline",
+							"" + LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli());
+				}
+			}, 1, 60, TimeUnit.MINUTES);
+			if (globalDataHandler != null) {
+				globalDataHandler.getGlobalMysql().close();
+			}
+			if (plugin.getBungeeSettings().isGloblalDataUseMainMySQL()
+					&& plugin.getStorageType().equals(UserStorage.MYSQL)) {
+				globalDataHandler = new GlobalDataHandler(
+						new GlobalMySQL("VotingPlugin_GlobalData", plugin.getMysql().getMysql()) {
+
+							@Override
+							public void warning(String text) {
+								plugin.getLogger().warning(text);
+							}
+
+							@Override
+							public void severe(String text) {
+								plugin.getLogger().severe(text);
+							}
+
+							@Override
+							public void debug(Exception e) {
+								plugin.debug(e);
+							}
+
+							@Override
+							public void debug(String text) {
+								plugin.debug(text);
+							}
+						});
+			} else {
+				globalDataHandler = new GlobalDataHandler(
+						new GlobalMySQL("VotingPlugin_GlobalData", new MysqlConfigSpigot(
+								plugin.getBungeeSettings().getData().getConfigurationSection("GlobalData"))) {
+
+							@Override
+							public void warning(String text) {
+								plugin.getLogger().warning(text);
+							}
+
+							@Override
+							public void severe(String text) {
+								plugin.getLogger().severe(text);
+							}
+
+							@Override
+							public void debug(Exception e) {
+								plugin.debug(e);
+							}
+
+							@Override
+							public void debug(String text) {
+								plugin.debug(text);
+							}
+						});
+			}
+			globalDataHandler.getGlobalMysql().alterColumnType("IgnoreTime", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("MONTH", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("WEEK", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("DAY", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("FinishedProcessing", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("Processing", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("LastUpdated", "MEDIUMTEXT");
+			globalDataHandler.getGlobalMysql().alterColumnType("ForceUpdate", "VARCHAR(5)");
+			plugin.getTimeChecker().setProcessingEnabled(false);
 		}
 	}
 
@@ -72,6 +260,8 @@ public class BungeeHandler implements Listener {
 
 		plugin.getLogger().info("Using BungeeMethod: " + method.toString());
 
+		loadGlobalMysql();
+
 		if (method.equals(BungeeMethod.MYSQL)) {
 			plugin.registerBungeeChannels("vp:vp");
 		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
@@ -107,10 +297,12 @@ public class BungeeHandler implements Listener {
 						bungeeVotePartyCurrent = text.getVotePartyCurrent();
 						bungeeVotePartyRequired = text.getVotePartyRequired();
 						plugin.getPlaceholders().onBungeeVotePartyUpdate();
+						plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
+						plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
 
 						boolean setTotals = Boolean.valueOf(args.get(7));
 
-						user.clearCache();
+						user.cache();
 
 						boolean broadcast = true;
 						boolean bungeeBroadcast = false;
@@ -119,24 +311,41 @@ public class BungeeHandler implements Listener {
 							bungeeBroadcast = Boolean.valueOf(args.get(9));
 						}
 
+						int num = 1;
+						if (args.size() > 10) {
+							num = Integer.valueOf(args.get(10));
+						}
+						int numberOfVotes = 1;
+						if (args.size() > 11) {
+							numberOfVotes = Integer.valueOf(args.get(11));
+						}
+
 						if (!bungeeBroadcast) {
 							if (!plugin.getBungeeSettings().isBungeeBroadcast()
 									&& !plugin.getBungeeSettings().isDisableBroadcast()) {
 								if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-									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 {
 							broadcast = false;
 						}
 
-						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline, broadcast);
+						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline, broadcast, num);
 						if (plugin.getBungeeSettings().isPerServerPoints()) {
 							user.addPoints(plugin.getConfigFile().getPointsOnVote());
 						}
@@ -169,12 +378,14 @@ public class BungeeHandler implements Listener {
 						bungeeVotePartyCurrent = text.getVotePartyCurrent();
 						bungeeVotePartyRequired = text.getVotePartyRequired();
 						plugin.getPlaceholders().onBungeeVotePartyUpdate();
+						plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
+						plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
 
 						plugin.debug(
 								"pluginmessaging voteonline received from " + player + "/" + uuid + " on " + service);
 						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
 								player);
-						user.clearCache();
+						user.cache();
 
 						if (plugin.getBungeeSettings().isPerServerPoints()) {
 							user.addPoints(plugin.getConfigFile().getPointsOnVote());
@@ -191,25 +402,42 @@ public class BungeeHandler implements Listener {
 							bungeeBroadcast = Boolean.valueOf(args.get(9));
 						}
 
+						int num = 1;
+						if (args.size() > 10) {
+							num = Integer.valueOf(args.get(10));
+						}
+
+						int numberOfVotes = 1;
+						if (args.size() > 11) {
+							numberOfVotes = Integer.valueOf(args.get(11));
+						}
+
 						if (!bungeeBroadcast) {
 							if (!plugin.getBungeeSettings().isBungeeBroadcast()
 									&& !plugin.getBungeeSettings().isDisableBroadcast()) {
-								if (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 {
 							broadcast = false;
 						}
 
-						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline, broadcast);
+						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline, broadcast, num);
 						if (plugin.getBungeeSettings().isPerServerPoints()) {
 							user.addPoints(plugin.getConfigFile().getPointsOnVote());
 						}
@@ -229,19 +457,28 @@ public class BungeeHandler implements Listener {
 					String player = args.get(0);
 					plugin.debug("pluginmessaging voteupdate received for " + player);
 					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(player));
-					user.clearCache();
+					user.cache();
 
 					user.offVote();
 
 					if (args.size() > 2) {
 						bungeeVotePartyCurrent = Integer.parseInt(args.get(1));
 						bungeeVotePartyRequired = Integer.parseInt(args.get(2));
+						plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
+						plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
 					}
 
 					plugin.setUpdate(true);
 				}
 			});
 
+			plugin.getPluginMessaging().add(new PluginMessageHandler("BungeeTimeChange") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					checkGlobalData();
+				}
+			});
+
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteBroadcast") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
@@ -260,6 +497,19 @@ public class BungeeHandler implements Listener {
 				}
 			});
 
+			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteBroadcastOffline") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					if (args.size() > 2) {
+						String uuid = args.get(0);
+						String votes = args.get(2);
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
+								args.get(1));
+						user.offlineBroadcast(user, false, Integer.parseInt(votes));
+					}
+				}
+			});
+
 			plugin.getPluginMessaging().add(new PluginMessageHandler("Status") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
@@ -272,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);
 					}
@@ -295,7 +555,13 @@ public class BungeeHandler implements Listener {
 
 			socketHandler = new SocketHandler(plugin.getVersion(), plugin.getBungeeSettings().getSpigotServerHost(),
 					plugin.getBungeeSettings().getSpigotServerPort(), encryptionHandler,
-					plugin.getBungeeSettings().isBungeeDebug());
+					plugin.getBungeeSettings().isBungeeDebug()) {
+
+				@Override
+				public void log(String str) {
+					plugin.getLogger().info(str);
+				}
+			};
 
 			socketHandler.add(new SocketReceiver("bungeevote") {
 
@@ -311,7 +577,7 @@ public class BungeeHandler implements Listener {
 							user = UserManager.getInstance().getVotingPluginUser(data[2]);
 						}
 
-						user.clearCache();
+						user.cache();
 
 						if (plugin.getBungeeSettings().isPerServerPoints()) {
 							user.addPoints(plugin.getConfigFile().getPointsOnVote());
@@ -322,6 +588,14 @@ public class BungeeHandler implements Listener {
 				}
 			});
 
+			socketHandler.add(new SocketReceiver("BungeeTimeChange") {
+
+				@Override
+				public void onReceive(String[] data) {
+					checkGlobalData();
+				}
+			});
+
 			socketHandler.add(new SocketReceiver("bungeevoteonline") {
 
 				@Override
@@ -336,7 +610,7 @@ public class BungeeHandler implements Listener {
 							user = UserManager.getInstance().getVotingPluginUser(data[2]);
 						}
 
-						user.clearCache();
+						user.cache();
 
 						if (plugin.getBungeeSettings().isPerServerPoints()) {
 							user.addPoints(plugin.getConfigFile().getPointsOnVote());
@@ -347,6 +621,19 @@ public class BungeeHandler implements Listener {
 				}
 			});
 
+			socketHandler.add(new SocketReceiver("BroadcastOffline") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 2) {
+						String votes = data[0];
+						String p = data[1];
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(p);
+						user.offlineBroadcast(user, false, Integer.parseInt(votes));
+					}
+				}
+			});
+
 			socketHandler.add(new SocketReceiver("BungeeBroadcast") {
 
 				@Override
@@ -364,6 +651,23 @@ public class BungeeHandler implements Listener {
 				}
 			});
 
+			socketHandler.add(new SocketReceiver("Broadcast") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 2) {
+						VoteSite site = plugin.getVoteSite(data[1], true);
+						String p = data[2];
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(p);
+						if (site != null) {
+							site.broadcastVote(user, false);
+						} else {
+							plugin.getLogger().warning("No votesite for " + data[1]);
+						}
+					}
+				}
+			});
+
 			socketHandler.add(new SocketReceiver("Status") {
 
 				@Override

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

@@ -2,7 +2,6 @@ package com.bencodez.votingplugin;
 
 import org.bukkit.entity.Player;
 
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInject;
 import com.bencodez.advancedcore.api.rewards.injectedrequirement.RequirementInject;
 import com.bencodez.votingplugin.user.UserManager;
@@ -16,11 +15,11 @@ public class VotingPluginHooks {
 	}
 
 	public void addCustomRequirement(RequirementInject inject) {
-		RewardHandler.getInstance().addInjectedRequirements(inject);
+		getMainClass().getRewardHandler().addInjectedRequirements(inject);
 	}
 
 	public void addCustomReward(RewardInject inject) {
-		RewardHandler.getInstance().addInjectedReward(inject);
+		getMainClass().getRewardHandler().addInjectedReward(inject);
 	}
 
 	public void backgroundUpdate(Player player) {

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

@@ -16,9 +16,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -45,7 +46,6 @@ import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.rewards.DirectlyDefinedReward;
 import com.bencodez.advancedcore.api.rewards.Reward;
 import com.bencodez.advancedcore.api.rewards.RewardEditData;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardPlaceholderHandle;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInject;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInjectConfigurationSection;
@@ -53,6 +53,7 @@ import com.bencodez.advancedcore.api.rewards.injected.RewardInjectInt;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInjectValidator;
 import com.bencodez.advancedcore.api.skull.SkullHandler;
 import com.bencodez.advancedcore.api.updater.Updater;
+import com.bencodez.advancedcore.api.user.userstorage.Column;
 import com.bencodez.advancedcore.logger.Logger;
 import com.bencodez.advancedcore.nms.NMSManager;
 import com.bencodez.votingplugin.broadcast.BroadcastHandler;
@@ -81,6 +82,8 @@ import com.bencodez.votingplugin.placeholders.MVdWPlaceholders;
 import com.bencodez.votingplugin.placeholders.PlaceHolders;
 import com.bencodez.votingplugin.signs.Signs;
 import com.bencodez.votingplugin.specialrewards.SpecialRewards;
+import com.bencodez.votingplugin.test.VoteTester;
+import com.bencodez.votingplugin.timequeue.TimeQueueHandler;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.topvoter.TopVoterHandler;
 import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
@@ -143,6 +146,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	@Getter
 	private PlaceHolders placeholders;
+	
+	@Getter
+	private VoteTester voteTester;
 
 	@Getter
 	private String profile = "";
@@ -208,21 +214,21 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	@Getter
 	private boolean ymlError = false;
-	
+
 	@Getter
-	private Timer voteTimer = new Timer();
+	private ScheduledExecutorService voteTimer;
 
 	@Getter
 	private UserManager votingPluginUserManager;
 
 	private void addDirectlyDefinedRewards(DirectlyDefinedReward directlyDefinedReward) {
-		RewardHandler.getInstance().addDirectlyDefined(directlyDefinedReward);
+		getRewardHandler().addDirectlyDefined(directlyDefinedReward);
 	}
 
 	public void basicBungeeUpdate() {
 		for (Player player : Bukkit.getOnlinePlayers()) {
 			VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-			user.clearCache();
+			user.cache();
 			user.offVote();
 			user.checkOfflineRewards();
 		}
@@ -405,7 +411,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	}
 
 	public void loadDirectlyDefined() {
-		RewardHandler.getInstance().getDirectlyDefinedRewards().clear();
+		getRewardHandler().getDirectlyDefinedRewards().clear();
 		// AllSites reward
 		addDirectlyDefinedRewards(new DirectlyDefinedReward("AllSites") {
 
@@ -430,6 +436,29 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			}
 		});
 
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("AlmostAllSites") {
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+		});
+
 		// FirstVote
 		addDirectlyDefinedRewards(new DirectlyDefinedReward("FirstVote") {
 
@@ -719,6 +748,29 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					getConfigVoteSites().setValue(path, value);
 				}
 			});
+
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteSites." + site.getKey() + ".CoolDownEndRewards") {
+
+				@Override
+				public void createSection(String key) {
+					getConfigVoteSites().createSection(key);
+				}
+
+				@Override
+				public ConfigurationSection getFileData() {
+					return getConfigVoteSites().getData();
+				}
+
+				@Override
+				public void save() {
+					getConfigVoteSites().saveData();
+				}
+
+				@Override
+				public void setData(String path, Object value) {
+					getConfigVoteSites().setValue(path, value);
+				}
+			});
 		}
 
 		// vote streaks
@@ -882,29 +934,25 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 			@Override
 			public void run() {
-				getTimer().schedule(new TimerTask() {
+				getTimer().scheduleWithFixedDelay(new Runnable() {
 
 					@Override
 					public void run() {
 						if (plugin != null) {
 							update();
-						} else {
-							cancel();
 						}
 					}
-				}, 1000, 1000 * 60 * configFile.getDelayBetweenUpdates());
+				}, 1000, 1000 * 60 * configFile.getDelayBetweenUpdates(), TimeUnit.MILLISECONDS);
 
-				getTimer().schedule(new TimerTask() {
+				getTimer().scheduleWithFixedDelay(new Runnable() {
 
 					@Override
 					public void run() {
 						if (plugin != null && configFile.isExtraBackgroundUpdate()) {
 							basicBungeeUpdate();
-						} else {
-							cancel();
 						}
 					}
-				}, 1000, 1000 * 30);
+				}, 1000, 1000 * 30, TimeUnit.MILLISECONDS);
 
 			}
 		}, 40L);
@@ -955,13 +1003,25 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	 * Metrics.
 	 */
 	private void metrics() {
-		new VotingPluginMetrics().load(this);
+		new VotingPluginMetrics().load(plugin);
 	}
 
+	private void loadVoteTimer() {
+		voteTimer = Executors.newSingleThreadScheduledExecutor();
+	}
+
+	@Getter
+	private TimeQueueHandler timeQueueHandler;
+
 	@Override
 	public void onPostLoad() {
 		loadVersionFile();
 		getOptions().setServer(bungeeSettings.getServer());
+		
+		voteTester = new VoteTester(plugin);
+
+		loadVoteTimer();
+
 		if (bungeeSettings.isUseBungeecoord()) {
 			bungeeHandler = new BungeeHandler(this);
 			bungeeHandler.load();
@@ -973,6 +1033,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		}
 
+		if (!bungeeSettings.isUseBungeecoord() || !bungeeSettings.isGloblalDataEnabled()) {
+			this.timeQueueHandler = new TimeQueueHandler(this);
+		}
+
 		registerCommands();
 		checkVotifier();
 		registerEvents();
@@ -1020,7 +1084,13 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		topVoterHandler.register();
 
-		metrics();
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				metrics();
+			}
+		});
 
 		// javascript api
 		getJavascriptEngineRequests().add(new JavascriptPlaceholderRequest("User") {
@@ -1031,11 +1101,13 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			}
 		});
 		getJavascriptEngine().put("VotingPluginHooks", VotingPluginHooks.getInstance());
+		getJavascriptEngine().put("VotingPlugin", this);
 
 		loadTimer();
 
 		// placeholderapi loading
 		placeholders = new PlaceHolders(this);
+		getServerData().updatePlaceholders();
 		placeholders.load();
 
 		if (Bukkit.getPluginManager().isPluginEnabled("MVdWPlaceholderAPI")) {
@@ -1044,15 +1116,17 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 
 		// Add rewards
-		RewardHandler.getInstance().addInjectedReward(new RewardInjectInt("Points", 0) {
+		getRewardHandler().addInjectedReward(new RewardInjectInt("Points", 0) {
 
 			@Override
 			public String onRewardRequest(Reward reward, com.bencodez.advancedcore.api.user.AdvancedCoreUser user,
 					int num, HashMap<String, String> placeholders) {
-				UserManager.getInstance().getVotingPluginUser(user).addPoints(num);
-				return null;
+				VotingPluginUser vpUser = UserManager.getInstance().getVotingPluginUser(user);
+				String str = "" + vpUser.addPoints(num);
+				debug("Setting points to " + str);
+				return str;
 			}
-		}.synchronize().addEditButton(
+		}.synchronize().asPlaceholder("newpoints").addEditButton(
 				new EditGUIButton(new ItemBuilder(Material.PAPER), new EditGUIValueNumber("Points", null) {
 
 					@Override
@@ -1070,7 +1144,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					}
 				}));
 
-		RewardHandler.getInstance().addInjectedReward(new RewardInjectConfigurationSection("VoteBossBar") {
+		getRewardHandler().addInjectedReward(new RewardInjectConfigurationSection("VoteBossBar") {
 
 			@Override
 			public String onRewardRequested(Reward arg0, com.bencodez.advancedcore.api.user.AdvancedCoreUser user,
@@ -1089,7 +1163,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		});
 
 		for (final TopVoter top : TopVoter.values()) {
-			RewardHandler.getInstance().addPlaceholder(new RewardPlaceholderHandle("Total_" + top.toString()) {
+			getRewardHandler().addPlaceholder(new RewardPlaceholderHandle("Total_" + top.toString()) {
 
 				@Override
 				public String getValue(Reward reward, com.bencodez.advancedcore.api.user.AdvancedCoreUser user) {
@@ -1110,7 +1184,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					"Using dev build, this is not a stable build, use at your own risk. Build number: " + buildNumber);
 		}
 
-		boolean hasRewards = RewardHandler.getInstance().hasRewards(getConfigVoteSites().getData(),
+		boolean hasRewards = getRewardHandler().hasRewards(getConfigVoteSites().getData(),
 				getConfigVoteSites().getEverySiteRewardPath());
 
 		boolean issues = true;
@@ -1189,8 +1263,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	 */
 	@Override
 	public void onUnLoad() {
-		getSigns().storeSigns();
-		HandlerList.unregisterAll(plugin);
 		if (bungeeSettings.isUseBungeecoord()) {
 			try {
 				getBungeeHandler().close();
@@ -1198,6 +1270,18 @@ 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();
+		}
+		getSigns().storeSigns();
+		HandlerList.unregisterAll(plugin);
 		plugin = null;
 	}
 
@@ -1254,6 +1338,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			pm.registerEvents(new PlayerInteract(this), this);
 		}
 
+		if (timeQueueHandler != null) {
+			pm.registerEvents(timeQueueHandler, plugin);
+		}
+
 		pm.registerEvents(new VotingPluginUpdateEvent(this), this);
 		/*
 		 * if (!NMSManager.getInstance().isVersion("1.12")) { pm.registerEvents(new
@@ -1279,8 +1367,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	}
 
 	private void reloadPlugin(boolean userStorage) {
-		setUpdate(true);
-
 		configFile.reloadData();
 		configFile.loadValues();
 
@@ -1291,10 +1377,14 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		gui.reloadData();
 
 		bungeeSettings.reloadData();
+
+		if (bungeeSettings.isUseBungeecoord()) {
+			getBungeeHandler().loadGlobalMysql();
+		}
 		checkYMLError();
 
 		if (broadcastHandler != null) {
-			broadcastHandler.schelude(getConfigFile().getFormatAlternateBroadcastDelay());
+			broadcastHandler.schedule(getConfigFile().getFormatAlternateBroadcastDelay());
 		}
 
 		updateAdvancedCoreHook();
@@ -1304,18 +1394,13 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		getOptions().setServer(bungeeSettings.getServer());
 		if (userStorage) {
 			placeholders.load();
+			placeholders.reload();
 		}
 
 		voteReminding.loadRemindChecking();
 		coolDownCheck.checkEnabled();
 
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				update();
-			}
-		});
+		setUpdate(true);
 	}
 
 	private void setupFiles() {
@@ -1341,6 +1426,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		plugin.debug("Loaded Files");
 	}
 
+	@Getter
+	private long lastBackgroundTaskTimeTaken = -1;
+
 	public void update() {
 		if (update || configFile.isAlwaysUpdate()) {
 			if (!updateStarted && plugin != null) {
@@ -1355,9 +1443,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 							plugin.debug("Starting background task, current cached users: "
 									+ plugin.getUserManager().getDataManager().getUserDataCache().keySet().size());
 
-							placeholders.onUpdate();
-
-							int dataLoadLimit = getConfigFile().getPlayerDataLoadLimit();
 							try {
 								boolean extraBackgroundUpdate = configFile.isExtraBackgroundUpdate();
 								long startTime = System.currentTimeMillis();
@@ -1379,84 +1464,94 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 										.getTopVoterIgnorePermission();
 								ArrayList<String> blackList = plugin.getConfigFile().getBlackList();
 
-								ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
+								// ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
 								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())) {
+								HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+								long time1 = ((System.currentTimeMillis() - startTime) / 1000);
+								plugin.debug("Finished getting player data in " + time1 + " seconds, " + cols.size()
+										+ " users, " + plugin.getStorageType().toString());
+								time1 = System.currentTimeMillis();
+								for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
 
-											if (!topVoterIgnorePermissionUse || !user.isTopVoterIgnore()) {
-												for (TopVoter top : topVotersToCheck) {
-													int total = user.getTotal(top);
-													if (total > 0) {
-														tempTopVoter.get(top).put(user.getTopVoterPlayer(), total);
+									String uuid = playerData.getKey().toString();
+									if (plugin != null && plugin.isEnabled()) {
+										if (uuid != null && !uuid.isEmpty()) {
+											VotingPluginUser user = UserManager.getInstance()
+													.getVotingPluginUser(UUID.fromString(uuid), false);
+											user.dontCache();
+											user.updateTempCacheWithColumns(playerData.getValue());
+											cols.put(playerData.getKey(), null);
+											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);
+														}
 													}
 												}
-											}
 
-											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;
 										}
+									} else {
+										return;
 									}
 								}
-								update = false;
-								long time1 = ((System.currentTimeMillis() - startTime) / 1000);
-								plugin.debug("Finished loading player data in " + time1 + " seconds, " + uuids.size()
-										+ " users, " + plugin.getStorageType().toString() + ", data load limit: "
-										+ dataLoadLimit);
-								time1 = System.currentTimeMillis();
+								cols.clear();
+								cols = null;
 
 								topVoterHandler.updateTopVoters(tempTopVoter);
+								placeholders.onUpdate();
 								setVoteToday(voteToday);
 								serverData.updateValues();
 								getSigns().updateSigns();
 
+								checkFirstTimeLoaded();
+
+								plugin.getUserManager().getDataManager().clearNonNeededCachedUsers();
+								plugin.extraDebug("Current cached users: "
+										+ plugin.getUserManager().getDataManager().getUserDataCache().keySet().size());
+
+								update = false;
+
 								tempTopVoter = null;
 
 								time1 = ((System.currentTimeMillis() - time1) / 1000);
 								long totalTime = ((System.currentTimeMillis() - startTime) / 1000);
+								lastBackgroundTaskTimeTaken = totalTime;
 								plugin.debug("Background task finished. Final processing took " + time1
 										+ " seconds. Total time: " + totalTime + " seconds");
-								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");
@@ -1476,6 +1571,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/VotingPluginMetrics.java

@@ -3,7 +3,6 @@ package com.bencodez.votingplugin;
 import java.util.concurrent.Callable;
 
 import com.bencodez.advancedcore.api.metrics.BStatsMetrics;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.votingplugin.user.UserManager;
 
 public class VotingPluginMetrics {
@@ -15,7 +14,7 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				if (RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+				if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 						plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath())) {
 					return "True";
 				} else {
@@ -27,7 +26,7 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				if (RewardHandler.getInstance().hasRewards(plugin.getConfigVoteSites().getData(),
+				if (plugin.getRewardHandler().hasRewards(plugin.getConfigVoteSites().getData(),
 						plugin.getConfigVoteSites().getEverySiteRewardPath())) {
 					return "True";
 				} else {
@@ -39,7 +38,7 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				if (RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+				if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 						plugin.getSpecialRewardsConfig().getAllSitesRewardPath())) {
 					return "True";
 				} else {
@@ -94,7 +93,7 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				if (RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+				if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 						plugin.getSpecialRewardsConfig().getAnySiteRewardsPath())) {
 					return "True";
 				} else {
@@ -109,7 +108,7 @@ public class VotingPluginMetrics {
 				for (String s : plugin.getSpecialRewardsConfig().getVoteStreakVotes("Day")) {
 
 					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled("Day", s)
-							&& RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 									plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath("Day", s))) {
 						return "True";
 					}
@@ -126,7 +125,7 @@ public class VotingPluginMetrics {
 				for (String s : plugin.getSpecialRewardsConfig().getVoteStreakVotes("Week")) {
 
 					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled("Week", s)
-							&& RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 									plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath("Week", s))) {
 						return "True";
 					}
@@ -143,7 +142,7 @@ public class VotingPluginMetrics {
 				for (String s : plugin.getSpecialRewardsConfig().getVoteStreakVotes("Month")) {
 
 					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled("Month", s)
-							&& RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 									plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath("Month", s))) {
 						return "True";
 					}
@@ -163,7 +162,7 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				return "" + RewardHandler.getInstance().getRewards().size();
+				return "" + plugin.getRewardHandler().getRewards().size();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("autocreatevotesites", new Callable<String>() {
@@ -179,37 +178,29 @@ public class VotingPluginMetrics {
 			@Override
 			public String call() throws Exception {
 				int total = UserManager.getInstance().getAllUUIDs().size();
-				if (total < 1000) {
-					return "<1000";
+				if (total > 800000) {
+					return ">800000";
+				} else if (total > 700000) {
+					return "700000-800000";
+				} else if (total > 600000) {
+					return "600000-700000";
+				} else if (total > 500000) {
+					return "500000-600000";
+				} else if (total > 400000) {
+					return "400000-500000";
+				} else if (total > 300000) {
+					return "300000-400000";
+				} else if (total > 200000) {
+					return "200000-300000";
+				} else if (total > 100000) {
+					return "100000-200000";
 				} else if (total > 10000) {
-					return ">10000";
-				} else {
-					return "1000-10000";
+					return ">10000-100000";
 				}
+				return "<10000";
 			}
 		}));
 
-		int users = UserManager.getInstance().getAllUUIDs().size();
-		if (users > 1000) {
-			metrics.addCustomChart(new BStatsMetrics.SimplePie("number_of_users_in_thousands", new Callable<String>() {
-
-				@Override
-				public String call() throws Exception {
-					int total = UserManager.getInstance().getAllUUIDs().size() / 1000;
-					return "" + total;
-				}
-			}));
-		}
-		if (users > 10000) {
-			metrics.addCustomChart(new BStatsMetrics.SimplePie("number_of_users_in_thousands_plus_10", new Callable<String>() {
-
-				@Override
-				public String call() throws Exception {
-					int total = UserManager.getInstance().getAllUUIDs().size() / 1000;
-					return "" + total;
-				}
-			}));
-		}
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("data_storage", new Callable<String>() {
 
 			@Override
@@ -300,8 +291,33 @@ public class VotingPluginMetrics {
 					return "" + plugin.getBungeeSettings().isTriggerVotifierEvent();
 				}
 			}));
+
+			metrics.addCustomChart(new BStatsMetrics.SimplePie("globaldata_enabled", new Callable<String>() {
+
+				@Override
+				public String call() throws Exception {
+					return "" + plugin.getBungeeSettings().isGloblalDataEnabled();
+				}
+			}));
+			if (plugin.getBungeeSettings().isGloblalDataEnabled()) {
+				metrics.addCustomChart(new BStatsMetrics.SimplePie("globaldata_usemainmysql", new Callable<String>() {
+
+					@Override
+					public String call() throws Exception {
+						return "" + plugin.getBungeeSettings().isGloblalDataUseMainMySQL();
+					}
+				}));
+			}
 		}
 
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("persitecooldownevents", new Callable<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return "" + plugin.getConfigFile().isPerSiteCoolDownEvents();
+			}
+		}));
+
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("geyserprefixsupport", new Callable<String>() {
 
 			@Override
@@ -330,11 +346,19 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				return "" + (!plugin.getConfigFile().isDisableCoolDownCheck() && RewardHandler.getInstance()
+				return "" + (!plugin.getConfigFile().isDisableCoolDownCheck() && plugin.getRewardHandler()
 						.hasRewards(plugin.getSpecialRewardsConfig().getData(), "VoteCoolDownEndedReward"));
 			}
 		}));
 
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("background_task_time_taken", new Callable<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return "" + plugin.getLastBackgroundTaskTimeTaken();
+			}
+		}));
+
 		if (!plugin.getBuildNumber().equals("NOTSET")) {
 			metrics.addCustomChart(new BStatsMetrics.SimplePie("dev_build_number", new Callable<String>() {
 

VotingPlugin/src/com/bencodez/votingplugin/broadcast/BroadcastHandler.java

@@ -2,9 +2,10 @@ package com.bencodez.votingplugin.broadcast;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -16,12 +17,12 @@ import com.bencodez.votingplugin.user.UserManager;
 
 public class BroadcastHandler {
 	private VotingPluginMain plugin;
-	private Timer timer;
+	private ScheduledExecutorService timer;
 	ConcurrentLinkedQueue<String> votedPlayers = new ConcurrentLinkedQueue<String>();
 
 	public BroadcastHandler(VotingPluginMain plugin, int delay) {
 		this.plugin = plugin;
-		schelude(delay);
+		schedule(delay);
 	}
 
 	public void check() {
@@ -32,8 +33,16 @@ public class BroadcastHandler {
 			}
 			String bc = StringParser.getInstance()
 					.colorize(plugin.getConfigFile().getFormatAlternateBroadcastBroadcast());
+			String playersText = "";
+			while (!votedPlayers.isEmpty()) {
+				playersText += votedPlayers.remove();
+				if (!votedPlayers.isEmpty()) {
+					playersText += ", ";
+				}
+			}
 			HashMap<String, String> placeholders = new HashMap<String, String>();
 			placeholders.put("numberofplayers", "" + size);
+			placeholders.put("players", playersText);
 			bc = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
 			ArrayList<Player> players = new ArrayList<Player>();
 			for (Player p : Bukkit.getOnlinePlayers()) {
@@ -50,19 +59,19 @@ public class BroadcastHandler {
 		votedPlayers.add(player);
 	}
 
-	public void schelude(int delay) {
+	public void schedule(int delay) {
 		if (timer != null) {
-			timer.cancel();
-			timer = new Timer();
+			timer.shutdownNow();
+			timer = Executors.newScheduledThreadPool(1);
 		} else {
-			timer = new Timer();
+			timer = Executors.newScheduledThreadPool(1);
 		}
-		timer.schedule(new TimerTask() {
+		timer.scheduleWithFixedDelay(new Runnable() {
 
 			@Override
 			public void run() {
 				check();
 			}
-		}, 1000 * 60, 1000 * 60 * delay);
+		}, 60, 60 * delay, TimeUnit.SECONDS);
 	}
 }

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

@@ -29,12 +29,32 @@ public class Config {
 		return getData().getStringList("BlockedServers");
 	}
 
+	public List<String> getWhiteListedServers() {
+		return getData().getStringList("WhiteListedServers");
+	}
+
 	public boolean getBroadcast() {
 		return getData().getBoolean("Broadcast", false);
 	}
 
-	public boolean getRedisSupport() {
-		return getData().getBoolean("RedisSupport", false);
+	public boolean getGeyserSupport() {
+		return getData().getBoolean("GeyserSupport", false);
+	}
+
+	public String getGeyserPrefix() {
+		return getData().getString("GeyserPrefix", ".");
+	}
+
+	public boolean getOnlineMode() {
+		return getData().getBoolean("OnlineMode", true);
+	}
+
+	public boolean getGlobalDataEnabled() {
+		return getData().getBoolean("GlobalData.Enabled", false);
+	}
+
+	public boolean getGlobalDataUseMainMySQL() {
+		return getData().getBoolean("GlobalData.UseMainMySQL", true);
 	}
 
 	public String getBungeeHost() {
@@ -57,6 +77,34 @@ public class Config {
 		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", "");
 	}

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

@@ -7,6 +7,7 @@ import lombok.Getter;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.config.JsonConfiguration;
 import net.md_5.bungee.config.YamlConfiguration;
 
 public class NonVotedPlayersCache {
@@ -53,7 +54,8 @@ public class NonVotedPlayersCache {
 			bungee.getDataFolder().mkdir();
 		}
 
-		File file = new File(bungee.getDataFolder(), "nonvotedplayerscache.yml");
+		File yamlFile = new File(bungee.getDataFolder(), "nonvotedplayerscache.yml");
+		File file = new File(bungee.getDataFolder(), "nonvotedplayerscache.json");
 
 		if (!file.exists()) {
 			try {
@@ -62,9 +64,24 @@ public class NonVotedPlayersCache {
 				e.printStackTrace();
 			}
 		}
+
+		if (yamlFile.exists()) {
+			try {
+				data = ConfigurationProvider.getProvider(YamlConfiguration.class)
+						.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
+				yamlFile.renameTo(new File(bungee.getDataFolder(), "oldnonvotedplayerscache.yml"));
+				ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
+						new File(bungee.getDataFolder(), "oldnonvotedplayerscache.yml"));
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+
+			save();
+		}
+
 		try {
-			data = ConfigurationProvider.getProvider(YamlConfiguration.class)
-					.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
+			data = ConfigurationProvider.getProvider(JsonConfiguration.class)
+					.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.json"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
@@ -84,8 +101,8 @@ public class NonVotedPlayersCache {
 
 	public void save() {
 		try {
-			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
-					new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
+			ConfigurationProvider.getProvider(JsonConfiguration.class).save(data,
+					new File(bungee.getDataFolder(), "nonvotedplayerscache.json"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

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

@@ -1,48 +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;
-
-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/TimeHandle.java

@@ -1,24 +0,0 @@
-package com.bencodez.votingplugin.bungee;
-
-import lombok.Getter;
-import lombok.Setter;
-
-public abstract class TimeHandle {
-	@Getter
-	@Setter
-	private String month;
-	@Getter
-	@Setter
-	private int day;
-	@Getter
-	@Setter
-	private int week;
-
-	public TimeHandle(String month, int day, int week) {
-		this.month = month;
-		this.day = day;
-		this.week = week;
-	}
-
-	public abstract void save();
-}

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

@@ -4,9 +4,12 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
 
+import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
+
 import lombok.Getter;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.config.JsonConfiguration;
 import net.md_5.bungee.config.YamlConfiguration;
 
 public class VoteCache {
@@ -52,6 +55,13 @@ public class VoteCache {
 		section.set("Text", voteData.getText());
 	}
 
+	public void addTimedVote(int num, VoteTimeQueue voteTimedQueue) {
+		Configuration section = getData().getSection("TimedVoteCache." + num);
+		section.set("Name", voteTimedQueue.getName());
+		section.set("Service", voteTimedQueue.getService());
+		section.set("Time", voteTimedQueue.getTime());
+	}
+
 	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
 		Configuration section = getData().getSection("OnlineCache." + player + "." + num);
 		section.set("Name", voteData.getPlayerName());
@@ -84,6 +94,14 @@ public class VoteCache {
 		return getData().getSection("VoteCache").getKeys();
 	}
 
+	public Configuration getTimedVoteCache(String key) {
+		return getData().getSection("TimedVoteCache." + key);
+	}
+
+	public Collection<String> getTimedVoteCache() {
+		return getData().getSection("TimedVoteCache").getKeys();
+	}
+
 	public Collection<String> getServerVotes(String server) {
 		return getData().getSection("VoteCache." + server).getKeys();
 	}
@@ -97,7 +115,9 @@ public class VoteCache {
 			bungee.getDataFolder().mkdir();
 		}
 
-		File file = new File(bungee.getDataFolder(), "votecache.yml");
+		File yamlFile = new File(bungee.getDataFolder(), "votecache.yml");
+		
+		File file = new File(bungee.getDataFolder(), "votecache.json");
 
 		if (!file.exists()) {
 			try {
@@ -106,9 +126,23 @@ public class VoteCache {
 				e.printStackTrace();
 			}
 		}
+		if (yamlFile.exists()) {
+			try {
+				data = ConfigurationProvider.getProvider(YamlConfiguration.class)
+						.load(new File(bungee.getDataFolder(), "votecache.yml"));
+				yamlFile.renameTo(new File(bungee.getDataFolder(), "oldvotecache.yml"));
+				ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
+						new File(bungee.getDataFolder(), "oldvotecache.yml"));
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+			
+			save();
+		}
+		
 		try {
-			data = ConfigurationProvider.getProvider(YamlConfiguration.class)
-					.load(new File(bungee.getDataFolder(), "votecache.yml"));
+			data = ConfigurationProvider.getProvider(JsonConfiguration.class)
+					.load(new File(bungee.getDataFolder(), "votecache.json"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
@@ -116,8 +150,8 @@ public class VoteCache {
 
 	public void save() {
 		try {
-			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
-					new File(bungee.getDataFolder(), "votecache.yml"));
+			ConfigurationProvider.getProvider(JsonConfiguration.class).save(data,
+					new File(bungee.getDataFolder(), "votecache.json"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

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

@@ -16,6 +16,7 @@ public class VoteEventBungee implements net.md_5.bungee.api.plugin.Listener {
 	public void onVote(VotifierEvent event) {
 		plugin.getProxy().getScheduler().runAsync(plugin, new Runnable() {
 
+			@SuppressWarnings("deprecation")
 			@Override
 			public void run() {
 				Vote vote = event.getVote();
@@ -24,11 +25,13 @@ public class VoteEventBungee implements net.md_5.bungee.api.plugin.Listener {
 
 				if (serviceSite.isEmpty()) {
 					serviceSite = "Empty";
+					vote.setServiceName(serviceSite);
 				}
 
-				plugin.vote(vote.getUsername(), serviceSite, true);
+				plugin.vote(vote.getUsername(), serviceSite, true, true, 0, null, null);
 			}
 		});
 
 	}
+
 }

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

@@ -1,5 +1,7 @@
 package com.bencodez.votingplugin.bungee;
 
+import com.bencodez.advancedcore.api.time.TimeType;
+
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.plugin.Command;
@@ -18,20 +20,26 @@ public class VotingPluginBungeeCommand extends Command {
 			if (args.length > 0) {
 				if (args[0].equalsIgnoreCase("reload")) {
 					bungee.reload(false);
-					sender.sendMessage(new TextComponent("&aReloading VotingPluginBungee"));
+					sender.sendMessage(new TextComponent("Reloading VotingPluginBungee"));
 				}
 				if (args[0].equalsIgnoreCase("reloadmysql")) {
 					bungee.reload(true);
-					sender.sendMessage(new TextComponent("&aReloading VotingPluginBungee with MySQL"));
+					sender.sendMessage(new TextComponent("Reloading VotingPluginBungee with MySQL"));
 				}
 				if (args[0].equalsIgnoreCase("vote")) {
 					if (args.length >= 2) {
 						String user = args[1];
 						String site = args[2];
-						bungee.vote(user, site, false);
+						bungee.vote(user, site, false, true, 0, null, null);
 						sender.sendMessage(new TextComponent("Sending vote"));
 					}
 				}
+				if (args[0].equalsIgnoreCase("forcetimechange")) {
+					if (args.length >= 2) {
+						bungee.getBungeeTimeChecker().forceChanged(TimeType.getTimeType(args[1]));
+						sender.sendMessage(new TextComponent("Triggering time change: " + args[1]));
+					}
+				}
 				if (args[0].equalsIgnoreCase("status")) {
 					if (bungee.getMethod().equals(BungeeMethod.SOCKETS)) {
 						sender.sendMessage(new TextComponent(
@@ -46,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,12 +25,24 @@ 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);
 	}
 
-	public String getBungeeHost() {
-		return getString(getNode("BungeeServer", "Host"), "");
+	public boolean getOnlineMode() {
+		return getBoolean(getNode("OnlineMode"), true);
+	}
+
+	public boolean getGlobalDataEnabled() {
+		return getBoolean(getNode("GlobalData", "Enabled"), false);
+	}
+
+	public boolean getGlobalDataUseMainMySQL() {
+		return getBoolean(getNode("GlobalData", "UseMainMySQL"), true);
 	}
 
 	public boolean getBungeeManageTotals() {
@@ -41,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);
 	}
@@ -108,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/NonVotedPlayersCache.java

@@ -2,10 +2,10 @@ package com.bencodez.votingplugin.bungee.velocity;
 
 import java.io.File;
 
-import com.bencodez.advancedcore.bungeeapi.velocity.VelocityYMLFile;
+import com.bencodez.advancedcore.bungeeapi.velocity.VelocityJSONFile;
 import com.velocitypowered.api.proxy.Player;
 
-public class NonVotedPlayersCache extends VelocityYMLFile {
+public class NonVotedPlayersCache extends VelocityJSONFile {
 
 	private VotingPluginVelocity plugin;
 

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

@@ -3,12 +3,13 @@ package com.bencodez.votingplugin.bungee.velocity;
 import java.io.File;
 import java.util.Collection;
 
-import com.bencodez.advancedcore.bungeeapi.velocity.VelocityYMLFile;
+import com.bencodez.advancedcore.bungeeapi.velocity.VelocityJSONFile;
 import com.bencodez.votingplugin.bungee.OfflineBungeeVote;
+import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
 
 import ninja.leaping.configurate.ConfigurationNode;
 
-public class VoteCache extends VelocityYMLFile {
+public class VoteCache extends VelocityJSONFile {
 
 	public VoteCache(File file) {
 		super(file);
@@ -49,6 +50,13 @@ public class VoteCache extends VelocityYMLFile {
 		getNode(path, "Text").setValue(voteData.getText());
 	}
 
+	public void addTimedVote(int num, VoteTimeQueue voteTimedQueue) {
+		String[] path = new String[] { "TimedVoteCache", "" + num };
+		getNode(path, "Name").setValue(voteTimedQueue.getName());
+		getNode(path, "Service").setValue(voteTimedQueue.getService());
+		getNode(path, "Time").setValue(voteTimedQueue.getTime());
+	}
+
 	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
 		String[] path = new String[] { "OnlineCache", player, "" + num };
 
@@ -70,6 +78,10 @@ public class VoteCache extends VelocityYMLFile {
 		return getKeys(getNode("OnlineCache", name));
 	}
 
+	public ConfigurationNode getTimedVoteCache(String name) {
+		return getNode("TimedVoteCache", name);
+	}
+
 	public ConfigurationNode getOnlineVotes(String name, String num) {
 		return getNode("OnlineCache", name, num);
 	}
@@ -82,6 +94,10 @@ public class VoteCache extends VelocityYMLFile {
 		return getKeys(getNode("VoteCache"));
 	}
 
+	public Collection<String> getTimedVoteCache() {
+		return getKeys(getNode("TimedVoteCache"));
+	}
+
 	public Collection<String> getServerVotes(String server) {
 		return getKeys(getNode("OnlineCache", server));
 	}

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/VotingPluginVelocityCommand.java

@@ -1,5 +1,6 @@
 package com.bencodez.votingplugin.bungee.velocity;
 
+import com.bencodez.advancedcore.api.time.TimeType;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.command.SimpleCommand;
@@ -33,10 +34,16 @@ public class VotingPluginVelocityCommand implements SimpleCommand {
 				if (args.length >= 2) {
 					String user = args[1];
 					String site = args[2];
-					plugin.vote(user, site, false);
+					plugin.vote(user, site, false, true, 0, null, null);
 					source.sendMessage(Component.text("Sending vote").color(NamedTextColor.AQUA));
 				}
 			}
+			if (args[0].equalsIgnoreCase("forcetimechange")) {
+				if (args.length >= 2) {
+					plugin.getBungeeTimeChecker().forceChanged(TimeType.getTimeType(args[1]));
+					source.sendMessage(Component.text("Triggering time change: " + args[1]).color(NamedTextColor.AQUA));
+				}
+			}
 			if (args[0].equalsIgnoreCase("status")) {
 				if (plugin.getMethod().equals(BungeeMethod.SOCKETS)) {
 					source.sendMessage(
@@ -53,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

@@ -3,6 +3,7 @@ package com.bencodez.votingplugin.commands;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Pattern;
@@ -28,9 +29,9 @@ 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.misc.PlayerUtils;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.updater.Updater;
+import com.bencodez.advancedcore.api.user.userstorage.Column;
 import com.bencodez.advancedcore.api.user.userstorage.DataType;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.listeners.BooleanListener;
@@ -65,7 +66,6 @@ import com.bencodez.votingplugin.commands.gui.player.VoteURLVoteSite;
 import com.bencodez.votingplugin.commands.tabcompleter.AliasesTabCompleter;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
 import com.bencodez.votingplugin.objects.VoteSite;
-import com.bencodez.votingplugin.test.VoteTester;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -93,6 +93,32 @@ public class CommandLoader {
 		this.plugin = plugin;
 	}
 
+	public void processSlotClick(Player player, VotingPluginUser user, String slot) {
+		if (StringParser.getInstance().startsWithIgnoreCase(slot, "url")) {
+			new VoteURL(plugin, player, user, true).open();
+		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "next")) {
+			new VoteNext(plugin, player, user).open(GUIMethod.CHEST);
+		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "last")) {
+			new VoteLast(plugin, player, user).open(GUIMethod.CHEST);
+		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "total")) {
+			new VoteTotal(plugin, player, user).open(GUIMethod.CHEST);
+		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "top")) {
+			new VoteTopVoter(plugin, player, user, TopVoter.getDefault(), 1).open(GUIMethod.CHEST);
+		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "today")) {
+			new VoteToday(plugin, player, user, 1).open(GUIMethod.CHEST);
+		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "help")) {
+			player.performCommand("vote help");
+		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "shop")) {
+			new VoteShop(plugin, player, user).open(GUIMethod.CHEST);
+		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "lastmonth")) {
+			new VoteTopVoterLastMonth(plugin, player, user).open(GUIMethod.CHEST);
+		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "best")) {
+			new VoteBest(plugin, player, user).open(GUIMethod.CHEST);
+		} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "streak")) {
+			new VoteStreak(plugin, player, user).open(GUIMethod.CHEST);
+		}
+	}
+
 	/**
 	 * @return the adminPerm
 	 */
@@ -103,25 +129,32 @@ public class CommandLoader {
 	public BInventoryButton getBackButton(VotingPluginUser user) {
 		ConfigurationSection sec = plugin.getGui().getCHESTBackButton();
 		boolean a = false;
+		boolean exit = false;
 
 		ItemBuilder item;
 		if (sec != null) {
 			item = new ItemBuilder(sec);
 			a = sec.getBoolean("OpenVoteURL", false);
+			exit = sec.getBoolean("Exit");
 		} else {
 			item = new ItemBuilder(Material.BARRIER, 1).setName("&8Back to VoteGUI");
 		}
 
 		final boolean openVoteURL = a;
+		final boolean exitGUI = exit;
 		BInventoryButton b = new BInventoryButton(item) {
 
 			@Override
 			public void onClick(ClickEvent event) {
-				if (!openVoteURL) {
-					new VoteGUI(plugin, event.getWhoClicked(), user)
-							.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
+				if (!exitGUI) {
+					if (!openVoteURL) {
+						new VoteGUI(plugin, event.getWhoClicked(), user)
+								.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
+					} else {
+						new VoteURL(plugin, event.getWhoClicked(), user, true).open();
+					}
 				} else {
-					new VoteURL(plugin, event.getWhoClicked(), user, true).open();
+					event.closeInventory();
 				}
 			}
 
@@ -256,36 +289,32 @@ 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...");
+						plugin.getUserManager().copyColumnData(TopVoter.AllTime.getColumnName(), "MilestoneCount");
+						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,
@@ -303,34 +332,46 @@ public class CommandLoader {
 								plugin.getLogger().warning("Failed to get number from " + str);
 							}
 						}
-						for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-							VotingPluginUser user = UserManager.getInstance()
-									.getVotingPluginUser(UUID.fromString(uuid));
-							user.dontCache();
-							int milestoneCount = user.getMilestoneCount();
-							for (int num : nums) {
-								if (milestoneCount >= num) {
-									if (!user.hasGottenMilestone(num)) {
-										sendMessage(sender,
-												"&cMilestone " + num + " for " + user.getPlayerName()
+						HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+						for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+
+							String uuid = playerData.getKey().toString();
+							if (plugin != null && plugin.isEnabled()) {
+								if (uuid != null && !uuid.isEmpty()) {
+									VotingPluginUser user = UserManager.getInstance()
+											.getVotingPluginUser(UUID.fromString(uuid));
+									user.dontCache();
+									user.updateTempCacheWithColumns(playerData.getValue());
+									cols.put(playerData.getKey(), null);
+									int milestoneCount = user.getMilestoneCount();
+									for (int num : nums) {
+										if (milestoneCount >= num) {
+											if (!user.hasGottenMilestone(num)) {
+												sendMessage(sender, "&cMilestone " + num + " for "
+														+ user.getPlayerName()
 														+ " not already given when it should be, Current AllTimeTotal: "
 														+ user.getTotal(TopVoter.AllTime) + ", Current MileStoneCount: "
 														+ user.getMilestoneCount());
-										user.setHasGotteMilestone(num, true);
-									}
-								} else {
-									if (user.hasGottenMilestone(num)) {
-										sendMessage(sender,
-												"&cMilestone " + num + " for " + user.getPlayerName()
+												user.setHasGotteMilestone(num, true);
+											}
+										} else {
+											if (user.hasGottenMilestone(num)) {
+												sendMessage(sender, "&cMilestone " + num + " for "
+														+ user.getPlayerName()
 														+ " already given when it shouldn't be, Current AllTimeTotal: "
 														+ user.getTotal(TopVoter.AllTime) + ", Current MileStoneCount: "
 														+ user.getMilestoneCount());
-										user.setHasGotteMilestone(num, false);
-									}
+												user.setHasGotteMilestone(num, false);
+											}
 
+										}
+									}
+									user.clearTempCache();
 								}
 							}
 						}
+						cols.clear();
+						cols = null;
 						sendMessage(sender, "&cFinished");
 
 					}
@@ -372,14 +413,14 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						user.cache();
-						int newTotal = 0;
 						synchronized (pointLock) {
+							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+							user.cache();
+							int newTotal = 0;
 							newTotal = user.addPoints(Integer.parseInt(args[3]));
+							sender.sendMessage(StringParser.getInstance().colorize("&cGave " + args[1] + " " + args[3]
+									+ " points" + ", " + args[1] + " now has " + newTotal + " points"));
 						}
-						sender.sendMessage(StringParser.getInstance().colorize("&cGave " + args[1] + " " + args[3]
-								+ " points" + ", " + args[1] + " now has " + newTotal + " points"));
 					}
 				});
 
@@ -821,6 +862,31 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "User", "(player)", "ResetAllVotedSites" },
+				"VotingPlugin.Commands.AdminVote.ResetAllVotedSites|" + adminPerm, "Resets all voted") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				user.resetLastVoted();
+				sender.sendMessage(StringParser.getInstance().colorize("&cVoted sites reset for '" + args[1] + "'"));
+			}
+		});
+
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(player)", "ResetVotedSite", "(Sitename)" },
+						"VotingPlugin.Commands.AdminVote.ResetVotedSite|" + adminPerm,
+						"Resets last voted for specific site") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						user.resetLastVoted(plugin.getVoteSite(args[3], false));
+						sender.sendMessage(StringParser.getInstance()
+								.colorize("&cVoted site reset for '" + args[1] + "'" + " on " + args[3]));
+					}
+				});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "User", "(player)", "AddMilestoneCount", "(number)" },
 						"VotingPlugin.Commands.AdminVote.AddMilestoneCount|" + adminPerm, "Add milestonecount") {
@@ -869,15 +935,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()) {
@@ -894,22 +967,61 @@ 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");
+					}
 				}
 
 			}
 		});
 
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "VoteExact", "(PlayerExact)", "(Sitename)" },
+						"VotingPlugin.Commands.AdminVote.VoteExact|" + adminPerm,
+						"Trigger manual vote with exact player name") {
+
+					@Override
+					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.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");
+						}
+
+					}
+				});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Vote", "(player)", },
 				"VotingPlugin.Commands.AdminVote.Vote|" + adminPerm, "Trigger manual vote via GUI", false) {
 
@@ -974,6 +1086,21 @@ public class CommandLoader {
 					}
 				});
 
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(Player)", "ForceCoolDownEndRewards", "(Sitename)" },
+						"VotingPlugin.Commands.AdminVote.ForceCoolDownEndRewards|" + adminPerm,
+						"Trigger CoolDownEndRewards manually") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						plugin.getRewardHandler().giveReward(user, plugin.getVoteSite(args[3], true).getSiteData(),
+								"CoolDownEndRewards", new RewardOptions());
+						sendMessage(sender, "&cCoolDownEndRewards forced on votesite " + args[3]);
+
+					}
+				});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "VoteSite", "(sitename)", "Create" },
 				"VotingPlugin.Commands.AdminVote.VoteSite.Edit|" + adminPerm, "Create VoteSite") {
 
@@ -1176,11 +1303,24 @@ 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) {
-						VoteTester.getInstance().testVotes(Integer.parseInt(args[3]), args[1], args[2]);
+						plugin.getVoteTester().testVotes(Integer.parseInt(args[3]), args[1], args[2]);
+						if (isPlayer(sender)) {
+							sendMessage(sender, "&cSee console for details");
+						}
+					}
+				});
+
+		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) {
+						plugin.getVoteTester().testSpam(Integer.parseInt(args[3]), args[1], args[2]);
 						if (isPlayer(sender)) {
 							sendMessage(sender, "&cSee console for details");
 						}
@@ -1189,11 +1329,11 @@ public class CommandLoader {
 
 		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) {
-						VoteTester.getInstance().testRewards(Integer.parseInt(args[3]), args[1], args[2]);
+						plugin.getVoteTester().testRewards(Integer.parseInt(args[3]), args[1], args[2]);
 						if (isPlayer(sender)) {
 							sendMessage(sender, "&cSee console for details");
 						}
@@ -1218,7 +1358,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());
 					}
 				});
 
@@ -1255,8 +1395,8 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						plugin.getServerData().setVotePartyExtraRequired(Integer.parseInt(args[1]));
-						sendMessage(sender, "&cSet VotePartyExtraRequired to " + args[1]);
+						plugin.getServerData().setVotePartyExtraRequired(Integer.parseInt(args[2]));
+						sendMessage(sender, "&cSet VotePartyExtraRequired to " + args[2]);
 					}
 				});
 
@@ -1267,7 +1407,7 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						RewardHandler.getInstance().giveReward(user, plugin.getConfigFile().getData(),
+						plugin.getRewardHandler().giveReward(user, plugin.getConfigFile().getData(),
 								plugin.getGui().getChestShopIdentifierRewardsPath(args[3]), new RewardOptions());
 						sendMessage(sender, "&cVoteShop " + args[3] + " forced");
 					}
@@ -1373,6 +1513,18 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "User", "(player)", "ForceAlmostAllSites" },
+				"VotingPlugin.Commands.AdminVote.ForceAllSites|" + adminPerm, "Force a almostallsites reward") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				plugin.getSpecialRewards().giveAlmostAllSitesRewards(user, user.isOnline(),
+						plugin.getBungeeSettings().isUseBungeecoord());
+				sendMessage(sender, "&cAlmostAllSites forced");
+			}
+		});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "User", "(player)", "ForceFirstVote" },
 				"VotingPlugin.Commands.AdminVote.ForceFirstVote|" + adminPerm, "Force a firstvote reward") {
 
@@ -1539,110 +1691,97 @@ public class CommandLoader {
 
 			@Override
 			public void run() {
-				com.bencodez.advancedcore.thread.Thread.getInstance().run(new Runnable() {
+				loadTabComplete();
 
-					@Override
-					public void run() {
-						loadTabComplete();
+				UserGUI.getInstance().addPluginButton(plugin,
+						new BInventoryButton("Force Vote", new String[] {}, new ItemStack(Material.STONE)) {
 
-						UserGUI.getInstance().addPluginButton(plugin,
-								new BInventoryButton("Force Vote", new String[] {}, new ItemStack(Material.STONE)) {
+							@Override
+							public void onClick(ClickEvent clickEvent) {
+								Player player = clickEvent.getPlayer();
+								ArrayList<String> voteSites = new ArrayList<String>();
+								for (VoteSite voteSite : plugin.getVoteSites()) {
+									voteSites.add(voteSite.getKey());
+								}
+								new ValueRequest().requestString(player, "",
+										ArrayUtils.getInstance().convert(voteSites), true, new StringListener() {
 
-									@Override
-									public void onClick(ClickEvent clickEvent) {
-										Player player = clickEvent.getPlayer();
-										ArrayList<String> voteSites = new ArrayList<String>();
-										for (VoteSite voteSite : plugin.getVoteSites()) {
-											voteSites.add(voteSite.getKey());
-										}
-										new ValueRequest().requestString(player, "",
-												ArrayUtils.getInstance().convert(voteSites), true,
-												new StringListener() {
+											@Override
+											public void onInput(Player player, String value) {
+												PlayerVoteEvent voteEvent = new PlayerVoteEvent(
+														plugin.getVoteSite(value, true),
+														UserGUI.getInstance().getCurrentPlayer(player),
+														plugin.getVoteSiteServiceSite(value), false);
+												plugin.getServer().getPluginManager().callEvent(voteEvent);
+
+												player.sendMessage("Forced vote for "
+														+ UserGUI.getInstance().getCurrentPlayer(player) + " on "
+														+ value);
+											}
+										});
+
+							}
+						});
+
+				UserGUI.getInstance().addPluginButton(plugin,
+						new BInventoryButton("MileStones", new String[0], new ItemStack(Material.STONE)) {
+
+							@Override
+							public void onClick(ClickEvent event) {
+
+								Player player = event.getWhoClicked();
+								String playerName = (String) event.getMeta(player, "Player");
+								BInventory inv = new BInventory("MileStones: " + playerName);
+								for (String mileStoneName : plugin.getSpecialRewardsConfig().getMilestoneVotes()) {
+									if (StringParser.getInstance().isInt(mileStoneName)) {
+										int mileStone = Integer.parseInt(mileStoneName);
+
+										inv.addButton(inv.getNextSlot(),
+												new BInventoryButton("" + mileStone, new String[] {
+														"Enabled: " + plugin.getSpecialRewardsConfig()
+																.getMilestoneRewardEnabled(mileStone),
+														"&cClick to set wether this has been completed or not" },
+														new ItemStack(Material.STONE)) {
 
 													@Override
-													public void onInput(Player player, String value) {
-														PlayerVoteEvent voteEvent = new PlayerVoteEvent(
-																plugin.getVoteSite(value, true),
-																UserGUI.getInstance().getCurrentPlayer(player),
-																plugin.getVoteSiteServiceSite(value), false);
-														plugin.getServer().getPluginManager().callEvent(voteEvent);
+													public void onClick(ClickEvent clickEvent) {
+														if (StringParser.getInstance().isInt(clickEvent.getClickedItem()
+																.getItemMeta().getDisplayName())) {
+															Player player = clickEvent.getPlayer();
+															int mileStone = Integer.parseInt(clickEvent.getClickedItem()
+																	.getItemMeta().getDisplayName());
+															String playerName = (String) event.getMeta(player,
+																	"Player");
+															VotingPluginUser user = UserManager.getInstance()
+																	.getVotingPluginUser(playerName);
+															new ValueRequest().requestBoolean(player,
+																	"" + user.hasGottenMilestone(mileStone),
+																	new BooleanListener() {
 
-														player.sendMessage("Forced vote for "
-																+ UserGUI.getInstance().getCurrentPlayer(player)
-																+ " on " + value);
+																		@Override
+																		public void onInput(Player player,
+																				boolean value) {
+																			String playerName = UserGUI.getInstance()
+																					.getCurrentPlayer(player);
+																			VotingPluginUser user = UserManager
+																					.getInstance()
+																					.getVotingPluginUser(playerName);
+																			user.setHasGotteMilestone(mileStone, value);
+																			player.sendMessage(
+																					"Set milestone completetion to "
+																							+ value + " on "
+																							+ mileStone);
+
+																		}
+																	});
+														}
 													}
 												});
-
 									}
-								});
+								}
+							}
+						});
 
-						UserGUI.getInstance().addPluginButton(plugin,
-								new BInventoryButton("MileStones", new String[0], new ItemStack(Material.STONE)) {
-
-									@Override
-									public void onClick(ClickEvent event) {
-
-										Player player = event.getWhoClicked();
-										String playerName = (String) event.getMeta(player, "Player");
-										BInventory inv = new BInventory("MileStones: " + playerName);
-										for (String mileStoneName : plugin.getSpecialRewardsConfig()
-												.getMilestoneVotes()) {
-											if (StringParser.getInstance().isInt(mileStoneName)) {
-												int mileStone = Integer.parseInt(mileStoneName);
-
-												inv.addButton(inv.getNextSlot(),
-														new BInventoryButton("" + mileStone, new String[] {
-																"Enabled: " + plugin.getSpecialRewardsConfig()
-																		.getMilestoneRewardEnabled(mileStone),
-																"&cClick to set wether this has been completed or not" },
-																new ItemStack(Material.STONE)) {
-
-															@Override
-															public void onClick(ClickEvent clickEvent) {
-																if (StringParser.getInstance()
-																		.isInt(clickEvent.getClickedItem().getItemMeta()
-																				.getDisplayName())) {
-																	Player player = clickEvent.getPlayer();
-																	int mileStone = Integer
-																			.parseInt(clickEvent.getClickedItem()
-																					.getItemMeta().getDisplayName());
-																	String playerName = (String) event.getMeta(player,
-																			"Player");
-																	VotingPluginUser user = UserManager.getInstance()
-																			.getVotingPluginUser(playerName);
-																	new ValueRequest().requestBoolean(player,
-																			"" + user.hasGottenMilestone(mileStone),
-																			new BooleanListener() {
-
-																				@Override
-																				public void onInput(Player player,
-																						boolean value) {
-																					String playerName = UserGUI
-																							.getInstance()
-																							.getCurrentPlayer(player);
-																					VotingPluginUser user = UserManager
-																							.getInstance()
-																							.getVotingPluginUser(
-																									playerName);
-																					user.setHasGotteMilestone(mileStone,
-																							value);
-																					player.sendMessage(
-																							"Set milestone completetion to "
-																									+ value + " on "
-																									+ mileStone);
-
-																				}
-																			});
-																}
-															}
-														});
-											}
-										}
-									}
-								});
-
-					}
-				});
 			}
 
 		});
@@ -1839,7 +1978,7 @@ public class CommandLoader {
 										placeholders.put("limit", "" + limit);
 										if (user.removePoints(points)) {
 
-											RewardHandler.getInstance().giveReward(user, plugin.getGui().getData(),
+											plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
 													plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
 													new RewardOptions().setPlaceholders(placeholders));
 
@@ -2011,7 +2150,7 @@ public class CommandLoader {
 			}
 		});
 
-		if (plugin.getGui().isLastMonthGUI()) {
+		if (plugin.getGui().isLastMonthGUI() || plugin.getOptions().getDebug().equals(DebugLevel.DEV)) {
 			plugin.getVoteCommand()
 					.add(new CommandHandler(new String[] { "LastMonthTop" },
 							"VotingPlugin.Commands.Vote.LastMonthTop|" + playerPerm,
@@ -2113,20 +2252,34 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				ArrayList<String> msg = new ArrayList<String>();
 
-				ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
-
 				int daily = 0;
 				int weekly = 0;
 				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);
+				for (TopVoter top : TopVoter.values()) {
+					int cTotal = 0;
+					ArrayList<Integer> nums = plugin.getUserManager().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;
+
+					}
 				}
 
 				for (String s : plugin.getConfigFile().getFormatCommandsVoteTotalAll()) {

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

@@ -21,7 +21,6 @@ import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueSt
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.PlayerUtils;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.valuerequest.InputMethod;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
@@ -66,6 +65,7 @@ public class AdminGUI {
 							plugin.getConfigVoteSites().generateVoteSite(value);
 							player.sendMessage("Generated site");
 							plugin.reload();
+							openAdminGUIVoteSiteSite(player, plugin.getVoteSite(value, true));
 						}
 					});
 				} else {
@@ -110,7 +110,7 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("FirstVote"));
+						plugin.getRewardHandler().getDirectlyDefined("FirstVote"));
 			}
 		});
 		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit FirstVoteToday reward")) {
@@ -118,7 +118,7 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("FirstVoteToday"));
+						plugin.getRewardHandler().getDirectlyDefined("FirstVoteToday"));
 			}
 		});
 
@@ -127,7 +127,16 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("AllSites"));
+						plugin.getRewardHandler().getDirectlyDefined("AllSites"));
+			}
+		});
+
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit AlmostAllSites reward")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						plugin.getRewardHandler().getDirectlyDefined("AlmostAllSites"));
 			}
 		});
 
@@ -136,7 +145,7 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("AnySiteRewards"));
+						plugin.getRewardHandler().getDirectlyDefined("AnySiteRewards"));
 			}
 		});
 
@@ -145,7 +154,7 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("EverySiteReward"));
+						plugin.getRewardHandler().getDirectlyDefined("EverySiteReward"));
 			}
 		});
 
@@ -154,7 +163,7 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("BungeeVotePartyRewards"));
+						plugin.getRewardHandler().getDirectlyDefined("BungeeVotePartyRewards"));
 			}
 		});
 
@@ -174,6 +183,17 @@ public class AdminGUI {
 			}
 
 		});
+
+		buttons.add(new BInventoryButton(
+				new ItemBuilder(Material.STONE, 1).setName("&cBackground task time").addLoreLine("&aClick to see")) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				event.getPlayer().sendMessage("Last background task time: " + plugin.getLastBackgroundTaskTimeTaken());
+			}
+
+		});
+
 		return buttons;
 	}
 
@@ -242,7 +262,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)
@@ -364,12 +390,35 @@ public class AdminGUI {
 
 				@Override
 				public void onClick(ClickEvent clickEvent) {
-					RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(), RewardHandler.getInstance()
+					RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(), plugin.getRewardHandler()
 							.getDirectlyDefined("VoteSites." + voteSite.getKey() + ".Rewards"));
 				}
 			});
 		}
 
+		if (voteSite.getSiteData().isList("CoolDownEndRewards")) {
+
+			inv.addButton(new EditGUIButton(new EditGUIValueList("CoolDownEndRewards",
+					voteSite.getSiteData().getStringList("CoolDownEndRewards")) {
+
+				@Override
+				public void setValue(Player p, ArrayList<String> rewards) {
+					VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
+					plugin.getConfigVoteSites().set(voteSite.getKey(), "CoolDownEndRewards", rewards);
+					plugin.reload();
+				}
+			}));
+		} else {
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.DISPENSER, 1).setName("&cCoolDownEndRewards")) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(), plugin.getRewardHandler()
+							.getDirectlyDefined("VoteSites." + voteSite.getKey() + ".CoolDownEndRewards"));
+				}
+			});
+		}
+
 		inv.openInventory(player);
 	}
 }

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

@@ -38,14 +38,14 @@ public class AdminVotePlaceholders extends GUIHandler {
 
 		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getPlaceholders()) {
 			String msg = "";
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg = "VotingPlugin_" + identifier + " - " + placeholder.getDescription();
+				msg = "votingplugin_" + identifier + " - " + placeholder.getDescription();
 			} else {
-				msg = "VotingPlugin_" + identifier + "";
+				msg = "votingplugin_" + identifier + "";
 			}
 
 			Layout layout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
@@ -56,14 +56,14 @@ public class AdminVotePlaceholders extends GUIHandler {
 
 		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getNonPlayerPlaceholders()) {
 			String msg = "";
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg = "VotingPlugin_" + identifier + " - " + placeholder.getDescription();
+				msg = "votingplugin_" + identifier + " - " + placeholder.getDescription();
 			} else {
-				msg = "VotingPlugin_" + identifier + "";
+				msg = "votingplugin_" + identifier + "";
 			}
 
 			Layout layout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
@@ -82,26 +82,26 @@ public class AdminVotePlaceholders extends GUIHandler {
 		ArrayList<String> msg = new ArrayList<String>();
 		msg.add("&cPlaceholders:");
 		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getPlaceholders()) {
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg.add("VotingPlugin_" + identifier + " - " + placeholder.getDescription());
+				msg.add("votingplugin_" + identifier + " - " + placeholder.getDescription());
 			} else {
-				msg.add("VotingPlugin_" + identifier + "");
+				msg.add("votingplugin_" + identifier + "");
 			}
 		}
 
 		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getNonPlayerPlaceholders()) {
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg.add("VotingPlugin_" + identifier + " - " + placeholder.getDescription());
+				msg.add("votingplugin_" + identifier + " - " + placeholder.getDescription());
 			} else {
-				msg.add("VotingPlugin_" + identifier + "");
+				msg.add("votingplugin_" + identifier + "");
 			}
 		}
 

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

@@ -40,7 +40,7 @@ public class AdminVotePlaceholdersPlayer extends GUIHandler {
 		BookWrapper book = new BookWrapper("Placeholders");
 
 		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getPlaceholders()) {
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "1";
 			}
@@ -54,7 +54,7 @@ public class AdminVotePlaceholdersPlayer extends GUIHandler {
 
 		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getNonPlayerPlaceholders()) {
 
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "1";
 			}
@@ -78,20 +78,20 @@ public class AdminVotePlaceholdersPlayer extends GUIHandler {
 			placeholderUser = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
 		}
 		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getPlaceholders()) {
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "1";
 			}
-			msg.add("VotingPlugin_" + identifier + " = " + placeholder.placeholderRequest(placeholderUser, identifier));
+			msg.add("votingplugin_" + identifier + " = " + placeholder.placeholderRequest(placeholderUser, identifier));
 		}
 
 		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getNonPlayerPlaceholders()) {
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "1";
 			}
 
-			msg.add("VotingPlugin_" + identifier + " = " + placeholder.placeholderRequest(identifier));
+			msg.add("votingplugin_" + identifier + " = " + placeholder.placeholderRequest(identifier));
 		}
 		sendMessage(msg);
 	}

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

@@ -17,7 +17,6 @@ import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueLi
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueNumber;
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
 import com.bencodez.advancedcore.api.valuerequest.listeners.NumberListener;
 import com.bencodez.advancedcore.command.gui.RewardEditGUI;
@@ -197,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) {
@@ -212,7 +211,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("VoteParty.Rewards"));
+						plugin.getRewardHandler().getDirectlyDefined("VoteParty.Rewards"));
 			}
 		});
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/cumulative/AdminVoteCumulative.java

@@ -13,7 +13,6 @@ 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.messages.StringParser;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.valuerequest.InputMethod;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
@@ -68,7 +67,7 @@ public class AdminVoteCumulative extends GUIHandler {
 							@Override
 							public void onInput(Player player, Number value) {
 								RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-										RewardHandler.getInstance()
+										plugin.getRewardHandler()
 												.getDirectlyDefined("Cumulative." + value.intValue() + ".Rewards"));
 							}
 						}, options).allowCustomOption(false).usingMethod(InputMethod.INVENTORY)

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/milestones/AdminVoteMilestones.java

@@ -13,7 +13,6 @@ 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.messages.StringParser;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.valuerequest.InputMethod;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
@@ -68,7 +67,7 @@ public class AdminVoteMilestones extends GUIHandler {
 							@Override
 							public void onInput(Player player, Number value) {
 								RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-										RewardHandler.getInstance()
+										plugin.getRewardHandler()
 												.getDirectlyDefined("MileStones." + value.intValue() + ".Rewards"));
 							}
 						}, options).allowCustomOption(false).usingMethod(InputMethod.INVENTORY)

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/voteshop/AdminVoteVoteShopItem.java

@@ -17,7 +17,6 @@ import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueLi
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueNumber;
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.command.gui.RewardEditGUI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
@@ -86,7 +85,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 
 		// display item
 		ConfigurationSection displayItemData = plugin.getGui().getChestShopIdentifierSection(identifier);
-		inv.addButton(new EditGUIButton(new ItemBuilder(Material.valueOf(displayItemData.getString("Material")), 1),
+		inv.addButton(new EditGUIButton(new ItemBuilder(displayItemData.getString("Material")).setAmount(1),
 				new EditGUIValueString("Material", displayItemData.getString("Material")) {
 
 					@Override
@@ -115,7 +114,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("CHEST.Shop." + identifier + ".Rewards"));
+						plugin.getRewardHandler().getDirectlyDefined("CHEST.Shop." + identifier + ".Rewards"));
 			}
 		});
 

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,22 @@ 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 + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
 		inv.openInventory(player);
 	}
 

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

@@ -9,13 +9,14 @@ 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.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
@@ -43,15 +44,15 @@ public class VoteGUI extends GUIHandler {
 
 		String str = plugin.getConfigFile().getVoteTopDefault();
 		if (lore.length == 0) {
-			if (slot.equalsIgnoreCase("url")) {
+			if (StringParser.getInstance().startsWithIgnoreCase(slot, "url")) {
 				lore = new String[] { "&aClick me" };
-			} else if (slot.equalsIgnoreCase("next")) {
+			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "next")) {
 				lore = ArrayUtils.getInstance().convert(new VoteNext(plugin, player, user).getChat(player));
-			} else if (slot.equalsIgnoreCase("last")) {
+			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "last")) {
 				lore = ArrayUtils.getInstance().convert(new VoteLast(plugin, player, user).getChat(player));
-			} else if (slot.equalsIgnoreCase("total")) {
+			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "total")) {
 				lore = ArrayUtils.getInstance().convert(new VoteTotal(plugin, player, user).getChat(player));
-			} else if (slot.equalsIgnoreCase("top")) {
+			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "top")) {
 
 				if (str.equalsIgnoreCase("monthly")) {
 					lore = plugin.getTopVoterHandler().topVoterMonthly(1);
@@ -137,11 +138,12 @@ public class VoteGUI extends GUIHandler {
 		inv.addPlaceholder("points", "" + user.getPoints());
 		inv.addPlaceholder("player", user.getPlayerName());
 		inv.addPlaceholder("top", plugin.getConfigFile().getVoteTopDefault());
+		inv.addPlaceholder("sitesavailable", "" + user.getSitesNotVotedOn());
 
-		for (String slot : plugin.getGui().getChestVoteGUISlots()) {
+		for (final String slot : plugin.getGui().getChestVoteGUISlots()) {
 			ItemBuilder builder = getItemSlot(slot, player);
 
-			inv.addButton(new UpdatingBInventoryButton(builder, 1000, 1000) {
+			inv.addButton(new UpdatingBInventoryButton(plugin, builder, 1000, 1000) {
 
 				@Override
 				public void onClick(ClickEvent event) {
@@ -159,35 +161,15 @@ public class VoteGUI extends GUIHandler {
 							}
 						});
 					} else {
-						if (slot.equalsIgnoreCase("url")) {
-							new VoteURL(plugin, player, user, true).open();
-						} else if (slot.equalsIgnoreCase("next")) {
-							new VoteNext(plugin, player, user).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("last")) {
-							new VoteLast(plugin, player, user).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("total")) {
-							new VoteTotal(plugin, player, user).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("top")) {
-							new VoteTopVoter(plugin, player, user, TopVoter.getDefault(), 1).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("today")) {
-							new VoteToday(plugin, player, user, 1).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("help")) {
-							player.performCommand("vote help");
-						} else if (slot.equalsIgnoreCase("shop")) {
-							new VoteShop(plugin, player, user).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("lastmonth")) {
-							new VoteTopVoterLastMonth(plugin, player, user).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("best")) {
-							new VoteBest(plugin, player, user).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("streak")) {
-							new VoteStreak(plugin, player, user).open(GUIMethod.CHEST);
-						}
+						plugin.getCommandLoader().processSlotClick(player, user, slot);
 					}
 
-					if (RewardHandler.getInstance().hasRewards(plugin.getGui().getData(),
-							plugin.getGui().getChestVoteGUISlotRewardsPath(slot))) {
-						RewardHandler.getInstance().giveReward(UserManager.getInstance().getVotingPluginUser(player),
-								plugin.getGui().getData(), plugin.getGui().getChestVoteGUISlotRewardsPath(slot),
+					if (plugin.getRewardHandler().hasRewards(plugin.getGui().getData(), plugin.getGui()
+							.getChestVoteGUISlotRewardsPath(slot, event.getButton().getLastRewardsPath(player)))) {
+						plugin.getRewardHandler().giveReward(UserManager.getInstance().getVotingPluginUser(player),
+								plugin.getGui().getData(),
+								plugin.getGui().getChestVoteGUISlotRewardsPath(slot,
+										event.getButton().getLastRewardsPath(player)),
 								new RewardOptions().addPlaceholder("identifier", slot));
 					}
 				}
@@ -199,12 +181,29 @@ public class VoteGUI extends GUIHandler {
 					item.addPlaceholder("points", "" + user.getPoints());
 					item.addPlaceholder("player", user.getPlayerName());
 					item.addPlaceholder("top", plugin.getConfigFile().getVoteTopDefault());
+					item.addPlaceholder("sitesavailable", "" + user.getSitesNotVotedOn());
 					return item;
 				}
 
 			});
 		}
 
+		String guiPath = "VoteGUI";
+		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 + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
 		inv.openInventory(player);
 	}
 

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

@@ -8,13 +8,16 @@ 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;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteLast extends GUIHandler {
@@ -63,12 +66,28 @@ public class VoteLast extends GUIHandler {
 		for (VoteSite site : plugin.getVoteSites()) {
 			if (!site.isHidden()) {
 				inv.addButton(inv.getNextSlot(),
-						new UpdatingBInventoryButton(site.getItem().setName(site.getDisplayName())
+						new UpdatingBInventoryButton(plugin, site.getItem().setName(site.getDisplayName())
 								.setLore(user.voteCommandLastGUILine(site)).setAmountNone(1), 1000, 1000) {
 
 							@Override
-							public void onClick(ClickEvent clickEvent) {
+							public void onClick(ClickEvent event) {
+								if (plugin.getGui().isChestVoteLastClickableLinks()) {
+									Player player = event.getPlayer();
+									if (player != null) {
+										VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
+										user.sendMessage(
+												StringParser.getInstance()
+														.replacePlaceHolder(
+																StringParser.getInstance().replacePlaceHolder(
+																		StringParser.getInstance()
+																				.replacePlaceHolder(plugin.getGui()
+																						.getChestVoteURLURLText(),
+																						"voteurl", site.getVoteURL()),
+																		"sitename", site.getDisplayName()),
+																"player", player.getName()));
 
+									}
+								}
 							}
 
 							@Override
@@ -80,6 +99,22 @@ 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 + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.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;
@@ -87,9 +89,15 @@ public class VoteNext extends GUIHandler {
 		inv.addPlaceholder("player", user.getPlayerName());
 		for (VoteSite site : plugin.getVoteSites()) {
 			if (!site.isHidden()) {
+				String siteNameDisplay = plugin.getGui().getChestVoteNextCustomSiteNamesDisplays(site.getKey());
+				if (siteNameDisplay.isEmpty()) {
+					siteNameDisplay = site.getDisplayName();
+				}
 				inv.addButton(inv.getNextSlot(),
-						new UpdatingBInventoryButton(site.getItem().setName(site.getDisplayName())
-								.setLore(user.voteCommandNextInfo(site)).setAmountNone(1), 1000, 1000) {
+						new UpdatingBInventoryButton(plugin, site.getItem().setName(siteNameDisplay)
+								.setLore(StringParser.getInstance().replacePlaceHolder(
+										plugin.getGui().getChestVoteNextLine(), "time", user.voteCommandNextInfo(site)))
+								.setAmountNone(1), 1000, 1000) {
 
 							@Override
 							public void onClick(ClickEvent clickEvent) {
@@ -106,6 +114,22 @@ 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 + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
 		if (plugin.getGui().getChestVoteNextBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}

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

@@ -13,7 +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.messages.StringParser;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.UserManager;
@@ -56,6 +56,7 @@ public class VoteShop extends GUIHandler {
 		}
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteShopName());
 		inv.addPlaceholder("points", "" + user.getPoints());
+		inv.addPlaceholder("sitesavailable", "" + user.getSitesNotVotedOn());
 		inv.dontClose();
 
 		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
@@ -65,7 +66,11 @@ public class VoteShop extends GUIHandler {
 			if (perm.isEmpty()) {
 				hasPerm = true;
 			} else {
-				hasPerm = player.hasPermission(perm);
+				if (perm.startsWith("!")) {
+					hasPerm = !player.hasPermission(perm.substring(1));
+				} else {
+					hasPerm = player.hasPermission(perm);
+				}
 			}
 
 			int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
@@ -88,15 +93,15 @@ public class VoteShop extends GUIHandler {
 							Player player = event.getWhoClicked();
 
 							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-							user.clearCache();
+							user.cache();
 
 							String identifier = (String) getData("identifier");
 							int limit = (int) getData("Limit");
 							int points = plugin.getGui().getChestShopIdentifierCost(identifier);
 							if (identifier != null) {
-								if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {
-									event.getButton().getInv().closeInv(player, null);
-								}
+								// if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {
+								// event.closeInventory();
+								// }
 
 								// limit fail-safe, should never be needed, except in rare cases
 								boolean limitPass = true;
@@ -117,7 +122,7 @@ public class VoteShop extends GUIHandler {
 											plugin.getLogger().info("VoteShop: " + user.getPlayerName() + "/"
 													+ user.getUUID() + " bought " + identifier + " for " + points);
 
-											RewardHandler.getInstance().giveReward(user, plugin.getGui().getData(),
+											plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
 													plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
 													new RewardOptions().setPlaceholders(placeholders));
 
@@ -139,6 +144,7 @@ public class VoteShop extends GUIHandler {
 								} else {
 									user.sendMessage(plugin.getGui().getChestVoteShopLimitReached());
 								}
+								plugin.getCommandLoader().processSlotClick(player, user, identifier);
 							}
 						}
 
@@ -151,14 +157,27 @@ public class VoteShop extends GUIHandler {
 
 						@Override
 						public void onClick(ClickEvent event) {
-
+							user.sendMessage(plugin.getConfigFile().getFormatShopNotPurchasable());
 						}
 
-					}.dontClose().addData("identifier", identifier).addData("Limit", limit));
+					}.addData("identifier", identifier).addData("Limit", limit));
 				}
 			}
 		}
 
+		for (final String str : plugin.getGui().getChestGUIVoteShopExtraItems()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIVoteShopExtraItems(str))) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					plugin.getCommandLoader().processSlotClick(player, user, str);
+					new RewardBuilder(plugin.getGui().getData(),
+							"CHEST.VoteShopExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
+							.setGiveOffline(false).send(clickEvent.getPlayer());
+				}
+			});
+		}
+
 		if (plugin.getGui().getChestVoteShopBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}

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

@@ -14,7 +14,6 @@ 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.PlayerUtils;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -54,7 +53,7 @@ public class VoteShopConfirm extends GUIHandler {
 
 			@Override
 			public void onClick(ClickEvent event) {
-				user.clearCache();
+				user.cache();
 				int points = plugin.getGui().getChestShopIdentifierCost(identifier);
 				int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
 				HashMap<String, String> placeholders = new HashMap<String, String>();
@@ -65,7 +64,7 @@ public class VoteShopConfirm extends GUIHandler {
 					plugin.getLogger().info("VoteShop: " + user.getPlayerName() + "/" + user.getUUID() + " bought "
 							+ identifier + " for " + points);
 
-					RewardHandler.getInstance().giveReward(user, plugin.getGui().getData(),
+					plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
 							plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
 							new RewardOptions().setPlaceholders(placeholders));
 

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;
 
@@ -119,6 +120,22 @@ 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 + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.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,22 @@ 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 + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
 
 		if (plugin.getGui().getChestVoteTodayBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));

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

@@ -2,11 +2,15 @@ package com.bencodez.votingplugin.commands.gui.player;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map.Entry;
+import java.util.Queue;
 import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
@@ -17,6 +21,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.topvoter.TopVoter;
 import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
@@ -78,6 +83,15 @@ public class VoteTopVoter extends GUIHandler {
 					.getTopVoter(top).clone();
 			users = topVotes.entrySet();
 
+			ConfigurationSection customization = plugin.getGui().getChestVoteTopCustomization();
+			boolean customzationEnabled = false;
+			Queue<Integer> playerSlots = new ConcurrentLinkedQueue<Integer>();
+			if (customization != null) {
+				customzationEnabled = customization.getBoolean("Enabled");
+				List<Integer> customizationPlayerSlots = customization.getIntegerList("PlayerSlots");
+				playerSlots.addAll(customizationPlayerSlots);
+			}
+
 			BInventory inv = new BInventory(plugin.getGui().getChestVoteTopName());
 			inv.addPlaceholder("topvoter", topVoter);
 			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
@@ -86,6 +100,7 @@ public class VoteTopVoter extends GUIHandler {
 
 			int pos = 1;
 			for (Entry<TopVoterPlayer, Integer> entry : users) {
+
 				ItemBuilder playerItem = new ItemBuilder(Material.PAPER);
 
 				if (plugin.getGui().isChestVoteTopUseSkull()) {
@@ -96,7 +111,8 @@ public class VoteTopVoter extends GUIHandler {
 
 				playerItem.setLore(new ArrayList<String>());
 
-				inv.addButton(new BInventoryButton(playerItem.setName(plugin.getGui().getChestVoteTopItemName())
+				BInventoryButton button = new BInventoryButton(playerItem
+						.setName(plugin.getGui().getChestVoteTopItemName())
 						.addLoreLine(plugin.getGui().getChestVoteTopItemLore()).addPlaceholder("position", "" + pos)
 						.addPlaceholder("player", entry.getKey().getPlayerName())
 						.addPlaceholder("votes", "" + entry.getValue())) {
@@ -107,33 +123,85 @@ public class VoteTopVoter extends GUIHandler {
 							TopVoterPlayer user = (TopVoterPlayer) getData("User");
 							new VoteGUI(plugin, player, user.getUser())
 									.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
-						} else {
-							getInv().forceClose(clickEvent.getPlayer());
 						}
 					}
-				}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
+				}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey());
+
+				if (customzationEnabled && !playerSlots.isEmpty()) {
+					button.setSlot(playerSlots.remove());
+				}
+
+				inv.setCloseInv(plugin.getGui().getChestVoteTopCloseGUIOnClick());
+
+				inv.addButton(button);
 				pos++;
 			}
 
-			final TopVoter cur = top;
-			inv.getPageButtons().add(new BInventoryButton(
-					new ItemBuilder(plugin.getGui().getChestVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
-
-				@Override
-				public void onClick(ClickEvent clickEvent) {
-					if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
-						new VoteTopVoter(plugin, player, user, cur.next(), 0).open(GUIMethod.CHEST);
-					} else {
-						new VoteTopVoter(plugin, player, user, cur.prev(), 0).open(GUIMethod.CHEST);
-					}
+			TopVoter newTops = top;
+			ArrayList<String> tops = plugin.getGui().getChestVoteTopSwitchItemTopVoters();
+			if (!tops.isEmpty()) {
+				for (String name : tops) {
+					newTops.getSwitchItems().add(TopVoter.getTopVoter(name));
 				}
-			});
-
-			if (plugin.getGui().getChestVoteTopBackButton()) {
-				inv.getPageButtons().add(plugin.getCommandLoader().getBackButton(user).setSlot(1));
 			}
 
-			inv.setPages(true);
+			final TopVoter cur = newTops;
+			if (!customzationEnabled) {
+				inv.getPageButtons().add(new BInventoryButton(
+						new ItemBuilder(plugin.getGui().getChestVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
+							new VoteTopVoter(plugin, player, user, cur.next(), 0).open(GUIMethod.CHEST);
+						} else {
+							new VoteTopVoter(plugin, player, user, cur.prev(), 0).open(GUIMethod.CHEST);
+						}
+					}
+				});
+			} else {
+				inv.addButton(new BInventoryButton(
+						new ItemBuilder(plugin.getGui().getChestVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
+							new VoteTopVoter(plugin, player, user, cur.next(), 0).open(GUIMethod.CHEST);
+						} else {
+							new VoteTopVoter(plugin, player, user, cur.prev(), 0).open(GUIMethod.CHEST);
+						}
+					}
+				});
+			}
+
+			if (plugin.getGui().getChestVoteTopBackButton()) {
+				if (customzationEnabled) {
+					inv.addButton(plugin.getCommandLoader().getBackButton(user)
+							.setSlot(customization.getInt("BackButtonSlot", 0)));
+				} else {
+					inv.getPageButtons().add(plugin.getCommandLoader().getBackButton(user).setSlot(1));
+				}
+			}
+
+			String guiPath = "VoteTop.Customization";
+			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) {
+								plugin.getCommandLoader().processSlotClick(player, user, str);
+								new RewardBuilder(plugin.getGui().getData(),
+										"CHEST." + guiPath + ".ExtraItems." + str + ".Rewards").setGiveOffline(false)
+										.send(clickEvent.getPlayer());
+
+							}
+						});
+			}
+
+			if (customization == null || (customzationEnabled && !customization.getBoolean("RemoveBottomBar"))) {
+				inv.setPages(true);
+			}
 			inv.setMaxInvSize(plugin.getGui().getChestVoteTopSize());
 			inv.openInventory(player);
 		} catch (Exception e) {

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;
@@ -65,7 +67,7 @@ public class VoteTotal extends GUIHandler {
 		inv.addPlaceholder("player", user.getPlayerName());
 
 		for (final TopVoter top : TopVoter.values()) {
-			inv.addButton(new UpdatingBInventoryButton(
+			inv.addButton(new UpdatingBInventoryButton(plugin,
 					new ItemBuilder(plugin.getGui().getChestVoteTotalItem(top))
 							.addPlaceholder("Total", "" + user.getTotal(top)).addPlaceholder("topvoter", top.getName()),
 					1000, 1000) {
@@ -84,6 +86,22 @@ 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 + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
 		if (plugin.getGui().getChestVoteTotalBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}

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

@@ -165,7 +165,7 @@ public class VoteURL extends GUIHandler {
 		if (plugin.getGui().getChestVoteURLViewAllUrlsButtonEnabled()) {
 			ItemBuilder builderAll = getItemAll();
 
-			inv.addButton(new UpdatingBInventoryButton(builderAll, 5000, 5000) {
+			inv.addButton(new UpdatingBInventoryButton(plugin, builderAll, 5000, 5000) {
 
 				@Override
 				public void onClick(ClickEvent event) {
@@ -190,7 +190,7 @@ public class VoteURL extends GUIHandler {
 					startSlot++;
 				}
 
-				inv.addButton(new UpdatingBInventoryButton(builder, 5000, 5000) {
+				inv.addButton(new UpdatingBInventoryButton(plugin, builder, 5000, 5000) {
 
 					@Override
 					public void onClick(ClickEvent event) {
@@ -221,7 +221,8 @@ public class VoteURL extends GUIHandler {
 
 				@Override
 				public void onClick(ClickEvent clickEvent) {
-					new RewardBuilder(plugin.getGui().getData(), "CHEST.VoteURL.ExtraItems." + str + ".Rewards")
+					new RewardBuilder(plugin.getGui().getData(),
+							"CHEST.VoteURL.ExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
 							.setGiveOffline(false).send(clickEvent.getPlayer());
 
 				}

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

@@ -69,7 +69,7 @@ public class VoteURLVoteSite extends GUIHandler {
 					}
 				});
 
-		inv.addButton(new UpdatingBInventoryButton(
+		inv.addButton(new UpdatingBInventoryButton(plugin,
 				new ItemBuilder(Material.COMPASS).setName("&4Next Vote").addLoreLine(user.voteCommandNextInfo(site)),
 				1000, 1000) {
 

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;
 
@@ -81,6 +83,18 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private boolean disableBroadcast = false;
 
+	@ConfigDataBoolean(path = "GlobalData.UseMainMySQL")
+	@Getter
+	private boolean globlalDataUseMainMySQL = true;
+
+	@ConfigDataBoolean(path = "GlobalData.Enabled")
+	@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;
@@ -33,6 +34,14 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean addTotals = true;
 
+	@ConfigDataBoolean(path = "PerSiteCoolDownEvents")
+	@Getter
+	private boolean perSiteCoolDownEvents = false;
+
+	@ConfigDataBoolean(path = "QueueVotesDuringTimeChange")
+	@Getter
+	private boolean queueVotesDuringTimeChange = false;
+
 	@ConfigDataBoolean(path = "AllowUnjoined")
 	@Getter
 	private boolean allowUnjoined = false;
@@ -41,18 +50,10 @@ 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;
 
-	@ConfigDataInt(path = "PlayerDataLoadLimit")
-	@Getter
-	private int playerDataLoadLimit = -1;
-
 	@ConfigDataBoolean(path = "AllowVotePointTransfers")
 	@Getter
 	private boolean allowVotePointTransfers = false;
@@ -69,10 +70,6 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean alwaysUpdate = false;
 
-	@ConfigDataBoolean(path = "AlwaysWaitForCachePlaceholders")
-	@Getter
-	private boolean alwaysWaitForCachePlaceholders = false;
-
 	@ConfigDataBoolean(path = "AutoCreateVoteSites")
 	@Getter
 	private boolean autoCreateVoteSites = true;
@@ -89,10 +86,6 @@ public class Config extends YMLFile {
 	@Getter
 	private int delayBetweenUpdates = 3;
 
-	@ConfigDataInt(path = "DelayLoginEvent")
-	@Getter
-	private int delayLoginEvent = 0;
-
 	@ConfigDataBoolean(path = "DisableAdvancedTab")
 	@Getter
 	private boolean disableAdvancedTab = false;
@@ -149,6 +142,14 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean formatAlternateBroadcastEnabled = false;
 
+	@ConfigDataBoolean(path = "Format.OnlyOneOfflineBroadcast")
+	@Getter
+	private boolean formatOnlyOneOfflineBroadcast = false;
+
+	@ConfigDataString(path = "Format.OfflineBroadcast")
+	@Getter
+	private String formatOfflineBroadcast = "&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %numberofvotes% times!";
+
 	@ConfigDataBoolean(path = "Format.Commands.Vote.ForceLinks")
 	@Getter
 	private boolean formatCommandsVoteForceLinks = true;
@@ -303,6 +304,26 @@ public class Config extends YMLFile {
 		return str;
 	}
 
+	public Set<String> getCustomPlaceholderReturns() {
+		Set<String> str = getData().getConfigurationSection("CustomPlaceholderReturns").getKeys(false);
+		if (str == null) {
+			str = new HashSet<String>();
+		}
+		return str;
+	}
+
+	public Set<String> getCustomPlaceholderReturns(String placeholder) {
+		Set<String> str = getData().getConfigurationSection("CustomPlaceholderReturns." + placeholder).getKeys(false);
+		if (str == null) {
+			str = new HashSet<String>();
+		}
+		return str;
+	}
+
+	public String getCustomPlaceholderReturns(String placeholder, String returnString) {
+		return getData().getString("CustomPlaceholderReturns." + placeholder + "." + returnString, "");
+	}
+
 	public ConfigurationSection getCustomCommands(String ident) {
 		return getData().getConfigurationSection("CustomCommands." + ident);
 	}
@@ -420,6 +441,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.
 	 *
@@ -562,10 +587,11 @@ public class Config extends YMLFile {
 	}
 
 	public String getFormatShopFailedMsg() {
-		String msg = getData().getString("Format.ShopFailed", "&cYou do not have %Points% points to purhcase this!");
-
-		return msg;
+		return getData().getString("Format.ShopFailed", "&cYou do not have %Points% points to purhcase this!");
+	}
 
+	public String getFormatShopNotPurchasable() {
+		return getData().getString("Format.ShopNotPurchasable", "&cThis item is not buyable!");
 	}
 
 	public String getFormatShopPurchaseMsg() {

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

@@ -130,12 +130,12 @@ public class ConfigVoteSites extends YMLFile {
 	 * @param siteName the site name
 	 * @return the vote delay
 	 */
-	public int getVoteDelay(String siteName) {
-		return getData(siteName).getInt("VoteDelay", 24);
+	public double getVoteDelay(String siteName) {
+		return getData(siteName).getDouble("VoteDelay", 24);
 	}
 
-	public int getVoteDelayMin(String siteName) {
-		return getData(siteName).getInt("VoteDelayMin", 0);
+	public double getVoteDelayMin(String siteName) {
+		return getData(siteName).getDouble("VoteDelayMin", 0);
 	}
 
 	/**
@@ -199,7 +199,9 @@ public class ConfigVoteSites extends YMLFile {
 					if (!siteCheck(site)) {
 						plugin.getLogger().warning("Failed to load site " + site + ", see above");
 					} else {
-						voteSites.add(new VoteSite(plugin, site));
+						VoteSite voteSite = new VoteSite(plugin, site);
+						plugin.debug(voteSite.loadingDebug());
+						voteSites.add(voteSite);
 					}
 				}
 			}
@@ -393,7 +395,7 @@ public class ConfigVoteSites extends YMLFile {
 	 * @param siteName  the site name
 	 * @param voteDelay the vote delay
 	 */
-	public void setVoteDelay(String siteName, int voteDelay) {
+	public void setVoteDelay(String siteName, double voteDelay) {
 		set(siteName, "VoteDelay", voteDelay);
 	}
 

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

@@ -146,6 +146,10 @@ public class GUI extends YMLFile {
 	@Getter
 	private boolean lastMonthGUI = false;
 
+	@ConfigDataBoolean(path = "CHEST.VoteLast.ClickableLinks")
+	@Getter
+	private boolean chestVoteLastClickableLinks = true;
+
 	private VotingPluginMain plugin;
 
 	public GUI(VotingPluginMain plugin) {
@@ -187,7 +191,6 @@ public class GUI extends YMLFile {
 
 	public String getChestShopIdentifierRewardsPath(String identifier) {
 		return "CHEST.Shop." + identifier + ".Rewards";
-
 	}
 
 	public Set<String> getChestShopIdentifiers() {
@@ -244,8 +247,8 @@ public class GUI extends YMLFile {
 		return (ArrayList<String>) getData().getList("CHEST.VoteGUI." + slot + ".Item.Lore", new ArrayList<String>());
 	}
 
-	public String getChestVoteGUISlotRewardsPath(String slot) {
-		return "CHEST.VoteGUI." + slot + ".Rewards";
+	public String getChestVoteGUISlotRewardsPath(String slot, String lastPath) {
+		return "CHEST.VoteGUI." + slot + "." + lastPath;
 	}
 
 	/**
@@ -265,6 +268,10 @@ public class GUI extends YMLFile {
 		return getData().getConfigurationSection("CHEST.VoteGUI." + slot + ".Item");
 	}
 
+	public ConfigurationSection getChestVoteTopCustomization() {
+		return getData().getConfigurationSection("CHEST.VoteTop.Customization");
+	}
+
 	/**
 	 * Gets the vote GUI slot slot.
 	 *
@@ -294,6 +301,14 @@ public class GUI extends YMLFile {
 	public String getChestVoteNextName() {
 		return getData().getString("CHEST.VoteNext.Name", "VoteNext: %player%");
 	}
+	
+	public String getChestVoteNextLine() {
+		return getData().getString("CHEST.VoteNext.Line", "%time%");
+	}
+	
+	public String getChestVoteNextCustomSiteNamesDisplays(String site) {
+		return getData().getString("CHEST.VoteNext.CustomSiteNamesDisplays." + site, "");
+	}
 
 	public String getChestVoteRewardName() {
 		return getData().getString("CHEST.VoteRewardName", "VoteReward");
@@ -400,6 +415,10 @@ public class GUI extends YMLFile {
 		return getData().getBoolean("CHEST.VoteTop.OpenMainGUIOnClick", true);
 	}
 
+	public boolean getChestVoteTopCloseGUIOnClick() {
+		return getData().getBoolean("CHEST.VoteTop.CloseGUIOnClick", true);
+	}
+
 	public int getChestVoteTopSize() {
 		return getData().getInt("CHEST.VoteTop.Size", 27);
 	}
@@ -408,6 +427,11 @@ public class GUI extends YMLFile {
 		return getData().getConfigurationSection("CHEST.VoteTop.SwitchItem");
 	}
 
+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getChestVoteTopSwitchItemTopVoters() {
+		return (ArrayList<String>) getData().getList("CHEST.VoteTop.SwitchItem.TopVoters", new ArrayList<String>());
+	}
+
 	public ConfigurationSection getChestVoteTotalAllTimeTotalItem() {
 		return getData().getConfigurationSection("CHEST.VoteTotal.AllTimeTotal.Item");
 	}
@@ -495,6 +519,28 @@ 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 getChestGUIVoteShopExtraItems(String item) {
+		return getData().getConfigurationSection("CHEST.VoteShopExtraItems." + item);
+	}
+
+	public Set<String> getChestGUIVoteShopExtraItems() {
+		if (getData().isConfigurationSection("CHEST.VoteShopExtraItems")) {
+			return getData().getConfigurationSection("CHEST.VoteShopExtraItems").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

@@ -3,6 +3,7 @@ package com.bencodez.votingplugin.config;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import com.bencodez.advancedcore.api.yml.YMLFile;
@@ -19,6 +20,9 @@ public class SpecialRewardsConfig extends YMLFile {
 	@Getter
 	private String allSitesRewardPath = "AllSites";
 
+	@Getter
+	private String almostAllSitesRewardPath = "AlmostAllSites";
+
 	@Getter
 	private String anySiteRewardsPath = "AnySiteRewards";
 
@@ -91,6 +95,14 @@ public class SpecialRewardsConfig extends YMLFile {
 		return "Cumulative." + cumulative + ".Rewards";
 	}
 
+	public List<Integer> getCumulativeBlackList(int cumulative) {
+		return getData().getIntegerList("Cumulative." + cumulative + ".BlackList");
+	}
+
+	public boolean getCumulativeRecurring(int cumulative) {
+		return getData().getBoolean("Cumulative." + cumulative + ".Recurring", true);
+	}
+
 	/**
 	 * Gets the cumulative votes.
 	 *
@@ -224,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() {
@@ -262,6 +275,10 @@ public class SpecialRewardsConfig extends YMLFile {
 		return getData().getBoolean("VoteParty.OnlyOncePerDay");
 	}
 
+	public boolean getVotePartyOnlyOncePerWeek() {
+		return getData().getBoolean("VoteParty.OnlyOncePerWeek");
+	}
+
 	public boolean getVotePartyResetEachDay() {
 		return getData().getBoolean("VoteParty.ResetEachDay");
 	}

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

@@ -1,40 +1,44 @@
 package com.bencodez.votingplugin.cooldown;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.HashMap;
 import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
 import com.bencodez.advancedcore.api.user.UserStartup;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.events.PlayerVoteCoolDownEndEvent;
+import com.bencodez.votingplugin.events.PlayerVoteSiteCoolDownEndEvent;
+import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class CoolDownCheck implements Listener {
 
 	private VotingPluginMain plugin;
 
-	private Set<UUID> uuids = new HashSet<UUID>();
+	private HashMap<UUID, ScheduledFuture<?>> perSiteTasks = new HashMap<UUID, ScheduledFuture<?>>();
+
+	private HashMap<UUID, ScheduledFuture<?>> allSiteTasks = new HashMap<UUID, ScheduledFuture<?>>();
 
 	public CoolDownCheck(VotingPluginMain plugin) {
 		this.plugin = plugin;
-		this.timer = new Timer();
+		this.timer = Executors.newScheduledThreadPool(1);
 	}
 
-	private Timer timer;
+	private ScheduledExecutorService timer;
 
 	private boolean cooldownCheckEnabled = false;
 
 	public void checkEnabled() {
-		if (!plugin.getConfigFile().isDisableCoolDownCheck() && RewardHandler.getInstance()
+		if (!plugin.getConfigFile().isDisableCoolDownCheck() && plugin.getRewardHandler()
 				.hasRewards(plugin.getSpecialRewardsConfig().getData(), "VoteCoolDownEndedReward")) {
 			cooldownCheckEnabled = true;
 		} else {
@@ -46,12 +50,18 @@ public class CoolDownCheck implements Listener {
 		check(plugin.getVotingPluginUserManager().getVotingPluginUser(uuid));
 	}
 
-	public void vote(VotingPluginUser user) {
+	public void checkPerSite(UUID uuid) {
+		checkPerSite(plugin.getVotingPluginUserManager().getVotingPluginUser(uuid));
+	}
+
+	public void vote(VotingPluginUser user, VoteSite site) {
 		if (cooldownCheckEnabled) {
-			UUID uuid = UUID.fromString(user.getUUID());
-			if (!uuids.contains(uuid)) {
-				schedule(user);
-			}
+			schedule(user);
+		}
+
+		if (plugin.getConfigFile().isPerSiteCoolDownEvents()) {
+			user.setCoolDownCheckSite(site, Boolean.FALSE);
+			schedulePerSite(user);
 		}
 	}
 
@@ -61,10 +71,55 @@ public class CoolDownCheck implements Listener {
 			user.setCoolDownCheck(false);
 			PlayerVoteCoolDownEndEvent event = new PlayerVoteCoolDownEndEvent(user);
 			plugin.getServer().getPluginManager().callEvent(event);
-			uuids.remove(UUID.fromString(user.getUUID()));
+			allSiteTasks.remove(user.getJavaUUID());
 		} else if (!coolDownCheck) {
 			schedule(user);
 		}
+	}
+
+	public synchronized void checkPerSite(VotingPluginUser user) {
+		if (plugin.getConfigFile().isPerSiteCoolDownEvents()) {
+			HashMap<VoteSite, Boolean> coolDownChecks = user.getCoolDownCheckSiteList();
+			boolean changed = false;
+			for (VoteSite site : plugin.getVoteSites()) {
+				if (user.canVoteSite(site)) {
+					if (!coolDownChecks.containsKey(site) || !coolDownChecks.get(site).booleanValue()) {
+						coolDownChecks.put(site, Boolean.TRUE);
+						changed = true;
+						PlayerVoteSiteCoolDownEndEvent event = new PlayerVoteSiteCoolDownEndEvent(user, site);
+						plugin.getServer().getPluginManager().callEvent(event);
+					}
+				}
+			}
+			if (changed) {
+				user.setCoolDownCheckSite(coolDownChecks);
+			}
+		}
+
+		schedulePerSite(user);
+
+	}
+
+	public void schedulePerSite(VotingPluginUser user) {
+		final UUID uuid = UUID.fromString(user.getUUID());
+		long time = user.getNextTimeFirstSiteAvailable();
+		if (time > 0) {
+			if (perSiteTasks.containsKey(uuid)) {
+				perSiteTasks.get(uuid).cancel(false);
+				perSiteTasks.remove(uuid);
+			}
+			plugin.devDebug("PerSiteCoolDownEvent schedule time: " + time);
+			ScheduledFuture<?> scheduledFuture = timer.schedule(new Runnable() {
+
+				@Override
+				public void run() {
+					if (plugin != null && plugin.isEnabled()) {
+						checkPerSite(uuid);
+					}
+				}
+			}, time + 2, TimeUnit.SECONDS);
+			perSiteTasks.put(uuid, scheduledFuture);
+		}
 
 	}
 
@@ -73,44 +128,59 @@ public class CoolDownCheck implements Listener {
 		long time = user.getNextTimeAllSitesAvailable();
 		if (time > 0) {
 			user.setCoolDownCheck(true);
-			uuids.add(uuid);
-			timer.schedule(new TimerTask() {
+			if (allSiteTasks.containsKey(uuid)) {
+				allSiteTasks.get(uuid).cancel(false);
+				allSiteTasks.remove(uuid);
+			}
+			ScheduledFuture<?> scheduledFuture = timer.schedule(new Runnable() {
 
 				@Override
 				public void run() {
 					check(uuid);
 				}
-			}, time * 1000 + 1500);
+			}, time + 2, TimeUnit.SECONDS);
+			allSiteTasks.put(uuid, scheduledFuture);
 		}
 
 	}
 
 	public void load() {
-		if (cooldownCheckEnabled) {
-			plugin.addUserStartup(new UserStartup() {
 
-				@Override
-				public void onStartUp(AdvancedCoreUser advancedcoreUser) {
-					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(advancedcoreUser);
+		plugin.addUserStartup(new UserStartup() {
+
+			@Override
+			public void onStartUp(AdvancedCoreUser advancedcoreUser) {
+				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(advancedcoreUser);
+				if (cooldownCheckEnabled) {
 					check(user);
 				}
-
-				@Override
-				public void onStart() {
-
+				if (plugin.getConfigFile().isPerSiteCoolDownEvents()) {
+					checkPerSite(user);
 				}
+			}
 
-				@Override
-				public void onFinish() {
+			@Override
+			public void onStart() {
 
-				}
-			});
-		}
+			}
+
+			@Override
+			public void onFinish() {
+
+			}
+		});
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onCoolDownEnd(PlayerVoteCoolDownEndEvent event) {
-		RewardHandler.getInstance().giveReward(event.getPlayer(), plugin.getSpecialRewardsConfig().getData(),
+		plugin.getRewardHandler().giveReward(event.getPlayer(), plugin.getSpecialRewardsConfig().getData(),
 				"VoteCoolDownEndedReward", new RewardOptions());
 	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onCoolDownEnd(PlayerVoteSiteCoolDownEndEvent event) {
+		plugin.getRewardHandler().giveReward(event.getPlayer(), event.getSite().getSiteData(), "CoolDownEndRewards",
+				new RewardOptions());
+	}
+
 }

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

@@ -1,8 +1,10 @@
 package com.bencodez.votingplugin.data;
 
+import java.time.temporal.WeekFields;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 import org.bukkit.Bukkit;
@@ -12,6 +14,7 @@ import org.bukkit.configuration.ConfigurationSection;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.signs.SignHandler;
+import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -27,12 +30,26 @@ 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);
 		}
 	}
 
+	public void updatePlaceholders() {
+		boolean data = getData().getBoolean("AutoCacheUpdated", false);
+		if (!data) {
+			List<String> placeholders = getAutoCachedPlaceholder();
+			for (int i = 0; i < placeholders.size(); i++) {
+				placeholders.set(i, placeholders.get(i).toLowerCase());
+			}
+			setAutoCachedPlaceholder(placeholders);
+			getData().set("AutoCacheUpdated", true);
+			saveData();
+		}
+	}
+
 	public void setAutoCachedPlaceholder(List<String> placeholders) {
 		getData().set("AutoCachePlaceholders", placeholders);
 		saveData();
@@ -157,7 +174,16 @@ public class ServerData {
 
 	public boolean isLastVotePartySameDay() {
 		int num = getData().getInt("LastVoteParty", 0);
-		if (num != plugin.getTimeChecker().getTime().getDayOfYear()) {
+		if (num == plugin.getTimeChecker().getTime().getDayOfYear()) {
+			return true;
+		}
+		return false;
+	}
+
+	public boolean isLastVotePartySameWeek() {
+		int num = getData().getInt("LastVotePartyWeek", -1);
+		if (num == plugin.getTimeChecker().getTime().get(WeekFields.of(Locale.getDefault()).weekOfYear())
+				&& num != -1) {
 			return true;
 		}
 		return false;
@@ -264,6 +290,12 @@ public class ServerData {
 		saveData();
 	}
 
+	public void updateLastVotePartyWeek() {
+		getData().set("LastVotePartyWeek",
+				plugin.getTimeChecker().getTime().get(WeekFields.of(Locale.getDefault()).weekOfYear()));
+		saveData();
+	}
+
 	public int getBungeeVotePartyCurrent() {
 		return getData().getInt("BungeeVotePartyCurrent");
 	}
@@ -288,4 +320,28 @@ public class ServerData {
 	public void updateValues() {
 		setVersion();
 	}
+
+	public void addTimeVoted(int num, VoteTimeQueue vote) {
+		getData().set("TimedVoteCache." + num + ".Name", vote.getName());
+		getData().set("TimedVoteCache." + num + ".Service", vote.getService());
+		getData().set("TimedVoteCache." + num + ".Time", vote.getTime());
+		saveData();
+	}
+
+	public Set<String> getTimedVoteCacheKeys() {
+		if (getData().isConfigurationSection("TimedVoteCache")) {
+			return getData().getConfigurationSection("TimedVoteCache").getKeys(false);
+		} else {
+			return new HashSet<String>();
+		}
+	}
+
+	public ConfigurationSection getTimedVoteCacheSection(String num) {
+		return getData().getConfigurationSection("TimedVoteCache." + num);
+	}
+
+	public void clearTimedVoteCache() {
+		getData().set("TimedVoteCache", null);
+		saveData();
+	}
 }

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

@@ -80,6 +80,10 @@ public class PlayerVoteEvent extends Event {
 	@Setter
 	private boolean broadcast = true;
 
+	@Getter
+	@Setter
+	private int voteNumber = 1;
+
 	public PlayerVoteEvent(VoteSite voteSite, String voteUsername, String serviceSite, boolean realVote) {
 		super(true);
 		this.player = voteUsername;

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

@@ -0,0 +1,58 @@
+package com.bencodez.votingplugin.events;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.bencodez.votingplugin.objects.VoteSite;
+import com.bencodez.votingplugin.user.VotingPluginUser;
+
+import lombok.Getter;
+import lombok.Setter;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class PlayerVoteEvent.
+ */
+public class PlayerVoteSiteCoolDownEndEvent extends Event {
+
+	/** The Constant handlers. */
+	private static final HandlerList handlers = new HandlerList();
+
+	/**
+	 * Gets the handler list.
+	 *
+	 * @return the handler list
+	 */
+	public static HandlerList getHandlerList() {
+		return handlers;
+	}
+
+	@Getter
+	@Setter
+	private boolean cancelled;
+
+	@Getter
+	@Setter
+	private VotingPluginUser player;
+
+	@Getter
+	@Setter
+	private VoteSite site;
+
+	public PlayerVoteSiteCoolDownEndEvent(VotingPluginUser user, VoteSite site) {
+		super(true);
+		player = user;
+		this.site = site;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.bukkit.event.Event#getHandlers()
+	 */
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+}

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

@@ -3,7 +3,7 @@ package com.bencodez.votingplugin.events;
 import lombok.Getter;
 
 public enum SpecialRewardType {
-	ALLSITE, CUMMULATIVE, FIRSTVOTE, FIRSTVOTETODAY, MILESTONE, VOTESTREAK;
+	ALLSITE, CUMMULATIVE, FIRSTVOTE, FIRSTVOTETODAY, MILESTONE, VOTESTREAK, ALMOSTALLSITES;
 
 	@Getter
 	private int amount = -1;

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

@@ -1,14 +1,11 @@
 package com.bencodez.votingplugin.listeners;
 
-import java.util.TimerTask;
-
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-import com.bencodez.advancedcore.api.user.UserStorage;
 import com.bencodez.advancedcore.listeners.AdvancedCoreLoginEvent;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
@@ -50,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());
 		}
 	}
 
@@ -63,43 +63,29 @@ public class PlayerJoinEvent implements Listener {
 	 */
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onPlayerLogin(AdvancedCoreLoginEvent event) {
-		if (event.getPlayer() == null || (VotingPluginMain.plugin.getStorageType().equals(UserStorage.MYSQL)
-				&& VotingPluginMain.plugin.getMysql() == null)) {
+		if (event.getPlayer() == null || !plugin.isMySQLOkay()) {
 			return;
 		}
 
-		int delay = plugin.getConfigFile().getDelayLoginEvent();
-		if (delay <= 0) {
-			login(event.getPlayer());
-		} else {
-			plugin.getLoginTimer().schedule(new TimerTask() {
-
-				@Override
-				public void run() {
-					login(event.getPlayer());
-				}
-			}, delay);
-		}
+		login(event.getPlayer());
 
 	}
 
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onPlayerQuit(PlayerQuitEvent event) {
-		if (plugin.getConfigFile().isDisableAdvancedTab()) {
-			return;
+		if (plugin != null && plugin.isEnabled()) {
+			final java.util.UUID uuid = event.getPlayer().getUniqueId();
+			plugin.getLoginTimer().execute(new Runnable() {
+
+				@Override
+				public void run() {
+					VotingPluginMain.plugin.getAdvancedTab().remove(uuid);
+
+					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(uuid);
+					user.dontCache();
+					user.logoutRewards();
+				}
+			});
 		}
-		final java.util.UUID uuid = event.getPlayer().getUniqueId();
-		plugin.getLoginTimer().schedule(new TimerTask() {
-
-			@Override
-			public void run() {
-				VotingPluginMain.plugin.getAdvancedTab().remove(uuid);
-
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(uuid);
-				user.dontCache();
-				user.logoutRewards();
-			}
-		}, 0);
-
 	}
 }

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

@@ -5,6 +5,7 @@ import java.time.ZoneId;
 import java.util.ArrayList;
 
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -25,8 +26,6 @@ import com.bencodez.votingplugin.user.VotingPluginUser;
  */
 public class PlayerVoteListener implements Listener {
 
-	private static Object object = new Object();
-
 	private VotingPluginMain plugin;
 
 	/**
@@ -46,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
@@ -61,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;
 		}
 
@@ -104,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)) {
@@ -112,110 +119,104 @@ 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.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();
 			}
-			plugin.getCoolDownCheck().vote(user);
-
-			// 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();
-				}
-			}
-
-			// 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();
-				}
-				user.playerVote(voteSite, online, false, event.isForceBungee());
+			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();
+			if (plugin.getConfigFile().isCloseInventoryOnVote()) {
+				user.closeInv();
 			}
+		} else {
+			user.addOfflineVote(voteSite.getKey());
+			plugin.debug("Offline vote set for " + playerName + " (" + user.getUUID() + ") on " + voteSite.getKey());
+		}
 
-			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().checkCumualativeVotes(user, event.getBungeeTextTotals(), event.isForceBungee());
-			plugin.getSpecialRewards().checkMilestone(user, event.getBungeeTextTotals(), 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);
 
-			if (plugin.getBungeeSettings().isUseBungeecoord()) {
-				if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.MYSQL)) {
-					final String uuid = user.getUUID();
-					Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+		if (plugin.getBungeeSettings().isUseBungeecoord()) {
+			if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.MYSQL)) {
 
-						@Override
-						public void run() {
-							if (Bukkit.getOnlinePlayers().size() > 0) {
-								plugin.getPluginMessaging().sendPluginMessage("VoteUpdate", uuid);
-							}
+				Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+					@Override
+					public void run() {
+						if (Bukkit.getOnlinePlayers().size() > 0) {
+							plugin.getPluginMessaging().sendPluginMessage("VoteUpdate", uuid);
 						}
-					}, 40);
-				}
-			}
-			if (!user.isOnline()) {
-				user.clearCache();
+					}
+				}, 40);
 			}
 		}
 
@@ -223,7 +224,12 @@ public class PlayerVoteListener implements Listener {
 				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

@@ -1,7 +1,6 @@
 package com.bencodez.votingplugin.listeners;
 
 import java.util.ArrayList;
-import java.util.TimerTask;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -65,53 +64,66 @@ public class VotiferEvent implements Listener {
 		plugin.debug("VoteSite: " + voteSite);
 		plugin.debug("IP: " + IP);
 
-		plugin.getVoteTimer().schedule(new TimerTask() {
+		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 generaterate...");
-					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()));
+					}
 
-				String voteSiteName = plugin.getVoteSiteName(true, 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);
 
-				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName, true), voteUsername,
-						voteSite, true);
-				plugin.getServer().getPluginManager().callEvent(voteEvent);
+						return;
+					}
 
-				if (voteEvent.isCancelled()) {
-					plugin.debug("Vote cancelled");
-					return;
+					String voteSiteName = plugin.getVoteSiteName(true, voteSite);
+
+					PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName, true),
+							voteUsername, voteSite, true);
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
+
+					if (voteEvent.isCancelled()) {
+						plugin.debug("Vote cancelled");
+						return;
+					}
+				} catch (Exception e) {
+					plugin.getLogger().severe("Error occured during vote processing");
+					e.printStackTrace();
 				}
 
 			}
-		}, 0);
-
+		});
 	}
 
 }

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

@@ -14,7 +14,6 @@ import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.user.UserManager;
@@ -173,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")) {
@@ -209,7 +209,7 @@ public class VoteSite {
 	}
 
 	public boolean hasRewards() {
-		return RewardHandler.getInstance().hasRewards(plugin.getConfigVoteSites().getData(),
+		return plugin.getRewardHandler().hasRewards(plugin.getConfigVoteSites().getData(),
 				plugin.getConfigVoteSites().getRewardsPath(key));
 	}
 
@@ -240,4 +240,19 @@ public class VoteSite {
 		return ArrayUtils.getInstance().containsIgnoreCase(plugin.getServerData().getServiceSites(), getServiceSite());
 	}
 
+	public String loadingDebug() {
+		String str = "Loading votesite key: " + key;
+		str += ", Displayname: " + displayName;
+		str += ", VoteDelay: " + getVoteDelay();
+		str += ", VoteDelayMin: " + getVoteDelayMin();
+		str += ", VoteDelayDaily: " + isVoteDelayDaily();
+		str += ", IsWaitUntilVoteDelay: " + isWaitUntilVoteDelay();
+		str += ", ServiceSite: " + getServiceSite();
+		str += ", TimeOffSet:" + getTimeOffSet();
+		str += ", Url: " + getVoteURL();
+		str += ", IgnoreCanVote: " + isIgnoreCanVote();
+		str += ", Hidden: " + isHidden();
+		return str;
+	}
+
 }

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

@@ -47,17 +47,67 @@ public class PlaceHolders {
 
 	public PlaceHolders(VotingPluginMain plugin) {
 		this.plugin = plugin;
+		cacheLevel = plugin.getConfigFile().getPlaceholderCacheLevel();
+	}
+
+	public void reload() {
+		cacheLevel = plugin.getConfigFile().getPlaceholderCacheLevel();
+		onUpdate();
+		if (!cacheLevel.equals(PlaceholderCacheLevel.NONE)) {
+			for (Player player : Bukkit.getOnlinePlayers()) {
+				onUpdate(UserManager.getInstance().getVotingPluginUser(player));
+			}
+		}
 	}
 
 	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) {
+	public String getPlaceHolder(OfflinePlayer p, String identifier1, boolean javascript) {
+		boolean forceProcess = false;
+		boolean useCache = true;
+		String identifier = identifier1.toLowerCase();
+		boolean custom = false;
+		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 (identifier.startsWith("custom_")) {
+			custom = true;
+			identifier = identifier.replaceAll("custom_", "");
+		}
+
+		if (custom && plugin.getConfigFile().getCustomPlaceholderReturns().contains(identifier)) {
+			String str = getPlaceholderValue(p, identifier, javascript, true, useCache);
+			String returnStr = plugin.getConfigFile().getCustomPlaceholderReturns(identifier, str);
+			if (!returnStr.isEmpty()) {
+				return returnStr;
+			}
+			return str;
+		} else {
+			return getPlaceholderValue(p, identifier, javascript, forceProcess, useCache);
+		}
+
+	}
+
+	public String getPlaceholderValue(OfflinePlayer p, String identifier, boolean javascript, boolean forceProcess,
+			boolean useCache) {
 		if (plugin.getConfigFile().isUseJavascriptPlaceholders() && javascript && p != null) {
 			identifier = StringParser.getInstance().replaceJavascript(p, identifier);
 		}
@@ -76,16 +126,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 (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 "..";
+					return "Not a valid placeholder";
+
 				}
 			}
 		}
@@ -98,12 +157,35 @@ 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());
+					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 {
-							return "....";
+							if (getCacheLevel().shouldCache()) {
+								if (!placeholdersToSetCacheOn.contains(identifier)
+										&& !cachedPlaceholders.contains(identifier)) {
+									placeholdersToSetCacheOn.add(identifier);
+									schedulePlaceholderCheck(user);
+								}
+							}
+							return ".";
 						}
 					} else {
 						return placeholder.placeholderRequest(user, identifier);
@@ -172,6 +254,47 @@ public class PlaceHolders {
 			}
 		}.withDescription("User milestonecount").updateDataKey("MilestoneCount"));
 
+		Set<String> mVotes = plugin.getSpecialRewardsConfig().getMilestoneVotes();
+		for (String vote : mVotes) {
+			if (StringParser.getInstance().isInt(vote)) {
+
+				final int num = Integer.parseInt(vote);
+				if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(num)) {
+					placeholders.add(new PlaceHolder<VotingPluginUser>("milestone_numberofvotesuntil_" + num) {
+
+						@Override
+						public String placeholderRequest(VotingPluginUser user, String identifier) {
+							int toGo = num - user.getMilestoneCount();
+							if (toGo >= 0) {
+								return "" + toGo;
+							}
+							return "0";
+						}
+					}.withDescription("Get number of votes until milestone").updateDataKey("MilestoneCount"));
+				}
+			}
+		}
+
+		placeholders.add(new PlaceHolder<VotingPluginUser>("nextmilestone_votes_required") {
+
+			@Override
+			public String placeholderRequest(VotingPluginUser user, String identifier) {
+				return "" + user.getNextAvailableMileStone();
+			}
+		}.withDescription("Get number of votes required for next available milestone").updateDataKey("MilestoneCount"));
+
+		placeholders.add(new PlaceHolder<VotingPluginUser>("nextmilestone_votes_until") {
+
+			@Override
+			public String placeholderRequest(VotingPluginUser user, String identifier) {
+				int toGo = user.getNextAvailableMileStone() - user.getMilestoneCount();
+				if (toGo >= 0) {
+					return "" + toGo;
+				}
+				return "0";
+			}
+		}.withDescription("Get number of votes until next available milestone").updateDataKey("MilestoneCount"));
+
 		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
 			if (plugin.getGui().getChestShopIdentifierLimit(identifier) > 0) {
 				placeholders.add(new PlaceHolder<VotingPluginUser>("VoteShopLimit_" + identifier) {
@@ -368,6 +491,18 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));
 
+		placeholders.add(new PlaceHolder<VotingPluginUser>("EnoughPoints_") {
+
+			@Override
+			public String placeholderRequest(VotingPluginUser user, String identifier) {
+				int number = Integer.parseInt(identifier.split("_")[1]);
+				if (user.getPoints() >= number) {
+					return "true";
+				}
+				return "false";
+			}
+		}.withDescription("Return true/false if player has said points").updateDataKey("Points").useStartsWith());
+
 		nonPlayerPlaceholders.add(new NonPlayerPlaceHolder<VotingPluginUser>("Top_AllVotes_") {
 
 			@Override
@@ -712,43 +847,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);
 				}
 			}
 		}
@@ -757,16 +876,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);
-								user.dontCache();
 								for (String ident : placeholder.getCache().keySet()) {
-									placeholder.getCache().get(ident).put(vpUser.getJavaUUID(),
-											placeholder.placeholderRequest(vpUser, ident));
-									plugin.devDebug("Updated 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);
 
 								}
 
@@ -805,39 +927,54 @@ public class PlaceHolders {
 	public void onUpdate(VotingPluginUser user) {
 		for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
 			if (placeholder.isUsesCache()) {
-				if (!placeholder.getIdentifier().startsWith("Top_") || placeholder.getCache().isEmpty()
-						|| placeholder.getUpdateDataKey().isEmpty()) {
-					for (String ident : placeholder.getCache().keySet()) {
-						placeholder.getCache().get(ident).put(user.getJavaUUID(),
-								placeholder.placeholderRequest(user, ident));
-					}
+				for (String ident : placeholder.getCache().keySet()) {
+					placeholder.getCache().get(ident).put(user.getJavaUUID(),
+							placeholder.placeholderRequest(user, ident));
 				}
 			}
 		}
 	}
 
-	public void onUpdate() {
-		ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
+	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()) {
@@ -852,24 +989,6 @@ public class PlaceHolders {
 				}
 			}
 		}
-		for (String uuid : uuids) {
-			VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-			user.dontCache();
-			for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
-				if (placeholder.isUsesCache()) {
-					if (placeholder.getIdentifier().startsWith("Top_")) {
-						for (String ident : placeholder.getCache().keySet()) {
-							if (ident != null) {
-								placeholder.getCache().get(ident).put(user.getJavaUUID(),
-										placeholder.placeholderRequest(user, ident));
-							} else {
-								plugin.debug("ident null: " + placeholder.getIdentifier());
-							}
-						}
-					}
-				}
-			}
-		}
 
 	}
 }

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

@@ -2,13 +2,13 @@ package com.bencodez.votingplugin.specialrewards;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 import org.bukkit.Bukkit;
 
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.bungee.BungeeMessageData;
@@ -49,6 +49,22 @@ public class SpecialRewards {
 		return checkAllVotes;
 	}
 
+	public boolean checkAlmostAllSites(VotingPluginUser user, boolean forceBungee) {
+		boolean checkAllVotes = user.checkAlmostAllVotes();
+		if (checkAllVotes) {
+			int currentDay = LocalDateTime.now().getDayOfYear();
+			int day = user.getGottenAlmostAllSitesDay();
+			if (currentDay == day) {
+				checkAllVotes = false;
+				plugin.debug("Not giving almostallsites, already gotten today");
+			} else {
+				user.setGottenAlmostAllSitesDay(currentDay);
+				giveAlmostAllSitesRewards(user, user.isOnline(), forceBungee);
+			}
+		}
+		return checkAllVotes;
+	}
+
 	public boolean checkCumualativeVotes(VotingPluginUser user, BungeeMessageData bungeeMessageData,
 			boolean forceBungee) {
 		boolean gotCumulativeAny = false;
@@ -58,7 +74,7 @@ public class SpecialRewards {
 				int votesRequired = Integer.parseInt(vote);
 				if (votesRequired != 0) {
 					if (plugin.getSpecialRewardsConfig().getCumulativeRewardEnabled(votesRequired)
-							&& RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 									plugin.getSpecialRewardsConfig().getCumulativeRewardsPath(votesRequired))) {
 						boolean gotCumulative = false;
 						int total = 0;
@@ -87,8 +103,25 @@ public class SpecialRewards {
 							}
 						}
 
-						if (total != 0 && total >= votesRequired) {
-							if ((total % votesRequired) == 0) {
+						List<Integer> blackList = plugin.getSpecialRewardsConfig()
+								.getCumulativeBlackList(votesRequired);
+						boolean blackListed = false;
+						for (Integer num : blackList) {
+							if (num.intValue() == total) {
+								blackListed = true;
+								plugin.extraDebug("Not giving cumulative " + votesRequired + " to "
+										+ user.getPlayerName() + " due to blacklist");
+							}
+						}
+
+						if (plugin.getSpecialRewardsConfig().getCumulativeRecurring(votesRequired)) {
+							if (total != 0 && total >= votesRequired) {
+								if ((total % votesRequired) == 0 && !blackListed) {
+									gotCumulative = true;
+								}
+							}
+						} else {
+							if (total == votesRequired) {
 								gotCumulative = true;
 							}
 						}
@@ -116,7 +149,7 @@ public class SpecialRewards {
 	}
 
 	public boolean checkFirstVote(VotingPluginUser user, boolean forceBungee) {
-		if (RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+		if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath())) {
 			if (!user.hasGottenFirstVote()) {
 				giveFirstVoteRewards(user, user.isOnline(), forceBungee);
@@ -128,7 +161,7 @@ public class SpecialRewards {
 	}
 
 	public boolean checkFirstVoteToday(VotingPluginUser user, boolean forceBungee) {
-		if (RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+		if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath())) {
 			if (!user.hasGottenFirstVoteToday()) {
 				giveFirstVoteTodayRewards(user, user.isOnline(), forceBungee);
@@ -181,7 +214,7 @@ public class SpecialRewards {
 				int votesRequired = Integer.parseInt(vote);
 				if (votesRequired != 0) {
 					if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(votesRequired)
-							&& RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 									plugin.getSpecialRewardsConfig().getMilestoneRewardsPath(votesRequired))) {
 
 						int userVotesTotal = milestoneCount;
@@ -217,7 +250,7 @@ public class SpecialRewards {
 				int streakRequired = Integer.parseInt(s);
 				if (streakRequired != 0) {
 					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled(type, streak)
-							&& RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 									plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath(type, "" + streak))) {
 						int curStreak = 0;
 						if (type.equalsIgnoreCase("day")) {
@@ -261,11 +294,23 @@ public class SpecialRewards {
 		if (event.isCancelled()) {
 			return;
 		}
-		RewardHandler.getInstance().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
+		plugin.getRewardHandler().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getAllSitesRewardPath(),
 				new RewardOptions().setServer(forceBungee).setOnline(online));
 	}
 
+	public void giveAlmostAllSitesRewards(VotingPluginUser user, boolean online, boolean forceBungee) {
+		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user, SpecialRewardType.ALMOSTALLSITES);
+		Bukkit.getPluginManager().callEvent(event);
+
+		if (event.isCancelled()) {
+			return;
+		}
+		plugin.getRewardHandler().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
+				plugin.getSpecialRewardsConfig().getAlmostAllSitesRewardPath(),
+				new RewardOptions().setServer(forceBungee).setOnline(online));
+	}
+
 	public void giveCumulativeVoteReward(VotingPluginUser user, boolean online, int cumulative, boolean forceBungee) {
 		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user,
 				SpecialRewardType.CUMMULATIVE.setAmount(cumulative));
@@ -277,7 +322,7 @@ public class SpecialRewards {
 
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getCumulativeRewardsPath(cumulative)).setServer(forceBungee)
-						.setOnline(online).withPlaceHolder("Cumulative", "" + cumulative).send(user);
+				.setOnline(online).withPlaceHolder("Cumulative", "" + cumulative).send(user);
 	}
 
 	public void giveFirstVoteRewards(VotingPluginUser user, boolean online, boolean forceBungee) {
@@ -287,7 +332,7 @@ public class SpecialRewards {
 		if (event.isCancelled()) {
 			return;
 		}
-		RewardHandler.getInstance().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
+		plugin.getRewardHandler().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath(),
 				new RewardOptions().setServer(forceBungee).setOnline(online));
 	}
@@ -299,7 +344,7 @@ public class SpecialRewards {
 		if (event.isCancelled()) {
 			return;
 		}
-		RewardHandler.getInstance().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
+		plugin.getRewardHandler().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getFirstVoteTodayRewardsPath(),
 				new RewardOptions().setServer(forceBungee).setOnline(online));
 	}
@@ -314,7 +359,7 @@ public class SpecialRewards {
 		}
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getMilestoneRewardsPath(milestone)).setOnline(online)
-						.withPlaceHolder("Milestone", "" + milestone).setServer(forceBungee).send(user);
+				.withPlaceHolder("Milestone", "" + milestone).setServer(forceBungee).send(user);
 	}
 
 	public void giveVoteStreakReward(VotingPluginUser user, boolean online, String type, String string, int votes,
@@ -328,8 +373,7 @@ public class SpecialRewards {
 		}
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath(type, string)).setOnline(online)
-						.withPlaceHolder("Type", type).setServer(forceBungee).withPlaceHolder("Streak", "" + votes)
-						.send(user);
+				.withPlaceHolder("Type", type).setServer(forceBungee).withPlaceHolder("Streak", "" + votes).send(user);
 	}
 
 }

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

@@ -1,75 +1,158 @@
 package com.bencodez.votingplugin.test;
 
 import java.util.ArrayList;
+import java.util.Random;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
 
 import com.bencodez.advancedcore.api.rewards.Reward;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
+import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteTester {
 
-	private static VoteTester instance = new VoteTester();
-
-	public static VoteTester getInstance() {
-		return instance;
+	public VoteTester(VotingPluginMain plugin) {
+		this.plugin = plugin;
 	}
 
-	private VotingPluginMain plugin = VotingPluginMain.plugin;
+	private 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 = RewardHandler.getInstance().getReward(rewardName);
-		int rewardsGiven = 0;
-		for (int i = 0; i < amount; i++) {
-			long start1 = System.currentTimeMillis();
-			if (reward.canGiveReward(user, new RewardOptions())) {
-				rewardsGiven++;
-				RewardHandler.getInstance().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);
+
+		});
+
+	}
+
+	private String getSaltString() {
+		String SALTCHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
+		StringBuilder salt = new StringBuilder();
+		Random rnd = new Random();
+		while (salt.length() < 18) { // length of the random string.
+			int index = (int) (rnd.nextFloat() * SALTCHARS.length());
+			salt.append(SALTCHARS.charAt(index));
 		}
-		long time2 = System.currentTimeMillis();
-		long time = time2 - time1;
-		long timeTotal = 0;
-		for (Long t : timesPerReward) {
-			timeTotal += t.longValue();
+		String saltStr = salt.toString();
+		return saltStr;
+
+	}
+
+	public void generatePlayers(int numberOfPlayers) {
+		if (plugin.getOptions().getDebug().isDebug()) {
+			int num = 1;
+			String salt = getSaltString();
+			Random random = new Random();
+			for (int i = 0; i < numberOfPlayers; i++) {
+				UUID uuid = UUID.randomUUID();
+				if (!plugin.getUserManager().userExist(uuid)) {
+					String playerName = salt + num;
+					if (!plugin.getUserManager().userExist(playerName)) {
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid,
+								playerName);
+						user.dontCache();
+						user.setPoints(random.nextInt(100));
+						for (TopVoter top : TopVoter.values()) {
+							user.setTotal(top, random.nextInt(1000));
+						}
+						user.setMilestoneCount(random.nextInt(100));
+						user.setPlayerName(playerName);
+						user.updateName(true);
+						num++;
+						plugin.debug("Generated user " + uuid.toString() + "/" + playerName);
+					}
+				}
+			}
 		}
-		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/timequeue/TimeQueueHandler.java

@@ -0,0 +1,89 @@
+package com.bencodez.votingplugin.timequeue;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.TimeUnit;
+
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import com.bencodez.advancedcore.api.time.events.DateChangedEvent;
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.events.PlayerVoteEvent;
+
+import lombok.Getter;
+
+public class TimeQueueHandler implements Listener {
+	@Getter
+	private Queue<VoteTimeQueue> timeChangeQueue = new ConcurrentLinkedQueue<VoteTimeQueue>();
+
+	private VotingPluginMain plugin;
+
+	public TimeQueueHandler(VotingPluginMain plugin) {
+		this.plugin = plugin;
+		load();
+	}
+
+	public void processQueue() {
+		while (getTimeChangeQueue().size() > 0) {
+			VoteTimeQueue vote = getTimeChangeQueue().remove();
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(
+					plugin.getVoteSite(plugin.getVoteSiteName(true, vote.getService()), true), vote.getName(),
+					vote.getService(), true);
+			voteEvent.setTime(voteEvent.getTime());
+			plugin.getServer().getPluginManager().callEvent(voteEvent);
+
+			if (voteEvent.isCancelled()) {
+				plugin.debug("Vote cancelled");
+				return;
+			}
+		}
+	}
+
+	public void addVote(String voteUsername, String voteSiteName) {
+		timeChangeQueue.add(new VoteTimeQueue(voteUsername, voteSiteName,
+				LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void postTimeChange(DateChangedEvent event) {
+		plugin.getVoteTimer().schedule(new Runnable() {
+
+			@Override
+			public void run() {
+				processQueue();
+			}
+		}, 5, TimeUnit.SECONDS);
+	}
+
+	public void load() {
+		for (String str : plugin.getServerData().getTimedVoteCacheKeys()) {
+			ConfigurationSection data = plugin.getServerData().getTimedVoteCacheSection(str);
+			timeChangeQueue
+					.add(new VoteTimeQueue(data.getString("Name"), data.getString("Service"), data.getLong("Time")));
+		}
+		plugin.getServerData().clearTimedVoteCache();
+		plugin.getVoteTimer().schedule(new Runnable() {
+
+			@Override
+			public void run() {
+				processQueue();
+			}
+		}, 120, TimeUnit.SECONDS);
+	}
+
+	public void save() {
+		if (!timeChangeQueue.isEmpty()) {
+			int num = 0;
+			for (VoteTimeQueue vote : timeChangeQueue) {
+				plugin.getServerData().addTimeVoted(num, vote);
+				num++;
+			}
+		}
+		timeChangeQueue.clear();
+	}
+}

VotingPlugin/src/com/bencodez/votingplugin/timequeue/VoteTimeQueue.java

@@ -0,0 +1,22 @@
+package com.bencodez.votingplugin.timequeue;
+
+import lombok.Getter;
+import lombok.Setter;
+
+public class VoteTimeQueue {
+	@Getter
+	@Setter
+	private String name;
+	@Getter
+	@Setter
+	private String service;
+	@Getter
+	@Setter
+	private long time;
+
+	public VoteTimeQueue(String name, String service, long time) {
+		this.name = name;
+		this.service = service;
+		this.time = time;
+	}
+}

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

@@ -2,8 +2,11 @@ package com.bencodez.votingplugin.topvoter;
 
 import java.util.ArrayList;
 
+import com.bencodez.advancedcore.api.time.TimeType;
 import com.bencodez.votingplugin.VotingPluginMain;
 
+import lombok.Getter;
+
 public enum TopVoter {
 	AllTime, Monthly, Weekly, Daily;
 
@@ -44,6 +47,25 @@ 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;
+
+		}
+	}
+
+	@Getter
+	private ArrayList<TopVoter> switchItems = new ArrayList<TopVoter>();
+
 	public String getName() {
 		if (this.equals(TopVoter.Monthly)) {
 			return VotingPluginMain.plugin.getConfigFile().getFormatTopVoterMonthly();
@@ -58,18 +80,23 @@ public enum TopVoter {
 
 	public TopVoter next() {
 		ArrayList<TopVoter> list = new ArrayList<TopVoter>();
-		if (VotingPluginMain.plugin.getConfigFile().getLoadTopVoterAllTime()) {
-			list.add(TopVoter.AllTime);
-		}
-		if (VotingPluginMain.plugin.getConfigFile().getLoadTopVoterMonthly()) {
-			list.add(TopVoter.Monthly);
-		}
-		if (VotingPluginMain.plugin.getConfigFile().getLoadTopVoterWeekly()) {
-			list.add(TopVoter.Weekly);
-		}
-		if (VotingPluginMain.plugin.getConfigFile().getLoadTopVoterDaily()) {
-			list.add(TopVoter.Daily);
+		if (switchItems != null && !switchItems.isEmpty()) {
+			list.addAll(switchItems);
+		} else {
+			if (VotingPluginMain.plugin.getConfigFile().getLoadTopVoterAllTime()) {
+				list.add(TopVoter.AllTime);
+			}
+			if (VotingPluginMain.plugin.getConfigFile().getLoadTopVoterMonthly()) {
+				list.add(TopVoter.Monthly);
+			}
+			if (VotingPluginMain.plugin.getConfigFile().getLoadTopVoterWeekly()) {
+				list.add(TopVoter.Weekly);
+			}
+			if (VotingPluginMain.plugin.getConfigFile().getLoadTopVoterDaily()) {
+				list.add(TopVoter.Daily);
+			}
 		}
+
 		for (int i = 0; i < list.size(); i++) {
 			if (list.get(i).equals(this)) {
 				int next = i + 1;
@@ -84,17 +111,21 @@ public enum TopVoter {
 
 	public TopVoter prev() {
 		ArrayList<TopVoter> list = new ArrayList<TopVoter>();
-		if (VotingPluginMain.plugin.getConfigFile().getLoadTopVoterAllTime()) {
-			list.add(TopVoter.AllTime);
-		}
-		if (VotingPluginMain.plugin.getConfigFile().getLoadTopVoterMonthly()) {
-			list.add(TopVoter.Monthly);
-		}
-		if (VotingPluginMain.plugin.getConfigFile().getLoadTopVoterWeekly()) {
-			list.add(TopVoter.Weekly);
-		}
-		if (VotingPluginMain.plugin.getConfigFile().getLoadTopVoterDaily()) {
-			list.add(TopVoter.Daily);
+		if (switchItems != null && !switchItems.isEmpty()) {
+			list.addAll(switchItems);
+		} else {
+			if (VotingPluginMain.plugin.getConfigFile().getLoadTopVoterAllTime()) {
+				list.add(TopVoter.AllTime);
+			}
+			if (VotingPluginMain.plugin.getConfigFile().getLoadTopVoterMonthly()) {
+				list.add(TopVoter.Monthly);
+			}
+			if (VotingPluginMain.plugin.getConfigFile().getLoadTopVoterWeekly()) {
+				list.add(TopVoter.Weekly);
+			}
+			if (VotingPluginMain.plugin.getConfigFile().getLoadTopVoterDaily()) {
+				list.add(TopVoter.Daily);
+			}
 		}
 		for (int i = list.size() - 1; i >= 0; i--) {
 			if (list.get(i).equals(this)) {
@@ -107,4 +138,17 @@ public enum TopVoter {
 		}
 		return TopVoter.AllTime;
 	}
+
+	public static TopVoter of(TimeType type) {
+		switch (type) {
+		case DAY:
+			return Daily;
+		case MONTH:
+			return Monthly;
+		case WEEK:
+			return Weekly;
+		default:
+			return null;
+		}
+	}
 }

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

@@ -26,6 +26,7 @@ import com.bencodez.advancedcore.api.time.events.MonthChangeEvent;
 import com.bencodez.advancedcore.api.time.events.PreDateChangedEvent;
 import com.bencodez.advancedcore.api.time.events.WeekChangeEvent;
 import com.bencodez.advancedcore.api.user.UserStorage;
+import com.bencodez.advancedcore.api.user.userstorage.Column;
 import com.bencodez.advancedcore.api.user.userstorage.DataType;
 import com.bencodez.advancedcore.api.yml.YMLFileHandler;
 import com.bencodez.votingplugin.VotingPluginMain;
@@ -87,14 +88,26 @@ public class TopVoterHandler implements Listener {
 		if (plugin.getGui().isLastMonthGUI()) {
 			plugin.getLastMonthTopVoter().clear();
 			LinkedHashMap<TopVoterPlayer, Integer> totals = new LinkedHashMap<TopVoterPlayer, Integer>();
-			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-				user.dontCache();
-				int total = user.getLastMonthTotal();
-				if (total > 0) {
-					totals.put(user.getTopVoterPlayer(), total);
+			HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+			for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+
+				String uuid = playerData.getKey().toString();
+				if (plugin != null && plugin.isEnabled()) {
+					if (uuid != null && !uuid.isEmpty()) {
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+						user.dontCache();
+						user.updateTempCacheWithColumns(playerData.getValue());
+						cols.put(playerData.getKey(), null);
+						int total = user.getLastMonthTotal();
+						if (total > 0) {
+							totals.put(user.getTopVoterPlayer(), total);
+						}
+						user.clearTempCache();
+					}
 				}
 			}
+			cols.clear();
+			cols = null;
 
 			plugin.getLastMonthTopVoter().putAll(sortByValues(totals, false));
 
@@ -113,39 +126,44 @@ public class TopVoterHandler implements Listener {
 		if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
 			plugin.getMysql().clearCacheBasic();
 		}
-		plugin.getUserManager().getDataManager().clearCache();
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onDayChange(DayChangeEvent event) {
 		synchronized (VotingPluginMain.plugin) {
 			long startTime = System.currentTimeMillis();
-			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));
-					}
-				}
-				user.clearTempCache();
-			}
-
 			if (plugin.getConfigFile().getStoreTopVotersDaily()) {
 				plugin.getLogger().info("Saving TopVoters Daily");
 				storeTopVoters(TopVoter.Daily);
 			}
 
+			plugin.getUserManager().copyColumnData(TopVoter.Daily.getColumnName(), TopVoter.Daily.getLastColumnName());
+			if (plugin.getConfigFile().isUseVoteStreaks() || plugin.getConfigFile().isUseHighestTotals()) {
+				HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+				for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(playerData.getKey(), false);
+					user.dontCache();
+					user.updateTempCacheWithColumns(playerData.getValue());
+					cols.put(playerData.getKey(), null);
+					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));
+						}
+					}
+					user.clearTempCache();
+				}
+				cols.clear();
+				cols = null;
+			}
+
 			try {
 				if (plugin.getSpecialRewardsConfig().isEnableDailyRewards()) {
 					HashMap<Integer, String> places = handlePlaces(
@@ -156,17 +174,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));
 							}
 						}
@@ -183,12 +201,22 @@ public class TopVoterHandler implements Listener {
 				}
 			}
 
-			resetTotals(TopVoter.Daily);
+			// give time for other servers to catch up
+			if (!plugin.getTopVoterHandler().bungeeHandleResets()) {
+				plugin.debug("Delaying time change 10 seconds for other servers to catchup");
+				try {
+					Thread.sleep(10000);
+				} catch (InterruptedException e) {
+					e.printStackTrace();
+				}
+			}
+			if (!bungeeHandleResets()) {
+				resetTotals(TopVoter.Daily);
+			}
 
 			if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
 				plugin.getMysql().clearCacheBasic();
 			}
-			plugin.getUserManager().getDataManager().clearCache();
 
 			long now = ((System.currentTimeMillis() - startTime) / 1000);
 			plugin.getLogger().info("Finished processing day change, took " + now + " seconds");
@@ -201,34 +229,45 @@ 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()) {
+				HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+				for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(playerData.getKey(), false);
+					user.dontCache();
+					user.updateTempCacheWithColumns(playerData.getValue());
+					cols.put(playerData.getKey(), null);
+					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();
+				cols.clear();
+				cols = null;
+
 			}
 
 			try {
@@ -242,17 +281,18 @@ 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));
 							}
 						}
@@ -274,12 +314,23 @@ public class TopVoterHandler implements Listener {
 					resetVoteShopLimit(shopIdent);
 				}
 			}
-			resetTotals(TopVoter.Monthly);
+
+			// give time for other servers to catch up
+			if (!bungeeHandleResets()) {
+				plugin.debug("Delaying time change 10 seconds for other servers to catchup");
+				try {
+					Thread.sleep(10000);
+				} catch (InterruptedException e) {
+					e.printStackTrace();
+				}
+			}
+			if (!bungeeHandleResets()) {
+				resetTotals(TopVoter.Monthly);
+			}
 
 			if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
 				plugin.getMysql().clearCacheBasic();
 			}
-			plugin.getUserManager().getDataManager().clearCache();
 			long now = ((System.currentTimeMillis() - startTime) / 1000);
 			plugin.getLogger().info("Finished processing day change, took " + now + " seconds");
 		}
@@ -295,38 +346,45 @@ public class TopVoterHandler implements Listener {
 	public void onWeekChange(WeekChangeEvent event) {
 		long startTime = System.currentTimeMillis();
 		synchronized (VotingPluginMain.plugin) {
-			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));
-					}
-				}
-				user.clearTempCache();
-			}
-
 			if (plugin.getConfigFile().getStoreTopVotersWeekly()) {
 				plugin.getLogger().info("Saving TopVoters Weekly");
 				storeTopVoters(TopVoter.Weekly);
 			}
 
+			plugin.getUserManager().copyColumnData(TopVoter.Weekly.getColumnName(),
+					TopVoter.Weekly.getLastColumnName());
+			if (plugin.getConfigFile().isUseVoteStreaks() || plugin.getConfigFile().isUseHighestTotals()) {
+				HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+				for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(playerData.getKey(), false);
+					user.dontCache();
+					user.updateTempCacheWithColumns(playerData.getValue());
+					cols.put(playerData.getKey(), null);
+					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));
+						}
+					}
+					user.clearTempCache();
+				}
+				cols.clear();
+				cols = null;
+			}
+
 			try {
 				if (plugin.getSpecialRewardsConfig().isEnableWeeklyAwards()) {
 					HashMap<Integer, String> places = handlePlaces(
@@ -337,17 +395,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));
 							}
 						}
@@ -363,12 +422,23 @@ public class TopVoterHandler implements Listener {
 					resetVoteShopLimit(shopIdent);
 				}
 			}
-			resetTotals(TopVoter.Weekly);
+
+			// give time for other servers to catch up
+			if (!plugin.getTopVoterHandler().bungeeHandleResets()) {
+				plugin.debug("Delaying time change 10 seconds for other servers to catchup");
+				try {
+					Thread.sleep(10000);
+				} catch (InterruptedException e) {
+					e.printStackTrace();
+				}
+			}
+			if (!bungeeHandleResets()) {
+				resetTotals(TopVoter.Weekly);
+			}
 
 			if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
 				plugin.getMysql().clearCacheBasic();
 			}
-			plugin.getUserManager().getDataManager().clearCache();
 
 			long now = ((System.currentTimeMillis() - startTime) / 1000);
 			plugin.getLogger().info("Finished processing day change, took " + now + " seconds");
@@ -395,6 +465,16 @@ public class TopVoterHandler implements Listener {
 		plugin.getUserManager().removeAllKeyValues(topVoter.getColumnName(), DataType.INTEGER);
 	}
 
+	public boolean bungeeHandleResets() {
+		if (plugin.getBungeeSettings().isUseBungeecoord()) {
+			if (plugin.getBungeeSettings().isGloblalDataEnabled()) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	public LinkedHashMap<TopVoterPlayer, Integer> sortByValues(LinkedHashMap<TopVoterPlayer, Integer> map,
 			final boolean order) {
 
@@ -405,9 +485,17 @@ public class TopVoterHandler implements Listener {
 			@Override
 			public int compare(Entry<TopVoterPlayer, Integer> o1, Entry<TopVoterPlayer, Integer> o2) {
 				if (order) {
-					return o1.getValue().compareTo(o2.getValue());
+					int result = (o1.getValue()).compareTo(o2.getValue());
+					if (result != 0) {
+						return result;
+					}
+					return o2.getKey().getLastVoteTime().compareTo(o1.getKey().getLastVoteTime());
 				} else {
-					return o2.getValue().compareTo(o1.getValue());
+					int result = (o2.getValue()).compareTo(o1.getValue());
+					if (result != 0) {
+						return result;
+					}
+					return o1.getKey().getLastVoteTime().compareTo(o2.getKey().getLastVoteTime());
 
 				}
 			}
@@ -441,8 +529,19 @@ 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;
+			try {
+				ArrayList<Integer> nums = plugin.getUserManager().getNumbersInColumn(cTop.getColumnName());
+				for (Integer num : nums) {
+					cTotal += num.intValue();
+				}
+				topVoters.add("Combined total: " + cTotal);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 			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/topvoter/TopVoterPlayer.java

@@ -19,9 +19,14 @@ public class TopVoterPlayer {
 	@Setter
 	private String playerName;
 
-	public TopVoterPlayer(UUID uuid, String playerName) {
+	@Getter
+	@Setter
+	private Long lastVoteTime;
+
+	public TopVoterPlayer(UUID uuid, String playerName, Long lastVoteTime) {
 		this.uuid = uuid;
 		this.playerName = playerName;
+		this.lastVoteTime = lastVoteTime;
 	}
 
 	public ItemStack getPlayerHead() {

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

@@ -45,7 +45,7 @@ public class UserManager {
 		manager.addKey(new UserDataKeyInt("DayVoteStreak"));
 		manager.addKey(new UserDataKeyInt("BestDayVoteStreak"));
 		manager.addKey(new UserDataKeyString("DayVoteStreakLastUpdate").setColumnType("MEDIUMTEXT"));
-		manager.addKey(new UserDataKeyString("GottenMileStones").setColumnType("MEDIUMTEXT"));
+		manager.addKey(new UserDataKeyString("GottenMileStones").setColumnType("LONGTEXT"));
 		manager.addKey(new UserDataKeyString("Reminded").setColumnType("VARCHAR(5)"));
 		manager.addKey(new UserDataKeyString("DisableBroadcast").setColumnType("VARCHAR(5)"));
 		manager.addKey(new UserDataKeyInt("WeekVoteStreak"));
@@ -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() {
@@ -72,6 +75,13 @@ public class UserManager {
 		return "AllSitesLast";
 	}
 
+	public String getGottenAlmostAllSitesDayPath() {
+		if (plugin.getBungeeSettings().isUseBungeecoord()) {
+			return "AlmostAllSitesLast_" + plugin.getBungeeSettings().getServerNameStorage();
+		}
+		return "AlmostAllSitesLast";
+	}
+
 	public ArrayList<String> getAllUUIDs() {
 		return plugin.getUserManager().getAllUUIDs();
 	}
@@ -90,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

@@ -12,6 +12,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Set;
 import java.util.Map.Entry;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -22,7 +23,6 @@ import org.bukkit.entity.Player;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
 import com.bencodez.votingplugin.VotingPluginMain;
@@ -116,7 +116,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	 * @param value the value
 	 * @return current total points
 	 */
-	public int addPoints(int value) {
+	public synchronized int addPoints(int value) {
 		PlayerReceivePointsEvent event = new PlayerReceivePointsEvent(this, value);
 		Bukkit.getPluginManager().callEvent(event);
 
@@ -171,13 +171,8 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			voteEvent.setAddTotals(setTotals);
 			voteEvent.setBungeeTextTotals(text);
 			voteEvent.setVotingPluginUser(this);
-			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+			plugin.getServer().getPluginManager().callEvent(voteEvent);
 
-				@Override
-				public void run() {
-					plugin.getServer().getPluginManager().callEvent(voteEvent);
-				}
-			});
 		}
 	}
 
@@ -192,19 +187,15 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			voteEvent.setAddTotals(setTotals);
 			voteEvent.setBungeeTextTotals(text);
 			voteEvent.setVotingPluginUser(this);
-			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+			plugin.getServer().getPluginManager().callEvent(voteEvent);
 
-				@Override
-				public void run() {
-					plugin.getServer().getPluginManager().callEvent(voteEvent);
-				}
-			});
 		}
 	}
 
 	public void bungeeVotePluginMessaging(String service, long time, BungeeMessageData text, boolean setTotals,
-			boolean wasOnline, boolean broadcast) {
+			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,
@@ -217,13 +208,9 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			voteEvent.setBungeeTextTotals(text);
 			voteEvent.setWasOnline(wasOnline);
 			voteEvent.setBroadcast(broadcast);
-			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+			voteEvent.setVoteNumber(num);
+			plugin.getServer().getPluginManager().callEvent(voteEvent);
 
-				@Override
-				public void run() {
-					plugin.getServer().getPluginManager().callEvent(voteEvent);
-				}
-			});
 		}
 	}
 
@@ -285,10 +272,24 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 
 				return now.isAfter(nextvote);
 			} else {
-				if (now.getDayOfYear() != lastVote.getDayOfYear() || now.getYear() != lastVote.getYear()) {
-					return true;
+				LocalDateTime offsetoclockyesterday = plugin.getTimeChecker().getTime().plusDays(-1).withHour(0)
+						.withMinute(0).plusHours((long) voteSite.getTimeOffSet());
+				LocalDateTime offsetoclocktoday = plugin.getTimeChecker().getTime().withHour(0).withMinute(0)
+						.plusHours((long) voteSite.getTimeOffSet());
+
+				if (!now.isBefore(offsetoclocktoday)) {
+					if (!lastVote.isBefore(offsetoclocktoday)) {
+						return false;
+					} else {
+						return true;
+					}
+				} else {
+					if (!lastVote.isBefore(offsetoclockyesterday)) {
+						return false;
+					} else {
+						return true;
+					}
 				}
-				return false;
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -297,6 +298,13 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 
 	}
 
+	public boolean checkAlmostAllVotes() {
+		if (getSitesNotVotedOn() == 1) {
+			return true;
+		}
+		return false;
+	}
+
 	/**
 	 * Check all votes.
 	 *
@@ -390,7 +398,11 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		if (str == null || str.isEmpty() || str.equals("null")) {
 			return 0;
 		}
-		return Long.parseLong(str);
+		try {
+			return Long.parseLong(str);
+		} catch (NumberFormatException e) {
+			return 0;
+		}
 	}
 
 	public boolean getDisableBroadcast() {
@@ -401,6 +413,11 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		return getData().getInt(plugin.getVotingPluginUserManager().getGottenAllSitesDayPath(), 0, isWaitForCache());
 	}
 
+	public int getGottenAlmostAllSitesDay() {
+		return getData().getInt(plugin.getVotingPluginUserManager().getGottenAlmostAllSitesDayPath(), 0,
+				isWaitForCache());
+	}
+
 	public HashMap<String, Boolean> getHasGottenMilestone() {
 		HashMap<String, Boolean> hasGottenMilestone = new HashMap<String, Boolean>();
 		ArrayList<String> milestoneList = getUserData().getStringList(getGottenMilestonesPath());
@@ -430,6 +447,31 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		return getData().getInt("LastMonthTotal", isCacheData(), isWaitForCache());
 	}
 
+	public HashMap<VoteSite, Boolean> getCoolDownCheckSiteList() {
+		HashMap<VoteSite, Boolean> coolDownChecks = new HashMap<VoteSite, Boolean>();
+		ArrayList<String> coolDownCheck = getData().getStringList(getCoolDownCheckSitePath(), isCacheData(),
+				isWaitForCache());
+		for (String str : coolDownCheck) {
+			String[] data = str.split("//");
+			if (data.length > 1 && plugin.hasVoteSite(data[0])) {
+				VoteSite site = plugin.getVoteSite(data[0], true);
+				if (site != null) {
+					Boolean b = Boolean.valueOf(data[1]);
+					coolDownChecks.put(site, b);
+				}
+			}
+		}
+		return coolDownChecks;
+	}
+
+	public boolean getCoolDownCheckSite(VoteSite site) {
+		HashMap<VoteSite, Boolean> coolDownChecks = getCoolDownCheckSiteList();
+		if (coolDownChecks.containsKey(site)) {
+			return coolDownChecks.get(site).booleanValue();
+		}
+		return false;
+	}
+
 	public HashMap<VoteSite, Long> getLastVotes() {
 		HashMap<VoteSite, Long> lastVotes = new HashMap<VoteSite, Long>();
 		ArrayList<String> LastVotesList = getUserData().getStringList("LastVotes");
@@ -452,6 +494,16 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		return lastVotes;
 	}
 
+	public Long getLastVoteTime() {
+		Long time = Long.valueOf(0);
+		for (Long value : getLastVotes().values()) {
+			if (value.longValue() > time) {
+				time = value;
+			}
+		}
+		return time;
+	}
+
 	/**
 	 * Gets the last vote times sorted.
 	 *
@@ -571,22 +623,22 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	public void giveDailyTopVoterAward(int place, String path) {
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getDailyAwardRewardsPath(path)).withPlaceHolder("place", "" + place)
-						.withPlaceHolder("topvoter", "Daily").withPlaceHolder("votes", "" + getTotal(TopVoter.Daily))
-						.setOnline(isOnline()).send(this);
+				.withPlaceHolder("topvoter", "Daily").withPlaceHolder("votes", "" + getTotal(TopVoter.Daily))
+				.setOnline(isOnline()).send(this);
 	}
 
 	public void giveMonthlyTopVoterAward(int place, String path) {
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getMonthlyAwardRewardsPath(path)).withPlaceHolder("place", "" + place)
-						.withPlaceHolder("topvoter", "Monthly")
-						.withPlaceHolder("votes", "" + getTotal(TopVoter.Monthly)).setOnline(isOnline()).send(this);
+				.withPlaceHolder("topvoter", "Monthly").withPlaceHolder("votes", "" + getTotal(TopVoter.Monthly))
+				.setOnline(isOnline()).send(this);
 	}
 
 	public void giveWeeklyTopVoterAward(int place, String path) {
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getWeeklyAwardRewardsPath(path)).withPlaceHolder("place", "" + place)
-						.withPlaceHolder("topvoter", "Weekly").withPlaceHolder("votes", "" + getTotal(TopVoter.Weekly))
-						.setOnline(isOnline()).send(this);
+				.withPlaceHolder("topvoter", "Weekly").withPlaceHolder("votes", "" + getTotal(TopVoter.Weekly))
+				.setOnline(isOnline()).send(this);
 	}
 
 	/**
@@ -660,11 +712,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);
+		}
 	}
 
 	/**
@@ -678,23 +734,30 @@ 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) {
 				setTopVoterIgnore(topVoterIngorePerm);
 			}
 			ArrayList<String> offlineVotes = getOfflineVotes();
-			// plugin.debug(ArrayUtils.getInstance().makeStringList(offlineVotes));
+			// plugin.debug("Offvotes: " +
+			// ArrayUtils.getInstance().makeStringList(offlineVotes));
 			if (offlineVotes.size() > 0) {
 				sendVoteEffects(false);
 				setOfflineVotes(new ArrayList<String>());
 			}
 
+			boolean offlineBroadcast = plugin.getConfigFile().isFormatOnlyOneOfflineBroadcast();
+
+			if (offlineBroadcast && offlineVotes.size() > 0) {
+				offlineBroadcast(this, plugin.getBungeeSettings().isUseBungeecoord(), offlineVotes.size());
+			}
+
 			for (int i = 0; i < offlineVotes.size(); i++) {
 				if (plugin.hasVoteSite(offlineVotes.get(i))) {
 					plugin.debug("Giving offline site reward: " + offlineVotes.get(i));
-					playerVote(plugin.getVoteSite(offlineVotes.get(i), true), false, true, false);
+					playerVote(plugin.getVoteSite(offlineVotes.get(i), true), false, !offlineBroadcast, false);
 				} else {
 					plugin.debug("Site doesn't exist: " + offlineVotes.get(i));
 				}
@@ -702,6 +765,52 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		}
 	}
 
+	public void offlineBroadcast(VotingPluginUser user, boolean checkBungee, int numberOfVotes) {
+		if (plugin.getConfigFile().isFormatAlternateBroadcastEnabled()) {
+			return;
+		}
+		if (!user.isVanished()) {
+			String playerName = user.getPlayerName();
+			if (plugin.getConfigFile().getVotingBroadcastBlacklist().contains(playerName)) {
+				plugin.getLogger().info("Not broadcasting for " + playerName + ", in blacklist");
+				return;
+			}
+			if (checkBungee && plugin.getBungeeSettings().isBungeeBroadcast()
+					&& plugin.getBungeeSettings().isUseBungeecoord()) {
+				if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.SOCKETS)) {
+					plugin.getBungeeHandler().sendData("BroadcastOffline", "" + numberOfVotes, user.getPlayerName());
+				} else if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.MYSQL)
+						|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
+					String uuid = user.getUUID();
+
+					if (Bukkit.getOnlinePlayers().size() > 0) {
+						plugin.getPluginMessaging().sendPluginMessage("VoteBroadcastOffline", uuid, "" + numberOfVotes);
+					}
+				}
+
+			} else {
+				String bc = StringParser.getInstance().colorize(plugin.getConfigFile().getFormatOfflineBroadcast());
+				HashMap<String, String> placeholders = new HashMap<String, String>();
+				placeholders.put("player", playerName);
+				placeholders.put("nickname",
+						(user.getPlayer() != null) ? user.getPlayer().getDisplayName() : user.getPlayerName());
+				placeholders.put("numberofvotes", "" + numberOfVotes);
+				bc = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
+				bc = StringParser.getInstance().replacePlaceHolders(user.getOfflinePlayer(), bc);
+				ArrayList<Player> players = new ArrayList<Player>();
+				for (Player p : Bukkit.getOnlinePlayers()) {
+					if (!UserManager.getInstance().getVotingPluginUser(p).getDisableBroadcast()) {
+						players.add(p);
+					}
+				}
+
+				MiscUtils.getInstance().broadcast(bc, players);
+			}
+		} else {
+			plugin.debug(user.getPlayerName() + " is vanished, not broadcasting");
+		}
+	}
+
 	public void playerVote(VoteSite voteSite, boolean online, boolean broadcast, boolean bungee) {
 		if (plugin.getConfigFile().getFormatBroadcastWhenOnline() && plugin.getConfigFile().isBroadcastVotesEnabled()
 				&& broadcast && !plugin.getBungeeSettings().isDisableBroadcast()) {
@@ -734,7 +843,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	 * @param online the online
 	 */
 	public void sendVoteEffects(boolean online) {
-		RewardHandler.getInstance().giveReward(this, plugin.getSpecialRewardsConfig().getData(),
+		plugin.getRewardHandler().giveReward(this, plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getAnySiteRewardsPath(), new RewardOptions().setOnline(online));
 	}
 
@@ -779,6 +888,10 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		getData().setInt(plugin.getVotingPluginUserManager().getGottenAllSitesDayPath(), day);
 	}
 
+	public void setGottenAlmostAllSitesDay(int day) {
+		getData().setInt(plugin.getVotingPluginUserManager().getGottenAlmostAllSitesDayPath(), day);
+	}
+
 	public void setHasGotteMilestone(int votesRequired, boolean b) {
 		HashMap<String, Boolean> hasGottenMilestone = getHasGottenMilestone();
 		hasGottenMilestone.put("" + votesRequired, b);
@@ -796,7 +909,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 
 	public String getGottenMilestonesPath() {
 		if (plugin.getBungeeSettings().isPerServerMilestones()) {
-			return plugin.getOptions().getServer() + "_" + "GottenMilestones";
+			return plugin.getBungeeSettings().getServerNameStorage() + "_" + "GottenMilestones";
 		}
 		return "GottenMileStones";
 	}
@@ -826,18 +939,41 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		getUserData().setStringList("LastVotes", data);
 	}
 
+	public void setCoolDownCheckSite(HashMap<VoteSite, Boolean> coolDownChecks) {
+		ArrayList<String> data = new ArrayList<String>();
+		for (Entry<VoteSite, Boolean> entry : coolDownChecks.entrySet()) {
+			String str = entry.getKey().getKey() + "//" + entry.getValue().toString();
+			data.add(str);
+		}
+		getUserData().setStringList(getCoolDownCheckSitePath(), data);
+	}
+
+	public void setCoolDownCheckSite(VoteSite site, boolean value) {
+		HashMap<VoteSite, Boolean> coolDownChecks = getCoolDownCheckSiteList();
+		coolDownChecks.put(site, Boolean.valueOf(value));
+		setCoolDownCheckSite(coolDownChecks);
+	}
+
 	public void setMilestoneCount(int value) {
 		getData().setInt("MilestoneCount", value);
 	}
 
 	public String getCoolDownCheckPath() {
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
-			return "CoolDownCheck_" + plugin.getBungeeSettings().getServer();
+			return "CoolDownCheck_" + plugin.getBungeeSettings().getServerNameStorage();
 		} else {
 			return "CoolDownCheck";
 		}
 	}
 
+	public String getCoolDownCheckSitePath() {
+		if (plugin.getBungeeSettings().isUseBungeecoord()) {
+			return "CoolDownCheck_" + plugin.getBungeeSettings().getServerNameStorage() + "_Sites";
+		} else {
+			return "CoolDownCheck" + "_Sites";
+		}
+	}
+
 	public void setCoolDownCheck(boolean coolDownCheck) {
 		getData().setBoolean(getCoolDownCheckPath(), coolDownCheck);
 	}
@@ -868,7 +1004,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	 * @param value the new points
 	 */
 	public void setPoints(int value) {
-		getUserData().setInt(getPointsPath(), value, !plugin.getBungeeSettings().isUseBungeecoord());
+		getUserData().setInt(getPointsPath(), value, false);
 	}
 
 	public void setPrimaryAccount(java.util.UUID uuid) {
@@ -879,6 +1015,40 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		}
 	}
 
+	public int getNextAvailableMileStone() {
+		Set<String> mVotes = plugin.getSpecialRewardsConfig().getMilestoneVotes();
+		ArrayList<Integer> nums = new ArrayList<Integer>();
+		int mileStoneCount = getMilestoneCount();
+		HashMap<String, Boolean> gottenMileStones = getHasGottenMilestone();
+		for (String vote : mVotes) {
+			if (StringParser.getInstance().isInt(vote)) {
+				final int num = Integer.parseInt(vote);
+				if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(num)) {
+					if (gottenMileStones.containsKey("" + num)) {
+						if (!gottenMileStones.get("" + num).booleanValue()) {
+							nums.add(Integer.valueOf(num));
+						}
+					} else {
+						nums.add(Integer.valueOf(num));
+					}
+				}
+			}
+		}
+
+		int lowestNum = -1;
+
+		for (Integer num : nums) {
+			if (mileStoneCount < num.intValue()) {
+				if (lowestNum == -1 || num.intValue() < lowestNum) {
+					lowestNum = num.intValue();
+				}
+			}
+		}
+
+		return lowestNum;
+
+	}
+
 	public void setReminded(boolean reminded) {
 		getUserData().setString("Reminded", "" + reminded);
 	}
@@ -1230,7 +1400,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	}
 
 	public TopVoterPlayer getTopVoterPlayer() {
-		return new TopVoterPlayer(UUID.fromString(getUUID()), getPlayerName());
+		return new TopVoterPlayer(UUID.fromString(getUUID()), getPlayerName(), getLastOnline());
 	}
 
 	public long getNextTimeAllSitesAvailable() {
@@ -1245,4 +1415,32 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		return longest;
 	}
 
+	public long getNextTimeFirstSiteAvailable() {
+		long shortest = 0;
+		for (VoteSite site : plugin.getVoteSites()) {
+			if (!canVoteSite(site)) {
+				long seconds = voteNextDurationTime(site);
+				if (shortest == 0 || seconds < shortest) {
+					shortest = seconds;
+				}
+			}
+		}
+
+		return shortest;
+	}
+
+	public void resetLastVoted() {
+		HashMap<VoteSite, Long> map = getLastVotes();
+		for (Entry<VoteSite, Long> e : map.entrySet()) {
+			e.setValue(0l);
+		}
+		setLastVotes(map);
+	}
+
+	public void resetLastVoted(VoteSite site) {
+		HashMap<VoteSite, Long> map = getLastVotes();
+		map.put(site, 0l);
+		setLastVotes(map);
+	}
+
 }

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

@@ -3,6 +3,7 @@ package com.bencodez.votingplugin.voteparty;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Random;
 import java.util.UUID;
 
 import org.bukkit.Bukkit;
@@ -59,30 +60,41 @@ public class VoteParty implements Listener {
 		}
 	}
 
-	public void check(boolean forceBungee) {
-		if (getTotalVotes() >= getVotesRequired() && ((plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerDay()
-				&& plugin.getServerData().isLastVotePartySameDay())
-				|| !plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerDay())) {
-			if (plugin.getSpecialRewardsConfig().isVotePartyResetCount()) {
-				setTotalVotes(getTotalVotes() - getVotesRequired());
-			}
+	public void check(VotingPluginUser user, boolean forceBungee) {
+		if (getTotalVotes() < getVotesRequired()) {
+			return;
+		}
+		if (plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerDay()
+				&& plugin.getServerData().isLastVotePartySameDay()) {
+			return;
+		}
+		if (plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerWeek()
+				&& plugin.getServerData().isLastVotePartySameWeek()) {
+			return;
+		}
+		if (plugin.getSpecialRewardsConfig().isVotePartyResetCount()) {
+			setTotalVotes(getTotalVotes() - getVotesRequired());
+		}
 
-			VotePartyEvent event = new VotePartyEvent();
-			Bukkit.getPluginManager().callEvent(event);
-			if (event.isCancelled()) {
-				return;
-			}
+		VotePartyEvent event = new VotePartyEvent();
+		Bukkit.getPluginManager().callEvent(event);
+		if (event.isCancelled()) {
+			return;
+		}
 
-			giveRewards(forceBungee);
+		giveRewards(user, forceBungee);
 
-			if (plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRquired() > 0) {
-				plugin.getServerData().setVotePartyExtraRequired(plugin.getServerData().getVotePartyExtraRequired()
-						+ plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRquired());
-			}
+		if (plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRquired() > 0) {
+			plugin.getServerData().setVotePartyExtraRequired(plugin.getServerData().getVotePartyExtraRequired()
+					+ plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRquired());
+		}
 
-			if (plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerDay()) {
-				plugin.getServerData().updateLastVoteParty();
-			}
+		if (plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerDay()) {
+			plugin.getServerData().updateLastVoteParty();
+		}
+
+		if (plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerWeek()) {
+			plugin.getServerData().updateLastVotePartyWeek();
 		}
 
 	}
@@ -103,7 +115,13 @@ public class VoteParty implements Listener {
 			placeholders.put("neededvotes", "" + neededVotes);
 			placeholders.put("votes", "" + votes);
 			msg = ArrayUtils.getInstance().colorize(ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders));
-			sender.sendMessage(ArrayUtils.getInstance().convert(msg));
+			if (sender instanceof Player) {
+				Player p = (Player) sender;
+				sender.sendMessage(
+						ArrayUtils.getInstance().convert(ArrayUtils.getInstance().replacePlaceHolders(msg, p)));
+			} else {
+				sender.sendMessage(ArrayUtils.getInstance().convert(msg));
+			}
 		} else {
 			sender.sendMessage(StringParser.getInstance().colorize("&cVoteParty not enabled"));
 		}
@@ -164,22 +182,34 @@ public class VoteParty implements Listener {
 
 	public void giveReward(VotingPluginUser user, boolean online, boolean useBungee) {
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getVotePartyRewardsPath())
-						.setOnline(online)
-						.withPlaceHolder("VotesRequired",
-								"" + plugin.getSpecialRewardsConfig().getVotePartyVotesRequired())
-						.setServer(useBungee).send(user);
+				plugin.getSpecialRewardsConfig().getVotePartyRewardsPath()).setOnline(online)
+				.withPlaceHolder("VotesRequired", "" + plugin.getSpecialRewardsConfig().getVotePartyVotesRequired())
+				.setServer(useBungee).send(user);
 	}
 
-	public void giveRewards(boolean forceBungee) {
+	public String getRandomPlayerName() {
+		ArrayList<String> allPlayers = new ArrayList<String>();
+		for (Player players : Bukkit.getOnlinePlayers()) {
+			allPlayers.add(players.getName());
+		}
+		if (allPlayers.size() == 0) {
+			return "No Player";
+		}
+		int random = new Random().nextInt(allPlayers.size());
+		return allPlayers.get(random);
+	}
+
+	public void giveRewards(VotingPluginUser orgUser, boolean forceBungee) {
 		MiscUtils.getInstance().broadcast(plugin.getSpecialRewardsConfig().getVotePartyBroadcast());
 
-		for (final String cmd : plugin.getSpecialRewardsConfig().getVotePartyCommands()) {
+		String player = getRandomPlayerName();
+		for (final String cmd : plugin.getSpecialRewardsConfig().getVotePartyGlobalCommands()) {
 			Bukkit.getScheduler().runTask(plugin, new Runnable() {
 
 				@Override
 				public void run() {
-					Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), cmd);
+					Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(),
+							StringParser.getInstance().replacePlaceHolder(cmd, "randomonlineplayer", player));
 				}
 
 			});
@@ -189,8 +219,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);
 				}
@@ -198,8 +234,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);
 					}
@@ -209,8 +251,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);
 				}
@@ -288,7 +335,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

@@ -1,9 +1,10 @@
 package com.bencodez.votingplugin.votereminding;
 
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -24,7 +25,7 @@ public class VoteReminding {
 	/** The plugin. */
 	private VotingPluginMain plugin;
 
-	private Timer timer;
+	private ScheduledExecutorService timer;
 
 	@Getter
 	private ConcurrentHashMap<UUID, Boolean> remindersEnabled = new ConcurrentHashMap<UUID, Boolean>();
@@ -61,24 +62,26 @@ public class VoteReminding {
 	 */
 	public void loadRemindChecking() {
 		if (timer != null) {
-			timer.cancel();
+			timer.shutdownNow();
 		}
 		if (plugin.getConfigFile().getVoteRemindingRemindDelay() > 0) {
-			timer = new Timer();
-			timer.schedule(new TimerTask() {
+			timer = Executors.newScheduledThreadPool(1);
+			timer.scheduleWithFixedDelay(new Runnable() {
 
 				@Override
 				public void run() {
 					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 {
-						cancel();
+						timer.shutdown();
 					}
 				}
-			}, 1000 * 30, plugin.getConfigFile().getVoteRemindingRemindDelay() * 1000 * 60);
+			}, 30, plugin.getConfigFile().getVoteRemindingRemindDelay() * 60, TimeUnit.SECONDS);
 		}
 	}
 
@@ -104,6 +107,7 @@ public class VoteReminding {
 	public boolean shouldRemind(VotingPluginUser user) {
 		if (remindersEnabled.containsKey(user.getJavaUUID())) {
 			if (!remindersEnabled.get(user.getJavaUUID()).booleanValue()) {
+
 				return false;
 			}
 		}
@@ -115,6 +119,7 @@ public class VoteReminding {
 				return user.canVoteAny();
 			}
 		} else {
+			plugin.debug(user.getUUID() + " no need to remind because plaeyr has VotingPlugin.NoRemind");
 			return false;
 		}
 	}
@@ -132,7 +137,11 @@ public class VoteReminding {
 					}
 					plugin.debug(user.getPlayerName() + " was reminded!");
 
+				} else {
+					plugin.debug("Not reminding for " + user.getUUID());
 				}
+			} else {
+				plugin.debug(user.getUUID() + " has no permission for reminders");
 			}
 		}
 	}