Update version number

Bug fix
Little improvements
2020-10-03 20:18:55 -04:00 · 2020-10-03 20:13:31 -04:00 · 2020-10-03 19:31:14 -04:00 · 2020-10-03 07:56:09 -04:00 · 2020-10-02 19:42:37 -04:00 · 2020-10-02 19:14:52 -04:00
46 changed files with 3518 additions and 1225 deletions
@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Bug report for VotingPlugin
+title: ''
+labels: Possible Bug
+assignees: ''
+
+---
+
+**Versions**
+Plugin version and spigot version.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots/Configs**
+If applicable, add screenshots to help explain your problem and/or configs relating to the issue.
+
+**Additional context**
+Add any other context about the problem here.
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea
+title: ''
+labels: Possible Feature
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
@@ -0,0 +1,17 @@
+---
+name: Question/Concerns
+about: Ask about a question or a concern about the plugin
+title: ''
+labels: Question/Concern
+assignees: ''
+
+---
+
+**Versions**
+Plugin version and spigot version
+
+**Relevant information**
+Configs that relate to the issue in a pastebin.
+
+**Context**
+Context about the question/concern
@@ -0,0 +1,16 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 20
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 5
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - Priority
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
@@ -9,6 +9,7 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
@@ -24,4 +25,6 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
@@ -0,0 +1,47 @@
+# --------------------------
+# 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
+
+# For pluginmessaging method only
+# Whether to broadcast on cached votes
+BungeeBroadcastAlways: false
+
+# What type of bungee setup
+# Requires restart and set on all servers
+# https://github.com/Ben12345rocks/VotingPlugin/wiki/Bungeecoord-Setups
+# Available:
+# SOCKETS
+# PLUGINMESSAGING
+# MYSQL
+BungeeMethod: PLUGINMESSAGING
+
+# Enables more debug messages for communication between servers
+# Use /votingpluginbungee status for testing communication
+BungeeDebug: false
+
+# Get the plugin to broadcast to all servers
+# If false you need to enable 
+BungeeBroadcast: false
+
+# What server this is in bungee (must match)
+# Also can be applied to rewards
+Server: PleaseSet
+
+# -----------------------------
+# For socket setup below only
+# -----------------------------
+
+# Bungee communication, add bungee host/port here
+BungeeServer:
+  Host: '127.0.0.1'
+  Port: 1297
+  
+# Bungee communication, add this to bungee server
+SpigotServer:
+  Host: '127.0.0.1'
+  Port: 1298
@@ -113,6 +113,8 @@ Commands:
  # disable /vote reward commands
  # Effective after restart
  DisableVoteRewardGUIs: false
+  # Enable to use book GUI instead of normal GUI
+  VoteBookGUI: false

 Format:
  # CommandHandler help message
@@ -131,7 +133,7 @@ Format:
    # %url% = site URL
    Vote: 
      Text:
-      - '&4&lVote for our server!'
+      - '&6&lVote for our server!'
      
      # If you want to want to use the feature below where the plugin will
      # automaticly list the sites then set the message in the text above
@@ -140,7 +142,10 @@ Format:
      # make sure to set VoteURL in your VoteSites
      # Requires above to be true
      # Text will be sent before this
-      Sites: '&4%num%: &c&l%SiteName% - &c%url%'
+      Sites: '&6%num%: &e&l%SiteName% - &e%url%'
+      
+      # If true, links will always be forced as urls
+      ForceLinks: true
      
      # Format for /vote next
      Next: 
@@ -334,6 +339,8 @@ GUI:
        Data: 0
        Amount: 1
        Name: '&4URL'
+        Lore:
+        - '&aClick me for links'
        # You can set skulls of the player using the following
        # Remove the # to enable
        #Skull: '%Player%'
@@ -357,7 +364,7 @@ GUI:
        Name: '&4Total'
    Top:
      Item:
-        Material: 'SIGN'
+        Material: 'OAK_SIGN'
        Data: 0
        Amount: 1
        Name: '&4Top'
@@ -412,6 +419,17 @@ GUI:
      Amount: 1
    URLText: '%VoteUrl%'
    
+  VoteURLBookGUI:
+    Title: '&cVoteURL'
+    SiteName: '&c%name%'
+    CanVoteText: 'Click me'
+    CanVoteColor: 'GREEN'
+    AlreadyVotedText: 'Click me'
+    AlreadyVotedColor: 'RED' 
+    Layout:
+    - '&c%Sitename%'
+    - '[UrlText]'
+    
  VoteRewardBackButton: false
  # Customize /vote reward
  # Show players what you get when you vote on each site
@@ -446,7 +464,14 @@ GUI:
    BackButton: true
  VoteToday:
    Name: 'VoteToday'
+    Line: '&6%VoteSite% : %Time%'
+    IconTitle: '%player%'
    BackButton: true
+    UseSkull: true
+    # If UseSkull is false, use this item
+    PlayerItem:
+      Material: 'PAPER'
+      Amount: 1
  VoteTop:
    Name: 'VoteTop %topvoter%'
    BackButton: false
@@ -454,9 +479,9 @@ GUI:
      Name: '&3&l%position%: &3%player%'
      Lore: '&3&lVotes: &3%votes%'
    SwitchItem:
-      Name: 'Switch TopVoter'
-      Lore: 'Currently: %Top%'
-      Material: 'SIGN'
+      Name: '&3Switch TopVoter'
+      Lore: '&bCurrently: %Top%'
+      Material: 'OAK_SIGN'
      Amount: 1
      # 8 Slots over from the bottom left
      Slot: 7
@@ -561,7 +586,7 @@ GUI:
  VoteShopName: 'VoteShop'
  
 BackButton:
-  Material: 'PAPER'
+  Material: 'BARRIER'
  Data: 0
  Amount: 1
  Name: '&8Back to VoteGUI'
@@ -572,10 +597,14 @@ VoteShopEnabled: true
 VoteShopHideLimitedReached: true
 # Requires above to be false
 VoteShopLimitReached: '&aYou reached your limit'
+VoteShopRequireConfirmation: false
+VoteShopDisabled: '&cVote shop disabled'
 Shop:
  # Identifier
  # Used in placeholders for formats
+  # Do not have spaces in the identifier
  Diamond:
+    Identifier_Name: 'Diamond'
    # Item
    Material: 'DIAMOND'
    Data: 0
@@ -592,6 +621,11 @@ Shop:
    Permission: ''
    # Limit how many times you can buy this
    #Limit: 3
+    # Reset limit daily/weekly/monthly
+    #Reset:
+      #Daily: false
+      #Weekly: false
+      #Monthly: false
    # If true, item is not buyable
    #NotBuyable: false
    # Rewards to run if player buys successfully
@@ -605,139 +639,8 @@ Shop:
 # Extra Rewards
 # ------------------------------------------------
    
-# To disable reward set value to []
-# Eg:
-# FirstVote: [] (All in one line)
-# By default all rewards are disabled
-
-# First vote rewards
-FirstVote: 
-  Messages:
-    Player: '&aYou voted for your first time!'
-  Money: 100
-
-# All vote rewards
-# Reward for voting on all sites in one day
-AllSites: 
-  Messages:
-    Player: '&aYou voted on all sites in 1 day!'
-
-Cumulative:
-  # Number of votes required
-  # Allows multiple cumulative rewards
-  # Number be be around ' (E.g. '1')
-  # Can have multiple listed here
-  '20':
-    Enabled: false
-    # Wether 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
-    VotesInSameDay: false
-    VotesInSameWeek: false
-    Rewards: 
-      Messages:
-        Player: '&aYou got %cumulative% cumulative votes!'
-
-VoteParty:
-  # Wether or not vote party is enabled
-  Enabled: false
-  # Number of votes required to give rewards
-  VotesRequired: 20
-  # Increase the amount of votes required on each vote party reached
-  #IncreaseVotesRquired: 10
-  # If true, players who did not vote to reach the votes required will 
-  # recieve the reward
-  GiveAllPlayers: false
-  # If true, the vote count will reset each day
-  ResetEachDay: false
-  # Reset at the end of the month
-  ResetMonthly: false
-  # Count votes from /av vote?
-  CountFakeVotes: true
-  # Number of user votes that apply to vote party total the user needs to get rewards
-  UserVotesRequired: 0
-  # Broadcast when vote party reached
-  Broadcast: '&cReached the vote party amount!'
-  # List of commands to execute, these only execute once.
-  # %player% does not work here
-  Commands: []
-  # Rewards to give per player
-  Rewards: 
-    Commands:
-    - say %player%
-    Items:
-      DIAMOND:
-        Material: 'DIAMOND'
-        Amount: 1
-  
-# Reset milestones at end of the month
-ResetMilestonesMonthly: false
-  
-MileStones:
-  # Number of votes required
-  # Allows multiple milestones
-  # Number be around ' (E.g. '1')
-  # Can have multiple listed here
-  '20':
-    Enabled: false
-    Rewards: 
-      Messages:
-        Player: '&aYou got %milestone% milestone votes!'
-   
-VoteStreak:
-  # Valid options: Day, Week, Month
-  Day:
-    # Number of days in a row
-    # Each day requires one vote
-    # Add a - to give a reward for every multiple (e.g. 2- = 2,4,6,8, and so on)
-    '2':
-      # Enabled or not
-      Enabled: false
-      # Rewards to give
-      Rewards:
-        Messages:
-          Player: "&aYou voted for %Streak% %Type%'s in a row!"
-  Week:
-    # Number of weeks in a row
-    # Requires atleast one vote per week
-    '2':
-      # Enabled or not
-      Enabled: false
-      # Rewards to give
-      Rewards:
-        Messages:
-          Player: "&aYou voted for %Streak% %Type%'s in a row!"
-  Month:
-    # Number of months in a row
-    # Requires atleast 1 vote per month
-    '2':
-      # Enabled or not
-      Enabled: false
-      # Rewards to give
-      Rewards:
-        Messages:
-          Player: "&aYou voted for %Streak% %Type%'s in a row!"
-  Requirement:
-    # Require certain percentage of votes
-    UsePercentage: false
-    # Percentage requirements of votes
-    # 50 = %50
-    Day: 50
-    Week: 50
-    Month: 50
-    
-# Reward given when vote cooldown ended
-VoteCoolDownEndedReward: []
-          
-  
-# ONLY USE THIS FOR TITLES/SOUNDS AND OTHER EFFECTS
-# IT WILL ONLY RUN ONE TIME FOR ANY NUMBER OF OFFLINE VOTES (3 offline votes = 1 AnySiteReward)
-# Any reward files listed here are ran on vote of any site
-# It is recommended to add rewards to each site instead of here
-# Using forceoffline won't work here
-# Use EverySiteReward in VoteSites.yml for a global reward for each site
-AnySiteRewards: []
-
+# Moved to SpecialRewards.yml
+# Rewards here will be copied upon updating

 # ------------------------------------------------
 # Top Voter
@@ -766,6 +669,10 @@ LoadTopVoter:
  Monthly: true
  Weekly: false
  Daily: false
+  
+# Maxium number of players to show on top voter
+# Set to -1 for no limit
+MaxiumNumberOfTopVotersToLoad: -1

 # When top voter awards are given (even if there are none listed) it will store top voters
 # Files will created in TopVoters folder.
@@ -773,47 +680,6 @@ StoreTopVoters:
  Monthly: true
  Weekly: false
  Daily: false
-
-EnableMonthlyAwards: true
-# Rewards to give
-MonthlyAwards:
-  # Position. 1 is first in top voter, 2 is second, etc...
-  # Using 1-10 will reward players in first to tenth place with the same reward
-  1:
-    Rewards:
-      Messages:
-        Player: '&aYou came in first place in %TopVoter%!'
-  2:
-    Rewards:
-      Messages:
-        Player: '&aYou came in second place in %TopVoter%!'
-    
-EnableWeeklyAwards: false
-# Rewards to give on weekly top voter
-WeeklyAwards:
-  # Position. 1 is first in top voter, 2 is second, etc...
-  1:
-    Rewards:
-      Messages:
-        Player: '&aYou came in first place in %TopVoter%!'
-  2:
-    Rewards:
-      Messages:
-        Player: '&aYou came in second place in %TopVoter%!'
-    
-EnableDailyRewards: false
-# Rewards to give on daily top voter
-DailyAwards:
-  # Position. 1 is first in top voter, 2 is second, etc...
-  1:
-    # Reward files to give
-    Rewards:
-      Messages:
-        Player: '&aYou came in first place in %TopVoter%!'
-  2:
-    Rewards:
-      Messages:
-        Player: '&aYou came in second place in %TopVoter%!'
    
 # ------------------------------------------------
 # Advanced
@@ -835,9 +701,22 @@ ClickSound:
  Volume: 1.0
  Pitch: 1.0
  
+# Playernames to not be broadcasted when voting
+# case sensitive
+VotingBroadcastBlacklist: []
+
+# Set to false to prevent javascript
+# parsing on placeholderapi placeholders
+UseJavascriptPlaceholders: true
+  
 # 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
+
 ######################
 # Debug
 ######################
@@ -886,6 +765,10 @@ CountFakeVotes: true
 # 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: []
+
 # Remove old player files
 # Happens on startup or /av purge
 PurgeOldData: false
@@ -943,31 +826,33 @@ LoadSkulls: true
 # May not work on some plugins
 UseVaultPermissions: false

-# Plugin using bungee, requires plugin on bungee server
-UseBungeecoord: false
-
-# What server this is in bungee (must match)
-# Also can be applied to rewards
-Server: PleaseSet
-
-# Get the plugin to broadcast to all servers
-BungeeBroadcast: false
-
 # List of disabled commands from /vote
 # List the specific permission
 # E.g:
 # - PERMISSION
 DisabledCommands: []

+# Enable to true for extra player checks
+ExtraBackgroundUpdate: false
+
+# This will prevent spam clicking GUI's to prevent exploits
+# Number is time in between clicking in milliseconds
+SpamClickTime: 350
+# Message to send when inventory forced closed when spam clicking
+# Uncomment to use
+#SpamClickMessage: '&cDetected spam clicking GUI, closing to prevent exploits'
+
 # ---------------------------------------------------------
-# Mysql cache options
+# Mysql cache options 
 # Clearing cache forces the plugin to pull from database
+# Not needed unless you are using multiple servers
 # ---------------------------------------------------------

 # Clear cache on update, setting to true reduces update speed
+# Also may require AlwaysUpdate set to true
 ClearCacheOnUpdate: false

-# Clear mysql on player join always
+# Clear cache on player join always
 ClearCacheOnJoin: false

 # Clears cache for the player who voted only
@@ -975,12 +860,17 @@ ClearCacheOnJoin: false
 # Would recommend for some bungee setups
 ClearCacheOnVote: false

-# Will force GUI's to close on every click
-AlwaysCloseInventory: false
+# Clear cache when player leaves
+ClearCacheOnLeave: false
+
+ClearCacheOnVoteShopPurchase: true

 # ###############################################################
 # Deprecated options, don't recommend using any of these

+# Will force GUI's to close on every click
+AlwaysCloseInventory: false
+
 # Options for request api
 # Current methods:
 # ANVIL
@@ -0,0 +1,176 @@
+# To disable reward set value to []
+# or remove entirely
+# Eg:
+# FirstVote: [] (All in one line)
+# Rewards will be given if there is a reward to give
+
+# First vote rewards
+FirstVote: 
+  Messages:
+    Player: '&aYou voted for your first time!'
+
+# All vote rewards
+# Reward for voting on all sites in one day
+AllSites: 
+  Messages:
+    Player: '&aYou voted on all sites in 1 day!'
+
+Cumulative:
+  # Number of votes required
+  # Allows multiple cumulative rewards
+  # Number be be around ' (E.g. '1')
+  # Can have multiple listed here
+  '20':
+    Enabled: false
+    # Wether 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
+    VotesInSameDay: false
+    VotesInSameWeek: false
+    VotesInSameMonth: false
+    Rewards: 
+      Messages:
+        Player: '&aYou got %cumulative% cumulative votes!'
+
+# Vote party configuration
+VoteParty:
+  # Wether or not vote party is enabled
+  Enabled: false
+  # Number of votes required to give rewards
+  VotesRequired: 20
+  # Increase the amount of votes required on each vote party reached
+  #IncreaseVotesRquired: 10
+  # If true, players who did not vote to reach the votes required will 
+  # recieve the reward
+  GiveAllPlayers: false
+  # If true, the vote count will reset each day
+  ResetEachDay: false
+  # Reset at the end of the month
+  ResetMonthly: false
+  # Reset extra votes
+  ResetExtraVotesMonthly: false
+  # Count votes from /av vote?
+  CountFakeVotes: true
+  # Number of user votes that apply to vote party total the user needs to get rewards
+  UserVotesRequired: 0
+  # Broadcast when vote party reached
+  Broadcast: '&cReached the vote party amount!'
+  # List of commands to execute, these only execute once.
+  # %player% does not work here
+  Commands: []
+  # Rewards to give per player
+  Rewards: 
+    Commands:
+    - say %player%
+    Items:
+      DIAMOND:
+        Material: 'DIAMOND'
+        Amount: 1
+  
+# Reset milestones at end of the month
+ResetMilestonesMonthly: false
+  
+MileStones:
+  # Number of votes required
+  # Allows multiple milestones
+  # Number be around ' (E.g. '1')
+  # Can have multiple listed here
+  '20':
+    Enabled: false
+    Rewards: 
+      Messages:
+        Player: '&aYou got %milestone% milestone votes!'
+   
+VoteStreak:
+  # Valid options: Day, Week, Month
+  Day:
+    # Number of days in a row
+    # Each day requires one vote
+    # Add a - to give a reward for every multiple (e.g. 2- = 2,4,6,8, and so on)
+    '2':
+      # Enabled or not
+      Enabled: false
+      # Rewards to give
+      Rewards:
+        Messages:
+          Player: "&aYou voted for %Streak% %Type%'s in a row!"
+  Week:
+    # Number of weeks in a row
+    # Requires atleast one vote per week
+    '2':
+      # Enabled or not
+      Enabled: false
+      # Rewards to give
+      Rewards:
+        Messages:
+          Player: "&aYou voted for %Streak% %Type%'s in a row!"
+  Month:
+    # Number of months in a row
+    # Requires atleast 1 vote per month
+    '2':
+      # Enabled or not
+      Enabled: false
+      # Rewards to give
+      Rewards:
+        Messages:
+          Player: "&aYou voted for %Streak% %Type%'s in a row!"
+  Requirement:
+    # Require certain percentage of votes
+    UsePercentage: false
+    # Percentage requirements of votes
+    # 50 = %50
+    Day: 50
+    Week: 50
+    Month: 50
+    
+# Reward given when vote cooldown ended
+VoteCoolDownEndedReward: []
+
+# ONLY USE THIS FOR TITLES/SOUNDS AND OTHER EFFECTS
+# IT WILL ONLY RUN ONE TIME FOR ANY NUMBER OF OFFLINE VOTES (3 offline votes = 1 AnySiteReward)
+# Any reward files listed here are ran on vote of any site
+# It is recommended to add rewards to each site instead of here
+# Using forceoffline won't work here
+# Use EverySiteReward in VoteSites.yml for a global reward for each site
+AnySiteRewards: []
+
+EnableMonthlyAwards: true
+# Rewards to give
+MonthlyAwards:
+  # Position. 1 is first in top voter, 2 is second, etc...
+  # Using 1-10 will reward players in first to tenth place with the same reward
+  1:
+    Rewards:
+      Messages:
+        Player: '&aYou came in first place in %TopVoter%!'
+  2:
+    Rewards:
+      Messages:
+        Player: '&aYou came in second place in %TopVoter%!'
+    
+EnableWeeklyAwards: false
+# Rewards to give on weekly top voter
+WeeklyAwards:
+  # Position. 1 is first in top voter, 2 is second, etc...
+  1:
+    Rewards:
+      Messages:
+        Player: '&aYou came in first place in %TopVoter%!'
+  2:
+    Rewards:
+      Messages:
+        Player: '&aYou came in second place in %TopVoter%!'
+    
+EnableDailyRewards: false
+# Rewards to give on daily top voter
+DailyAwards:
+  # Position. 1 is first in top voter, 2 is second, etc...
+  1:
+    # Reward files to give
+    Rewards:
+      Messages:
+        Player: '&aYou came in first place in %TopVoter%!'
+  2:
+    Rewards:
+      Messages:
+        Player: '&aYou came in second place in %TopVoter%!'
@@ -33,6 +33,9 @@ VoteSites:
    # Most sites are 24 hours
    VoteDelay: 24
    
+    # Use to have a minute votedelay
+    #VoteDelayMin: 30
+    
    # Require waiting until votedelay time has pasted in order to accept vote
    # Recommend: false
    WaitUntilVoteDelay: false
@@ -48,7 +51,7 @@ VoteSites:
    
    # VoteSite Material for some GUI's
    # Removing this may result in an error, required on each site
-    Item:
+    DisplayItem:
      Material: 'DIAMOND'
      Amount: 1

@@ -68,7 +71,7 @@ VoteSites:
    ServiceSite: 'PlanetMinecraft.com'
    VoteURL: 'link to vote URL here, used in /vote'
    VoteDelay: 24
-    Item:
+    DisplayItem:
      Material: 'DIAMOND'
      Amount: 1
    Rewards:
@@ -84,7 +87,10 @@ VoteSites:
        Reward1:
          Chance: 50
          # Any other requirement here
-          # If any requirement fails, the next will be attempted
+          # If any requirement fails, the next reward will be attempted
+          # Use permission requirement for rank based rewards
+          #RequirePermission: true
+          #Permission: 'permhere'
          Messages:
            Player: 'You got first reward'
        Reward2:
@@ -1,13 +1,7 @@
-# STILL A WORK IN PROGRESS, USE AT YOUR OWN RISK
-# 
-# Set bungeecoord to true on servers on the network
+# Set bungeecoord to true on servers on the network (In VotingPlugin)
 # Set server name in each server related to what it is on bungee
 #
-# Have a reward on each server
-SendVotesToAllServers: true
-# Have a reward on 1 server on the network
-SendToOnlineServer: false 
-# MYSQL Required
+# MYSQL Required on all setups
 # MYSQL INFO --------------------------
 Host: ''
 # Default port is 3306
@@ -24,4 +18,43 @@ MaxSize: -1
 # Table name prefix, for use with mutliple servers
 Prefix: ''
 #UseSSL: true
-#########################################
+
+Debug: false
+# Have a reward on each server
+# If false, will send to online server only
+SendVotesToAllServers: true
+# List of servers the plugin won't send the vote to
+# Uses names from bungeecoord config if not using SOCKETS method
+BlockedServers:
+- hub
+
+# What type of bungee setup
+# Requires restart and set on all servers
+# https://github.com/Ben12345rocks/VotingPlugin/wiki/Bungeecoord-Setups
+# Available:
+# SOCKETS 
+# PLUGINMESSAGING 
+# MYSQL
+BungeeMethod: PLUGINMESSAGING
+
+# ----------------------------
+# SOCKET METHOD Only, ignore otherwise
+# ----------------------------
+FallBackServer: factions
+
+# Tell servers to broadcast
+Broadcast: true
+
+# Bungee communication, Add this to each spigot server
+BungeeServer:
+  Host: '127.0.0.1'
+  Port: 1297
+  
+# Bungee communication, add each spigot server here
+SpigotServers:
+  lobby:
+    Host: '127.0.0.1'
+    Port: 1298
+  factions:
+    Host: '127.0.0.1'
+    Port: 1999
@@ -3,8 +3,8 @@ version: ${project.version}
 main: com.Ben12345rocks.VotingPlugin.Main
 description: Highly Customizable Voting Listener!
 website: https://www.spigotmc.org/resources/votingplugin.15358/
-author: Ben12345rocks
-softdepend: [MVdWPlaceholders, Votifier]
+author: BenCodez
+softdepend: [MVdWPlaceholders, Votifier, VotifierPlus, NuVotifier, CMI, Vault, PlaceholderAPI, ProtocolLib, MVdWPlaceholderAPI, AuthMe]
 api-version: 1.13
 commands:
  vote:
@@ -195,15 +195,25 @@ commands:
  adminvoteForceVoteParty:
    description: Command Alias
    aliases: avForceVoteParty
-  adminvoteUserEditValue:
-    description: Command Alias
-    aliases: avUserEditValue
  adminvoteSetRequestMethod:
    description: Command Alias
    aliases: avSetRequestMethod
  adminvoteUser:
    description: Command Alias
    aliases: avUser
+  adminvoteCurrentPluginTime:
+    description: Command Alias
+    aliases: avCurrentPluginTime
+  adminvoteResetPoints:
+    description: Command Alias
+    aliases: avResetPoints
+  adminvoteVotePartyExtraRequired:
+    description: Command Alias
+    aliases: avVotePartyExtraRequired
+  adminvoteRunCMD:
+    description: Command Alias
+    aliases: avRunCMD
+    
 permissions:
  VotingPlugin.Player:
    description: Allows basic access player commands
@@ -225,4 +235,6 @@ permissions:
    default: false
  VotingPlugin.Sign.Create:
    description: Permission to create sign
+  VotingPlugin.Admin.GenerateServiceSite:
+    description: Permission for generating votesite message
  
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.20.3</version>
+	<version>5.24</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -78,7 +78,7 @@
 			<plugin>
 				<groupId>org.projectlombok</groupId>
 				<artifactId>lombok-maven-plugin</artifactId>
-				<version>1.18.2.0</version>
+				<version>1.18.12.0</version>
 				<executions>
 					<execution>
 						<id>delombok</id>
@@ -254,12 +254,12 @@
 			<version>master-SNAPSHOT</version>
 		</dependency>

-		<!-- <dependency> <groupId>com.Ben12345rocks</groupId> <artifactId>AdvancedCore</artifactId> 
+		<!--<dependency> <groupId>com.Ben12345rocks</groupId> <artifactId>AdvancedCore</artifactId> 
 			<version>LATEST</version> <scope>compile</scope> </dependency> -->
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.14.4-R0.1-SNAPSHOT</version>
+			<version>1.16.3-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -320,5 +320,10 @@
 			<artifactId>ConfigUpdater</artifactId>
 			<version>1.1-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>xyz.upperlevel.spigot.book</groupId>
+			<artifactId>spigot-book-api</artifactId>
+			<version>1.3</version>
+		</dependency>
 	</dependencies>
 </project>
@@ -1,13 +1,23 @@
 package com.Ben12345rocks.VotingPlugin;

+import java.io.File;
 import java.util.ArrayList;
 import java.util.UUID;

+import com.Ben12345rocks.AdvancedCore.Util.Encryption.EncryptionHandler;
 import com.Ben12345rocks.AdvancedCore.Util.PluginMessage.PluginMessage;
 import com.Ben12345rocks.AdvancedCore.Util.PluginMessage.PluginMessageHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.ClientHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketReceiver;
+import com.Ben12345rocks.VotingPlugin.Config.BungeeSettings;
+import com.Ben12345rocks.VotingPlugin.Data.ServerData;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+import com.Ben12345rocks.VotingPlugin.bungee.BungeeMethod;
+
+import lombok.Getter;

 public class BungeeHandler {
 	private static BungeeHandler instance = new BungeeHandler();
@@ -16,32 +26,222 @@ public class BungeeHandler {
 		return instance;
 	}

+	@Getter
+	private SocketHandler socketHandler;
+
+	@Getter
+	private ClientHandler clientHandler;
+
+	private EncryptionHandler encryptionHandler;
+
+	@Getter
+	private BungeeMethod method;
+
+	public void close() {
+		socketHandler.closeConnection();
+		clientHandler.stopConnection();
+	}
+
 	public void load() {
-		PluginMessage.getInstance().add(new PluginMessageHandler("bungeevote") {
+		Main.plugin.debug("Loading bungee handler");

-			@Override
-			public void onRecieve(String subchannel, ArrayList<String> data) {
-				String uuid = data.get(0);
-				Main.plugin.getMysql().clearCache(uuid);
-				User user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-				user.bungeeVote();
-			}
-		});
+		method = BungeeMethod.getByName(BungeeSettings.getInstance().getBungeeMethod());

-		PluginMessage.getInstance().add(new PluginMessageHandler("Broadcast") {
+		Main.plugin.getLogger().info("Using BungeeMethod: " + method.toString());
+
+		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			Main.plugin.registerBungeeChannels();
+
+			PluginMessage.getInstance().add(new PluginMessageHandler("Vote") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					String player = args.get(0);
+					String uuid = args.get(1);
+					String service = args.get(2);
+					long time = Long.parseLong(args.get(3));
+					Main.plugin.debug("pluginmessaging vote received from " + player + " on " + service);
+					User user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					user.clearCache();
+
+					user.bungeeVotePluginMessaging(service, time);
+
+					if (!BungeeSettings.getInstance().isBungeeBroadcast()) {
+						if (Boolean.valueOf(args.get(4)) || BungeeSettings.getInstance().isBungeeBroadcastAlways()) {
+							VoteSite site = Main.plugin.getVoteSite(service);
+							if (site != null) {
+								site.broadcastVote(user, false);
+							} else {
+								Main.plugin.getLogger().warning("No votesite for " + service);
+							}
+						}
+					}
+
+					if (args.size() > 4 && Boolean.valueOf(args.get(5))) {
+						ServerData.getInstance().addServiceSite(service);
+					}

-			@Override
-			public void onRecieve(String subchannel, ArrayList<String> data) {
-				VoteSite site = Main.plugin.getVoteSite(data.get(0));
-				String p = data.get(1);
-				User user = UserManager.getInstance().getVotingPluginUser(p);
-				if (site != null) {
-					site.broadcastVote(user, false);
-				} else {
-					Main.plugin.getLogger().warning("No votesite for " + data.get(0));
 				}
-				Main.plugin.setUpdate(true);
+			});
+
+			PluginMessage.getInstance().add(new PluginMessageHandler("VoteOnline") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					String player = args.get(0);
+					String uuid = args.get(1);
+					String service = args.get(2);
+					long time = Long.parseLong(args.get(3));
+					Main.plugin.debug("pluginmessaging voteonline received from " + player + " on " + service);
+					User user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					user.clearCache();
+
+					user.bungeeVotePluginMessaging(service, time);
+
+					if (!BungeeSettings.getInstance().isBungeeBroadcast()) {
+						if (Boolean.valueOf(args.get(4)) || BungeeSettings.getInstance().isBungeeBroadcastAlways()) {
+							VoteSite site = Main.plugin.getVoteSite(service);
+							if (site != null) {
+								site.broadcastVote(user, false);
+							} else {
+								Main.plugin.getLogger().warning("No votesite for " + service);
+							}
+						}
+					}
+
+					if (args.size() > 4 && Boolean.valueOf(args.get(5))) {
+						ServerData.getInstance().addServiceSite(service);
+					}
+				}
+			});
+
+			PluginMessage.getInstance().add(new PluginMessageHandler("VoteUpdate") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					String player = args.get(0);
+					Main.plugin.debug("pluginmessaging voteupdate received for " + player);
+					User user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(player));
+					user.clearCache();
+
+					user.offVote();
+
+					Main.plugin.setUpdate(true);
+				}
+			});
+
+			PluginMessage.getInstance().add(new PluginMessageHandler("VoteBroadcast") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					String uuid = args.get(0);
+					String service = args.get(1);
+					User user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					VoteSite site = Main.plugin.getVoteSite(service);
+					if (site != null) {
+						site.broadcastVote(user, false);
+					} else {
+						Main.plugin.getLogger().warning("No votesite for " + service);
+					}
+				}
+			});
+
+		} else if (method.equals(BungeeMethod.SOCKETS)) {
+			encryptionHandler = new EncryptionHandler(new File(Main.plugin.getDataFolder(), "secretkey.key"));
+
+			clientHandler = new ClientHandler(BungeeSettings.getInstance().getBungeeServerHost(),
+					BungeeSettings.getInstance().getBungeeServerPort(), encryptionHandler,
+					BungeeSettings.getInstance().isBungeeDebug());
+
+			socketHandler = new SocketHandler(Main.plugin.getVersion(),
+					BungeeSettings.getInstance().getSpigotServerHost(),
+					BungeeSettings.getInstance().getSpigotServerPort(), encryptionHandler,
+					BungeeSettings.getInstance().isBungeeDebug());
+
+			socketHandler.add(new SocketReceiver("bungeevote") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 3) {
+						Main.plugin.extraDebug("BungeeVote from " + data[2] + ", processing");
+						String uuid = data[1];
+						User user = null;
+						if (!uuid.isEmpty()) {
+							user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+						} else {
+							user = UserManager.getInstance().getVotingPluginUser(data[2]);
+						}
+
+						user.clearCache();
+
+						user.bungeeVote(data[3]);
+					}
+				}
+			});
+
+			socketHandler.add(new SocketReceiver("bungeevoteonline") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 3) {
+						Main.plugin.extraDebug("BungeeVoteOnline from " + data[2] + ", processing");
+						String uuid = data[1];
+						User user = null;
+						if (!uuid.isEmpty()) {
+							user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+						} else {
+							user = UserManager.getInstance().getVotingPluginUser(data[2]);
+						}
+
+						user.clearCache();
+
+						user.bungeeVoteOnline(data[3]);
+					}
+				}
+			});
+
+			socketHandler.add(new SocketReceiver("BungeeBroadcast") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 2) {
+						VoteSite site = Main.plugin.getVoteSite(data[1]);
+						String p = data[3];
+						User user = UserManager.getInstance().getVotingPluginUser(p);
+						if (site != null) {
+							site.broadcastVote(user, false);
+						} else {
+							Main.plugin.getLogger().warning("No votesite for " + data[1]);
+						}
+					}
+				}
+			});
+
+			socketHandler.add(new SocketReceiver("Status") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 0) {
+						Main.plugin.getLogger().info("Received status command, sending status back");
+						sendData("StatusOkay", Main.plugin.getOptions().getServer());
+
+					}
+				}
+			});
+
+			socketHandler.add(new SocketReceiver("BungeeUpdate") {
+
+				@Override
+				public void onReceive(String[] data) {
+					Main.plugin.setUpdate(true);
+				}
+			});
+
+			if (Main.plugin.getOptions().getServer().equalsIgnoreCase("pleaseset")) {
+				Main.plugin.getLogger().warning("Server name for bungee voting is not set, please set it");
 			}
-		});
+
+		}
+
+	}
+
+	public void sendData(String... strings) {
+		clientHandler.sendMessage(strings);
 	}
 }
@@ -2,10 +2,12 @@ package com.Ben12345rocks.VotingPlugin.Commands;

 import java.io.File;
 import java.io.IOException;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.Set;

 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -21,6 +23,9 @@ import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
 import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandle;
 import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
 import com.Ben12345rocks.AdvancedCore.Commands.GUI.UserGUI;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.TimeChecker;
 import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
@@ -41,6 +46,7 @@ import com.Ben12345rocks.VotingPlugin.Commands.GUI.PlayerGUIs;
 import com.Ben12345rocks.VotingPlugin.Commands.TabCompleter.AliasesTabCompleter;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Config.SpecialRewardsConfig;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
@@ -220,6 +226,16 @@ public class CommandLoader {
 	private void loadAdminVoteCommand() {
 		plugin.setAdminVoteCommand(new ArrayList<CommandHandler>());

+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "CurrentPluginTime" },
+				"VotingPlugin.Commands.AdminVote.CurrentPluginTime|" + adminPerm, "Current plugin time") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(Config.getInstance().getFormatTimeFormat());
+				sendMessage(sender, TimeChecker.getInstance().getTime().format(formatter));
+			}
+		});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ConvertFrom", "GAL" },
 				"VotingPlugin.Commands.AdminVote.ConvertFrom.GAL|" + adminPerm, "Convert from GAL") {

@@ -326,7 +342,7 @@ public class CommandLoader {
 				});

 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ResyncMilestones" },
-				"VotingPlugin.Commands.AdminVote.SetResyncMilestones|" + adminPerm, "Resync Milestones") {
+				"VotingPlugin.Commands.AdminVote.ResyncMilestones|" + adminPerm, "Resync Milestones") {

 			@Override
 			public void execute(CommandSender sender, String[] args) {
@@ -340,6 +356,74 @@ public class CommandLoader {
 			}
 		});

+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "ResyncMilestonesAlreadyGiven" },
+						"VotingPlugin.Commands.AdminVote.ResyncMilestonesGiven|" + adminPerm,
+						"Resync Milestones already given") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						sendMessage(sender, "&cStarting...");
+						ArrayList<Integer> nums = new ArrayList<Integer>();
+
+						for (String str : SpecialRewardsConfig.getInstance().getMilestoneVotes()) {
+							try {
+								nums.add(Integer.parseInt(str));
+							} catch (Exception e) {
+								plugin.getLogger().warning("Failed to get number from " + str);
+							}
+						}
+						for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+							User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+							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);
+									}
+								}
+							}
+						}
+						sendMessage(sender, "&cFinished");
+
+					}
+				});
+
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "ResetPoints" },
+						"VotingPlugin.Commands.AdminVote.ResetPoints|" + adminPerm, "Clears all points of all players",
+						true, false) {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						sendMessage(sender, "&cStarting...");
+						for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+							User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+							user.setPoints(0);
+						}
+						sendMessage(sender, "&cFinished");
+
+					}
+				});
+
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ResyncMilestones", "(player)" },
+				"VotingPlugin.Commands.AdminVote.SetResyncMilestones|" + adminPerm, "Resync Milestones") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				user.setMilestoneCount(user.getTotal(TopVoter.AllTime));
+
+				sendMessage(sender, "&cResynced milestones for " + args[1]);
+
+			}
+		});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "User", "(player)", "AddPoints", "(number)" },
 						"VotingPlugin.Commands.AdminVote.AddPoints|" + adminPerm, "Add to players voting points") {
@@ -509,6 +593,8 @@ public class CommandLoader {
 					});

 				}
+				sendMessage(sender,
+						"Using AdvancedCore " + plugin.getVersion() + "' built on '" + plugin.getBuildTime());
 			}
 		});

@@ -1065,6 +1151,31 @@ public class CommandLoader {
 					}
 				});

+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "VotePartyExtraRequired", "(Number)" },
+						"VotingPlugin.Commands.AdminVote.VoteParty.SetExtraRequired|" + adminPerm,
+						"Force a voteparty reward, resets vote count") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						ServerData.getInstance().setVotePartyExtraRequired(Integer.parseInt(args[1]));
+						sendMessage(sender, "&cSet VotePartyExtraRequired to " + args[1]);
+					}
+				});
+
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(player)", "ForceVoteShop", "(VoteShop)" },
+						"VotingPlugin.Commands.AdminVote.ForceVoteShop|" + adminPerm, "Force a voteshop reward") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
+								Config.getInstance().getIdentifierRewardsPath(args[3]), new RewardOptions());
+						sendMessage(sender, "&cVoteShop " + args[3] + " forced");
+					}
+				});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "User", "(player)", "ForceMilestone", "(Number)" },
 						"VotingPlugin.Commands.AdminVote.ForceMilestone|" + adminPerm, "Force a milestone") {
@@ -1073,9 +1184,72 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 						SpecialRewards.getInstance().giveMilestoneVoteReward(user, user.isOnline(), parseInt(args[3]));
+						sendMessage(sender, "&cMilestone " + args[3] + " forced");
 					}
 				});

+		for (final TopVoter top : TopVoter.valuesMinusAllTime()) {
+			plugin.getAdminVoteCommand()
+					.add(new CommandHandler(
+							new String[] { "User", "(player)", "ForceTopVoter", top.toString(), "(Number)" },
+							"VotingPlugin.Commands.AdminVote.ForceTopVoter." + top.toString() + "|" + adminPerm,
+							"Force a top voter reward") {
+
+						@Override
+						public void execute(CommandSender sender, String[] args) {
+							User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+							int place = parseInt(args[4]);
+							switch (top) {
+								case Daily:
+									user.giveDailyTopVoterAward(place, args[4]);
+									break;
+								case Monthly:
+									user.giveMonthlyTopVoterAward(place, args[4]);
+									break;
+								case Weekly:
+									user.giveWeeklyTopVoterAward(place, args[4]);
+									break;
+								default:
+									break;
+
+							}
+							sendMessage(sender, "&cTopVoter " + top.toString() + " " + args[4] + " forced");
+						}
+					});
+
+			String text = "";
+			switch (top) {
+				case Daily:
+					text = "Day";
+					break;
+				case Monthly:
+					text = "Month";
+					break;
+				case Weekly:
+					text = "Week";
+					break;
+				default:
+					break;
+
+			}
+
+			final String str = text;
+
+			plugin.getAdminVoteCommand()
+					.add(new CommandHandler(new String[] { "User", "(player)", "ForceVoteStreak", str, "(Number)" },
+							"VotingPlugin.Commands.AdminVote.ForceVoteStreak|" + adminPerm,
+							"Force a votestreak reward for " + str) {
+
+						@Override
+						public void execute(CommandSender sender, String[] args) {
+							User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+							SpecialRewards.getInstance().giveVoteStreakReward(user, user.isOnline(), str, args[4],
+									parseInt(args[4]));
+							sendMessage(sender, "&cVoteStreak " + str + " " + args[4] + " forced");
+						}
+					});
+		}
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "User", "(player)", "ForceCummulative", "(Number)" },
 						"VotingPlugin.Commands.AdminVote.ForceCummulative|" + adminPerm, "Force a cummulative reward") {
@@ -1084,6 +1258,7 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 						SpecialRewards.getInstance().giveCumulativeVoteReward(user, user.isOnline(), parseInt(args[3]));
+						sendMessage(sender, "&cCummulative " + args[3] + " forced");
 					}
 				});

@@ -1094,6 +1269,7 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 				SpecialRewards.getInstance().giveAllSitesRewards(user, user.isOnline());
+				sendMessage(sender, "&cAllSites forced");
 			}
 		});

@@ -1104,21 +1280,10 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 				SpecialRewards.getInstance().giveFirstVoteRewards(user, user.isOnline());
+				sendMessage(sender, "&cFirstVote forced");
 			}
 		});

-		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "User", "(player)", "ForceVoteStreak", "(Text)", "(Number)" },
-						"VotingPlugin.Commands.AdminVote.ForceVoteStreak|" + adminPerm, "Force a votestreak reward") {
-
-					@Override
-					public void execute(CommandSender sender, String[] args) {
-						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						SpecialRewards.getInstance().giveVoteStreakReward(user, user.isOnline(), args[3], args[4],
-								parseInt(args[4]));
-					}
-				});
-
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "Placeholders", "(player)" },
 						"VotingPlugin.Commands.AdminVote.Placeholders.Players|" + adminPerm,
@@ -1187,6 +1352,7 @@ public class CommandLoader {

 						plugin.getCommand("vote" + arg)
 								.setTabCompleter(new AliasesTabCompleter().setCMDHandle(cmdHandle, false));
+						plugin.getCommand("vote" + arg).setPermission(cmdHandle.getPerm().split("|")[0]);
 						for (String str : plugin.getCommand("vote" + arg).getAliases()) {
 							commands.put(str, cmdHandle);
 						}
@@ -1208,6 +1374,7 @@ public class CommandLoader {

 						plugin.getCommand("adminvote" + arg)
 								.setTabCompleter(new AliasesTabCompleter().setCMDHandle(cmdHandle, true));
+						plugin.getCommand("adminvote" + arg).setPermission(cmdHandle.getPerm().split("|")[0]);
 						for (String str : plugin.getCommand("adminvote" + arg).getAliases()) {
 							commands.put(str, cmdHandle);
 						}
@@ -1278,13 +1445,14 @@ public class CommandLoader {
 										Player player = event.getWhoClicked();
 										String playerName = (String) event.getMeta(player, "Player");
 										BInventory inv = new BInventory("MileStones: " + playerName);
-										for (String mileStoneName : Config.getInstance().getMilestoneVotes()) {
+										for (String mileStoneName : SpecialRewardsConfig.getInstance()
+												.getMilestoneVotes()) {
 											if (StringParser.getInstance().isInt(mileStoneName)) {
 												int mileStone = Integer.parseInt(mileStoneName);

 												inv.addButton(inv.getNextSlot(),
 														new BInventoryButton("" + mileStone, new String[] {
-																"Enabled: " + Config.getInstance()
+																"Enabled: " + SpecialRewardsConfig.getInstance()
 																		.getMilestoneRewardEnabled(mileStone),
 																"&cClick to set wether this has been completed or not" },
 																new ItemStack(Material.STONE)) {
@@ -1365,6 +1533,22 @@ public class CommandLoader {
 			public void updateReplacements() {
 			}
 		});
+
+		TabCompleteHandler.getInstance().addTabCompleteOption(new TabCompleteHandle("(VoteShop)", sites) {
+
+			@Override
+			public void reload() {
+				ArrayList<String> sites = new ArrayList<String>();
+				for (String str : Config.getInstance().getIdentifiers()) {
+					sites.add(str);
+				}
+				setReplace(sites);
+			}
+
+			@Override
+			public void updateReplacements() {
+			}
+		});
 	}

 	/**
@@ -1396,6 +1580,83 @@ public class CommandLoader {
 					PlayerGUIs.getInstance().openVoteShop((Player) sender);
 				}
 			});
+			plugin.getVoteCommand().add(new CommandHandler(new String[] { "Shop", "(Text)" },
+					"VotingPlugin.Commands.Vote.Shop|" + playerPerm, "Open VoteShop GUI", false) {
+
+				@Override
+				public void execute(CommandSender sender, String[] args) {
+					if (!Config.getInstance().getVoteShopEnabled()) {
+						sender.sendMessage(StringParser.getInstance().colorize("&cVote shop disabled"));
+						return;
+					}
+
+					String identifier = args[1];
+					Set<String> identifiers = Config.getInstance().getIdentifiers();
+					if (ArrayUtils.getInstance().containsIgnoreCase(identifiers, identifier)) {
+						for (String ident : identifiers) {
+							if (ident.equalsIgnoreCase(args[1])) {
+								identifier = ident;
+							}
+						}
+
+						String perm = Config.getInstance().getVoteShopPermission(identifier);
+						boolean hasPerm = false;
+						if (perm.isEmpty()) {
+							hasPerm = true;
+						} else {
+							hasPerm = sender.hasPermission(perm);
+						}
+
+						int limit = Config.getInstance().getIdentifierLimit(identifier);
+
+						User user = UserManager.getInstance().getVotingPluginUser(sender.getName());
+						boolean limitPass = true;
+						if (limit > 0) {
+
+							if (user.getVoteShopIdentifierLimit(identifier) >= limit) {
+								limitPass = false;
+							}
+						}
+
+						if (!Config.getInstance().getVoteShopNotBuyable(identifier)) {
+							if (hasPerm) {
+								user.clearCache();
+								int points = Config.getInstance().getIdentifierCost(identifier);
+								if (identifier != null) {
+
+									if (limitPass) {
+										HashMap<String, String> placeholders = new HashMap<String, String>();
+										placeholders.put("identifier", identifier);
+										placeholders.put("points", "" + points);
+										placeholders.put("limit", "" + limit);
+										if (user.removePoints(points)) {
+
+											RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
+													Config.getInstance().getIdentifierRewardsPath(identifier),
+													new RewardOptions().setPlaceholders(placeholders));
+
+											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+													Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
+											if (limit > 0) {
+												user.setVoteShopIdentifierLimit(identifier,
+														user.getVoteShopIdentifierLimit(identifier) + 1);
+											}
+										} else {
+											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+													Config.getInstance().getFormatShopFailedMsg(), placeholders));
+										}
+									} else {
+										user.sendMessage(Config.getInstance().getVoteShopLimitReached());
+									}
+								}
+
+							}
+						}
+					} else {
+						sendMessage(sender, "&cWrong voteshop item");
+					}
+				}
+			});
 		}

 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "URL" },
@@ -1408,7 +1669,7 @@ public class CommandLoader {
 			}
 		});
 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "URL", "(SiteName)" },
-				"VotingPlugin.Commands.Vote.URL.VoteSite|" + playerPerm, "Open VoteURL GUI", false) {
+				"VotingPlugin.Commands.Vote.URL.VoteSite", "Open VoteURL GUI for VoteSite", false) {

 			@Override
 			public void execute(CommandSender sender, String[] args) {
@@ -2063,14 +2324,18 @@ public class CommandLoader {

 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 						int pointsToGive = Integer.parseInt(args[2]);
-						if (cPlayer.getPoints() >= pointsToGive) {
-							user.addPoints(pointsToGive);
-							cPlayer.removePoints(pointsToGive);
-							sendMessage(sender, "&c" + pointsToGive + " points given to " + user.getPlayerName());
-							user.sendMessage(
-									"&cYou received " + pointsToGive + " points from " + cPlayer.getPlayerName());
+						if (pointsToGive > 0) {
+							if (cPlayer.getPoints() >= pointsToGive) {
+								user.addPoints(pointsToGive);
+								cPlayer.removePoints(pointsToGive);
+								sendMessage(sender, "&c" + pointsToGive + " points given to " + user.getPlayerName());
+								user.sendMessage(
+										"&cYou received " + pointsToGive + " points from " + cPlayer.getPlayerName());
+							} else {
+								sendMessage(sender, "&cNot enough points");
+							}
 						} else {
-							sendMessage(sender, "&cNot enough points");
+							sendMessage(sender, "&cNumber of points needs to be greater than 0");
 						}
 					}
 				}
@@ -2085,9 +2350,9 @@ public class CommandLoader {
 						if (!Config.getInstance().isCommandsUseGUIVote() || !(sender instanceof Player)) {
 							if (isPlayer(sender)) {
 								User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-								user.sendMessage(Commands.getInstance().voteURLs(user));
+								user.sendMessage(Commands.getInstance().voteURLs(user, true));
 							} else {
-								sender.sendMessage(Commands.getInstance().voteURLs(null));
+								sender.sendMessage(Commands.getInstance().voteURLs(null, false));
 							}
 						} else {
 							PlayerGUIs.getInstance().openVoteURL((Player) sender);
@@ -2103,9 +2368,9 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				if (isPlayer(sender)) {
 					User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-					user.sendMessage(Commands.getInstance().voteURLs(user));
+					user.sendMessage(Commands.getInstance().voteURLs(user, true));
 				} else {
-					sender.sendMessage(Commands.getInstance().voteURLs(null));
+					sender.sendMessage(Commands.getInstance().voteURLs(null, false));
 				}
 			}
 		});
@@ -2134,6 +2399,20 @@ public class CommandLoader {
 				list.remove(i);
 			}
 		}
+		ArrayList<String> disabledDefaultPerms = config.getDisabledDefaultPermissions();
+		for (CommandHandler cmd : list) {
+			boolean contains = false;
+			for (String dis : disabledDefaultPerms) {
+				if (cmd.getPerm().contains(dis + "|")) {
+					contains = true;
+				}
+			}
+			if (contains) {
+				cmd.setPerm(cmd.getPerm().replace("|" + playerPerm, ""));
+				plugin.debug("Disabling VotingPlugin.Player permission on " + cmd.getPerm());
+
+			}
+		}
 	}

 	/**
@@ -598,6 +598,9 @@ public class Commands {
 		if (time > 0) {
 			Date date = new Date(time);
 			String timeString = new SimpleDateFormat(config.getFormatTimeFormat()).format(date);
+			if (StringParser.getInstance().containsIgnorecase(timeString, "YamlConfiguration")) {
+				plugin.getLogger().warning("Detected issue parsing time, check time format");
+			}
 			return timeString;
 		}
 		return "";
@@ -734,17 +737,19 @@ public class Commands {

 		long time = user.getTime(voteSite);
 		LocalDateTime now = TimeChecker.getInstance().getTime();
+		;
 		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault())
 				.plusHours(Main.plugin.getOptions().getTimeHourOffSet());

 		if (!voteSite.isVoteDelayDaily()) {
 			double votedelay = voteSite.getVoteDelay();
-			if (votedelay == 0) {
+			if (votedelay == 0 && voteSite.getVoteDelayMin() == 0) {
 				String errorMsg = config.getFormatCommandsVoteNextInfoError();
 				info = errorMsg;
 			} else {

-				LocalDateTime nextvote = lastVote.plusHours((long) votedelay);
+				LocalDateTime nextvote = lastVote.plusHours((long) votedelay)
+						.plusMinutes((long) voteSite.getVoteDelayMin());

 				if (time == 0 || now.isAfter(nextvote)) {
 					info = config.getFormatCommandsVoteNextInfoCanVote();
@@ -764,23 +769,64 @@ public class Commands {
 				}
 			}
 		} else {
-			if (lastVote.getDayOfYear() == now.getDayOfYear() && lastVote.getYear() == now.getYear()) {
-				LocalDateTime midnight = TimeChecker.getInstance().getTime().plusDays(1).withHour(0).withMinute(0);
-				Duration dur = Duration.between(now, midnight);
+			LocalDateTime offsetoclockyesterday = TimeChecker.getInstance().getTime().plusDays(-1).withHour(0)
+					.withMinute(0).plusHours((long) voteSite.getTimeOffSet());
+			LocalDateTime offsetoclocktoday = TimeChecker.getInstance().getTime().withHour(0).withMinute(0)
+					.plusHours((long) voteSite.getTimeOffSet());
+			LocalDateTime offsetoclocktomorrow = TimeChecker.getInstance().getTime().plusDays(1).withHour(0)
+					.withMinute(0).plusHours((long) voteSite.getTimeOffSet());

-				int diffHours = (int) (dur.getSeconds() / (60 * 60));
-				long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;
+			if (!now.isBefore(offsetoclocktoday)) {
+				if (!lastVote.isBefore(offsetoclocktoday)) {
+					Duration dur = Duration.between(now, offsetoclocktomorrow);
+					int diffHours = (int) (dur.getSeconds() / (60 * 60));
+					long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;

-				String timeMsg = config.getFormatCommandsVoteNextInfoVoteDelayDaily();
-				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
-				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
-						Long.toString(diffMinutes));
-				info = timeMsg;
+					if (diffHours < 0) {
+						diffHours = diffHours * -1;
+					}
+					if (diffHours >= 24) {
+						diffHours = diffHours - 24;
+					}
+					if (diffMinutes < 0) {
+						diffMinutes = diffMinutes * -1;
+					}

+					String timeMsg = config.getFormatCommandsVoteNextInfoVoteDelayDaily();
+					timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%",
+							Integer.toString(diffHours));
+					timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
+							Long.toString(diffMinutes));
+					info = timeMsg;
+				} else {
+					info = config.getFormatCommandsVoteNextInfoCanVote();
+				}
 			} else {
-				info = config.getFormatCommandsVoteNextInfoCanVote();
-			}
+				if (!lastVote.isBefore(offsetoclockyesterday)) {
+					Duration dur = Duration.between(now, offsetoclocktoday);
+					int diffHours = (int) (dur.getSeconds() / (60 * 60));
+					long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;

+					if (diffHours < 0) {
+						diffHours = diffHours * -1;
+					}
+					if (diffHours >= 24) {
+						diffHours = diffHours - 24;
+					}
+					if (diffMinutes < 0) {
+						diffMinutes = diffMinutes * -1;
+					}
+
+					String timeMsg = config.getFormatCommandsVoteNextInfoVoteDelayDaily();
+					timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%",
+							Integer.toString(diffHours));
+					timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
+							Long.toString(diffMinutes));
+					info = timeMsg;
+				} else {
+					info = config.getFormatCommandsVoteNextInfoCanVote();
+				}
+			}
 		}
 		return info;
 	}
@@ -880,6 +926,54 @@ public class Commands {
 		return texts;
 	}

+	public long voteNextDurationTime(User user, VoteSite voteSite) {
+		long time = user.getTime(voteSite);
+		LocalDateTime now = TimeChecker.getInstance().getTime();
+		;
+		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault())
+				.plusHours(Main.plugin.getOptions().getTimeHourOffSet());
+
+		if (!voteSite.isVoteDelayDaily()) {
+			double votedelay = voteSite.getVoteDelay();
+			if (votedelay == 0 && voteSite.getVoteDelayMin() == 0) {
+				return 0;
+			} else {
+				LocalDateTime nextvote = lastVote.plusHours((long) votedelay)
+						.plusMinutes((long) voteSite.getVoteDelayMin());
+
+				if (time == 0 || now.isAfter(nextvote)) {
+					return 0;
+				} else {
+					Duration dur = Duration.between(now, nextvote);
+					return dur.getSeconds();
+				}
+			}
+		} else {
+			LocalDateTime offsetoclockyesterday = TimeChecker.getInstance().getTime().plusDays(-1).withHour(0)
+					.withMinute(0).plusHours((long) voteSite.getTimeOffSet());
+			LocalDateTime offsetoclocktoday = TimeChecker.getInstance().getTime().withHour(0).withMinute(0)
+					.plusHours((long) voteSite.getTimeOffSet());
+			LocalDateTime offsetoclocktomorrow = TimeChecker.getInstance().getTime().plusDays(1).withHour(0)
+					.withMinute(0).plusHours((long) voteSite.getTimeOffSet());
+
+			if (!now.isBefore(offsetoclocktoday)) {
+				if (!lastVote.isBefore(offsetoclocktoday)) {
+					Duration dur = Duration.between(now, offsetoclocktomorrow);
+					return dur.getSeconds();
+				} else {
+					return 0;
+				}
+			} else {
+				if (!lastVote.isBefore(offsetoclockyesterday)) {
+					Duration dur = Duration.between(now, offsetoclocktoday);
+					return dur.getSeconds();
+				} else {
+					return 0;
+				}
+			}
+		}
+	}
+
 	/**
 	 * Vote today.
 	 *
@@ -906,7 +1000,7 @@ public class Commands {
 		return ArrayUtils.getInstance().convert(msg);
 	}

-	public String[] voteURLs(User user) {
+	public String[] voteURLs(User user, boolean json) {
 		ArrayList<String> sites = new ArrayList<String>();

 		List<String> title = config.getFormatCommandsVoteText();
@@ -917,13 +1011,15 @@ public class Commands {
 			int counter = 0;
 			for (VoteSite voteSite : plugin.getVoteSites()) {
 				counter++;
-				String voteURL = voteSite.getVoteURL();
+				String voteURL = voteSite.getVoteURL(json);
 				MessageBuilder message = new MessageBuilder(config.getFormatCommandsVoteURLS());
 				message.replacePlaceholder("num", Integer.toString(counter)).replacePlaceholder("url", voteURL)
-						.replacePlaceholder("SiteName", voteSite.getDisplayName())
-						.replacePlaceholder("player", user.getPlayerName())
-						.replacePlaceholder("Next", "" + voteCommandNextInfo(user, voteSite)).colorize();
-				sites.add(message.getText());
+						.replacePlaceholder("SiteName", voteSite.getDisplayName());
+				if (user != null && user.getPlayerName() != null) {
+					message.replacePlaceholder("player", "" + user.getPlayerName()).replacePlaceholder("Next",
+							"" + voteCommandNextInfo(user, voteSite));
+				}
+				sites.add(message.colorize().getText());
 			}
 		}
 		if (user != null) {
@@ -935,6 +1031,7 @@ public class Commands {

 			sites = ArrayUtils.getInstance().replacePlaceHolder(sites, phs);
 		}
+
 		sites = ArrayUtils.getInstance().colorize(sites);
 		return ArrayUtils.getInstance().convert(sites);
 	}
@@ -8,11 +8,14 @@ import java.util.Map.Entry;
 import java.util.Set;

 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;

+import com.Ben12345rocks.AdvancedCore.NMSManager.NMSManager;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
@@ -21,10 +24,10 @@ import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventoryButton;
 import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
 import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Commands.Commands;
+import com.Ben12345rocks.VotingPlugin.Config.BungeeSettings;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
@@ -32,6 +35,10 @@ import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;

+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import xyz.upperlevel.spigot.book.BookUtil;
+
 public class PlayerGUIs {
 	static PlayerGUIs instance = new PlayerGUIs();

@@ -59,7 +66,7 @@ public class PlayerGUIs {
 		if (sec != null) {
 			item = new ItemBuilder(sec);
 		} else {
-			item = new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI");
+			item = new ItemBuilder(Material.BARRIER, 1).setName("&8Back to VoteGUI");
 		}

 		BInventoryButton b = new BInventoryButton(item) {
@@ -84,8 +91,8 @@ public class PlayerGUIs {

 	public void openVoteBest(Player player, User user) {
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringParser.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteBestName(), "player", user.getPlayerName()));
+		BInventory inv = new BInventory(Config.getInstance().getGUIVoteBestName());
+		inv.addPlaceholder("player", user.getPlayerName());

 		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteBestDayBestItem())
 				.addPlaceholder("Best", "" + user.getBestDayVoteStreak())) {
@@ -131,12 +138,15 @@ public class PlayerGUIs {
 			return;
 		}
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringParser.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteGUIName(), "player", user.getPlayerName()));
+		BInventory inv = new BInventory(Config.getInstance().getGUIVoteGUIName());
 		if (!Config.getInstance().isAlwaysCloseInventory()) {
 			inv.dontClose();
 		}

+		inv.addPlaceholder("points", "" + user.getPoints());
+		inv.addPlaceholder("player", user.getPlayerName());
+		inv.addPlaceholder("top", Config.getInstance().getVoteTopDefault());
+
 		for (String slot : Config.getInstance().getVoteGUISlots()) {
 			ItemBuilder builder = new ItemBuilder(Config.getInstance().getVoteGUISlotSection(slot));

@@ -144,9 +154,10 @@ public class PlayerGUIs {

 			lore = ArrayUtils.getInstance().convert(Config.getInstance().getVoteGUISlotLore(slot));

+			String str = Config.getInstance().getVoteTopDefault();
 			if (lore.length == 0) {
 				if (slot.equalsIgnoreCase("url")) {
-					lore = Commands.getInstance().voteURLs(user);
+					lore = new String[] { "&aClick me" };
 				} else if (slot.equalsIgnoreCase("next")) {
 					lore = Commands.getInstance().voteCommandNext(user);
 				} else if (slot.equalsIgnoreCase("last")) {
@@ -154,7 +165,7 @@ public class PlayerGUIs {
 				} else if (slot.equalsIgnoreCase("total")) {
 					lore = Commands.getInstance().voteCommandTotal(user);
 				} else if (slot.equalsIgnoreCase("top")) {
-					String str = Config.getInstance().getVoteTopDefault();
+
 					if (str.equalsIgnoreCase("monthly")) {
 						lore = TopVoterHandler.getInstance().topVoterMonthly(1);
 					} else if (str.equalsIgnoreCase("weekly")) {
@@ -171,58 +182,50 @@ public class PlayerGUIs {
 				}
 			}

-			HashMap<String, String> placeholders = new HashMap<String, String>();
-			placeholders.put("points", "" + user.getPoints());
-
-			builder.setPlaceholders(placeholders);
 			builder.setLore(ArrayUtils.getInstance().convert(lore));

 			inv.addButton(new BInventoryButton(builder) {

 				@Override
 				public void onClick(ClickEvent event) {
-					Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {

-						@Override
-						public void run() {
-							Player player = event.getWhoClicked();
-							String cmd = Config.getInstance().getVoteGUISlotCommand(slot);
-							User user = getSelectedPlayer(player);
-							if (cmd.equalsIgnoreCase("none")) {
-								return;
-							} else if (!cmd.equals("")) {
-								Bukkit.getScheduler().runTask(plugin, new Runnable() {
+					Player player = event.getWhoClicked();
+					String cmd = Config.getInstance().getVoteGUISlotCommand(slot);
+					User user = getSelectedPlayer(player);
+					if (cmd.equalsIgnoreCase("none")) {
+						return;
+					} else if (!cmd.equals("")) {
+						event.runSync(new Runnable() {

-									@Override
-									public void run() {
-										player.performCommand(cmd);
-									}
-								});
-							} else {
-								if (slot.equalsIgnoreCase("url")) {
-									openVoteURL(player);
-								} else if (slot.equalsIgnoreCase("next")) {
-									openVoteNext(player, user);
-								} else if (slot.equalsIgnoreCase("last")) {
-									openVoteLast(player, user);
-								} else if (slot.equalsIgnoreCase("total")) {
-									openVoteTotal(player, user);
-								} else if (slot.equalsIgnoreCase("top")) {
-									openVoteTop(player, null);
-								} else if (slot.equalsIgnoreCase("today")) {
-									openVoteToday(player);
-								} else if (slot.equalsIgnoreCase("help")) {
-									player.performCommand("vote help");
-								} else if (slot.equalsIgnoreCase("shop")) {
-									openVoteShop(player);
-								} else if (slot.equalsIgnoreCase("lastmonth")) {
-									openVoteTopLastMonth(player);
-								}
+							@Override
+							public void run() {
+								player.performCommand(cmd);
 							}
+						});
+					} else {
+						if (slot.equalsIgnoreCase("url")) {
+							user.sendMessage(Commands.getInstance().voteURLs(user, true));
+							event.closeInventory();
+						} else if (slot.equalsIgnoreCase("next")) {
+							openVoteNext(player, user);
+						} else if (slot.equalsIgnoreCase("last")) {
+							openVoteLast(player, user);
+						} else if (slot.equalsIgnoreCase("total")) {
+							openVoteTotal(player, user);
+						} else if (slot.equalsIgnoreCase("top")) {
+							openVoteTop(player, null);
+						} else if (slot.equalsIgnoreCase("today")) {
+							openVoteToday(player);
+						} else if (slot.equalsIgnoreCase("help")) {
+							player.performCommand("vote help");
+						} else if (slot.equalsIgnoreCase("shop")) {
+							openVoteShop(player);
+						} else if (slot.equalsIgnoreCase("lastmonth")) {
+							openVoteTopLastMonth(player);
 						}
-					});
-
+					}
 				}
+
 			});
 		}

@@ -231,8 +234,8 @@ public class PlayerGUIs {

 	public void openVoteLast(Player player, User user) {
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringParser.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteLastName(), "player", user.getPlayerName()));
+		BInventory inv = new BInventory(Config.getInstance().getGUIVoteLastName());
+		inv.addPlaceholder("player", user.getPlayerName());
 		for (VoteSite site : plugin.getVoteSites()) {
 			inv.addButton(inv.getNextSlot(), new BInventoryButton(site.getItem().setName(site.getDisplayName())
 					.setLore(Commands.getInstance().voteCommandLastLine(user, site)).setAmountNone(1)) {
@@ -253,8 +256,8 @@ public class PlayerGUIs {

 	public void openVoteNext(Player player, User user) {
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringParser.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteNextName(), "player", user.getPlayerName()));
+		BInventory inv = new BInventory(Config.getInstance().getGUIVoteNextName());
+		inv.addPlaceholder("player", user.getPlayerName());
 		for (VoteSite site : plugin.getVoteSites()) {
 			inv.addButton(inv.getNextSlot(), new BInventoryButton(site.getItem().setName(site.getDisplayName())
 					.setLore(Commands.getInstance().voteCommandNextInfo(user, site)).setAmountNone(1)) {
@@ -274,7 +277,7 @@ public class PlayerGUIs {

 	public void openVoteShop(Player player) {
 		if (!Config.getInstance().getVoteShopEnabled()) {
-			player.sendMessage(StringParser.getInstance().colorize("&cVote shop disabled"));
+			player.sendMessage(StringParser.getInstance().colorize(Config.getInstance().getVoteShopDisabled()));
 			return;
 		}

@@ -309,9 +312,13 @@ public class PlayerGUIs {
 						@Override
 						public void onClick(ClickEvent event) {
 							Player player = event.getWhoClicked();
+							event.getButton().getInv().closeInv(player, null);

 							User user = UserManager.getInstance().getVotingPluginUser(player);
-							user.clearCache();
+							if (Config.getInstance().isClearCacheOnVoteShopPurchase()
+									|| BungeeSettings.getInstance().isUseBungeecoord()) {
+								user.clearCache();
+							}
 							String identifier = (String) getData("identifier");
 							int limit = (int) getData("Limit");
 							int points = Config.getInstance().getIdentifierCost(identifier);
@@ -326,25 +333,30 @@ public class PlayerGUIs {
 								}

 								if (limitPass) {
-									HashMap<String, String> placeholders = new HashMap<String, String>();
-									placeholders.put("identifier", identifier);
-									placeholders.put("points", "" + points);
-									placeholders.put("limit", "" + limit);
-									if (user.removePoints(points)) {
+									if (!Config.getInstance().isVoteShopRequireConfirmation()) {
+										HashMap<String, String> placeholders = new HashMap<String, String>();
+										placeholders.put("identifier",
+												Config.getInstance().getIdentifierIdentifierName(identifier));
+										placeholders.put("points", "" + points);
+										placeholders.put("limit", "" + limit);
+										if (user.removePoints(points)) {

-										RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-												Config.getInstance().getIdentifierRewardsPath(identifier),
-												new RewardOptions().setPlaceholders(placeholders));
+											RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
+													Config.getInstance().getIdentifierRewardsPath(identifier),
+													new RewardOptions().setPlaceholders(placeholders));

-										user.sendMessage(StringParser.getInstance().replacePlaceHolder(
-												Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
-										if (limit > 0) {
-											user.setVoteShopIdentifierLimit(identifier,
-													user.getVoteShopIdentifierLimit(identifier) + 1);
+											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+													Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
+											if (limit > 0) {
+												user.setVoteShopIdentifierLimit(identifier,
+														user.getVoteShopIdentifierLimit(identifier) + 1);
+											}
+										} else {
+											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+													Config.getInstance().getFormatShopFailedMsg(), placeholders));
 										}
 									} else {
-										user.sendMessage(StringParser.getInstance().replacePlaceHolder(
-												Config.getInstance().getFormatShopFailedMsg(), placeholders));
+										openVoteShopConfirmation(player, identifier);
 									}
 								} else {
 									user.sendMessage(Config.getInstance().getVoteShopLimitReached());
@@ -376,10 +388,60 @@ public class PlayerGUIs {
 		inv.openInventory(player);
 	}

+	public void openVoteShopConfirmation(Player player, String identifier) {
+		PlayerUtils.getInstance().setPlayerMeta(player, "ident", identifier);
+		BInventory inv = new BInventory("Confirm Purchase?");
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.EMERALD_BLOCK).setName("&aYes")) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				String ident = (String) PlayerUtils.getInstance().getPlayerMeta(event.getPlayer(), "ident");
+				User user = UserManager.getInstance().getVotingPluginUser(event.getPlayer());
+				int points = Config.getInstance().getIdentifierCost(ident);
+				int limit = Config.getInstance().getIdentifierLimit(identifier);
+				HashMap<String, String> placeholders = new HashMap<String, String>();
+				placeholders.put("identifier", identifier);
+				placeholders.put("points", "" + points);
+				placeholders.put("limit", "" + limit);
+				if (user.removePoints(points)) {
+
+					RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
+							Config.getInstance().getIdentifierRewardsPath(identifier),
+							new RewardOptions().setPlaceholders(placeholders));
+
+					user.sendMessage(StringParser.getInstance()
+							.replacePlaceHolder(Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
+					if (limit > 0) {
+						user.setVoteShopIdentifierLimit(identifier, user.getVoteShopIdentifierLimit(identifier) + 1);
+					}
+				} else {
+					user.sendMessage(StringParser.getInstance()
+							.replacePlaceHolder(Config.getInstance().getFormatShopFailedMsg(), placeholders));
+				}
+				Bukkit.getScheduler().runTask(plugin, new Runnable() {
+
+					@Override
+					public void run() {
+						event.getPlayer().closeInventory();
+					}
+				});
+
+			}
+		});
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.BARRIER).setName("&cNo")) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				event.getPlayer().closeInventory();
+			}
+		});
+		inv.openInventory(player);
+	}
+
 	public void openVoteStreak(Player player, User user) {
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringParser.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteStreakName(), "player", user.getPlayerName()));
+		BInventory inv = new BInventory(Config.getInstance().getGUIVoteStreakName());
+		inv.addPlaceholder("player", user.getPlayerName());

 		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteStreakCurrentDayStreakItem())
 				.addPlaceholder("Streak", "" + user.getDayVoteStreak())) {
@@ -455,9 +517,21 @@ public class PlayerGUIs {
 			for (VoteSite voteSite : plugin.getVoteToday().get(user).keySet()) {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(Config.getInstance().getFormatTimeFormat());
 				String timeString = plugin.getVoteToday().get(user).get(voteSite).format(formatter);
-				String msg = "&6" + voteSite.getDisplayName() + " : " + timeString;
-				inv.addButton(inv.getNextSlot(), new BInventoryButton(user.getPlayerName(), new String[] { msg },
-						MiscUtils.getInstance().setSkullOwner(user.getOfflinePlayer())) {
+				String msg = Config.getInstance().getGUIVoteTodayLine();
+				HashMap<String, String> placeholders = new HashMap<String, String>();
+				placeholders.put("VoteSite", voteSite.getDisplayName());
+				placeholders.put("Time", timeString);
+				msg = StringParser.getInstance().replacePlaceHolder(msg, placeholders);
+				ItemBuilder item = null;
+				if (Config.getInstance().isGUIVoteTodayUseSkull() && !NMSManager.getInstance().isVersion("1.12")) {
+					item = new ItemBuilder(new ItemStack(Material.PLAYER_HEAD, 1)).setSkullOwner(player);
+				} else {
+					item = new ItemBuilder(Config.getInstance().getGUIVoteTodayPlayerItem());
+				}
+				item.setName(StringParser.getInstance().replacePlaceHolder(
+						Config.getInstance().getGUIVoteTodayIconTitle(), "player", user.getPlayerName()));
+				item.setLore(msg);
+				inv.addButton(inv.getNextSlot(), new BInventoryButton(item) {

 					@Override
 					public void onClick(ClickEvent clickEvent) {
@@ -487,8 +561,8 @@ public class PlayerGUIs {
 			LinkedHashMap<User, Integer> topVotes = (LinkedHashMap<User, Integer>) plugin.getTopVoter(top).clone();
 			users = topVotes.entrySet();

-			BInventory inv = new BInventory(StringParser.getInstance()
-					.replacePlaceHolder(Config.getInstance().getGUIVoteTopName(), "topvoter", topVoter));
+			BInventory inv = new BInventory(Config.getInstance().getGUIVoteTopName());
+			inv.addPlaceholder("topvoter", topVoter);
 			if (!Config.getInstance().isAlwaysCloseInventory()) {
 				inv.dontClose();
 			}
@@ -551,8 +625,8 @@ public class PlayerGUIs {

 		users = plugin.getLastMonthTopVoter().entrySet();

-		BInventory inv = new BInventory(StringParser.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteTopName(), "topvoter", "Last Month"));
+		BInventory inv = new BInventory(Config.getInstance().getGUIVoteTopName());
+		inv.addPlaceholder("topvoter", "Last Month");
 		if (!Config.getInstance().isAlwaysCloseInventory()) {
 			inv.dontClose();
 		}
@@ -595,8 +669,8 @@ public class PlayerGUIs {

 	public void openVoteTotal(Player player, User user) {
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringParser.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteTotalName(), "player", user.getPlayerName()));
+		BInventory inv = new BInventory(Config.getInstance().getGUIVoteTotalName());
+		inv.addPlaceholder("player", user.getPlayerName());

 		for (TopVoter top : TopVoter.values()) {
 			inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteTotalItem(top))
@@ -623,91 +697,174 @@ public class PlayerGUIs {
 	 */
 	public void openVoteURL(Player player) {
 		setSelectedPlayer(player, null);
-		BInventory inv = new BInventory(Config.getInstance().getGUIVoteURLName());
-
 		User user = UserManager.getInstance().getVotingPluginUser(player);
+		if (!Config.getInstance().isCommandsVoteBookGUI()) {
+			// normal GUI
+			BInventory inv = new BInventory(Config.getInstance().getGUIVoteURLName());

-		int count = 0;
-		if (Config.getInstance().getVoteURLViewAllUrlsButtonEnabled()) {
-			ItemBuilder builderAll = new ItemBuilder(
-					Config.getInstance().getVoteURLAlreadyVotedAllUrlsButtonItemSection());
-			if (Config.getInstance().isGuiVoteURLAllUrlsButtonrequireAllSitesVoted()) {
-				if (user.canVoteAny()) {
-					builderAll = new ItemBuilder(Config.getInstance().getVoteURLCanVoteAllUrlsButtonItemSection());
+			int count = 0;
+			if (Config.getInstance().getVoteURLViewAllUrlsButtonEnabled()) {
+				ItemBuilder builderAll = new ItemBuilder(
+						Config.getInstance().getVoteURLAlreadyVotedAllUrlsButtonItemSection());
+				if (Config.getInstance().isGuiVoteURLAllUrlsButtonrequireAllSitesVoted()) {
+					if (user.canVoteAny()) {
+						builderAll = new ItemBuilder(Config.getInstance().getVoteURLCanVoteAllUrlsButtonItemSection());
+					}
+				} else {
+					if (user.canVoteAll()) {
+						builderAll = new ItemBuilder(Config.getInstance().getVoteURLCanVoteAllUrlsButtonItemSection());
+					}
 				}
-			} else {
-				if (user.canVoteAll()) {
-					builderAll = new ItemBuilder(Config.getInstance().getVoteURLCanVoteAllUrlsButtonItemSection());
+
+				if (!builderAll.hasCustomDisplayName()) {
+					builderAll.setName("&4All Voting Sites");
 				}
-			}
-
-			if (!builderAll.hasCustomDisplayName()) {
-				builderAll.setName("&4All Voting Sites");
-			}
-			if (!builderAll.hasCustomLore()) {
-				builderAll.setLore("&cClick Me");
-			}
-
-			inv.addButton(count, new BInventoryButton(builderAll) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					User user = UserManager.getInstance().getVotingPluginUser(event.getPlayer());
-					user.sendMessage(Commands.getInstance().voteURLs(user));
+				if (!builderAll.hasCustomLore()) {
+					builderAll.setLore("&cClick Me");
 				}
-			});

-			count++;
-		}
+				inv.addButton(count, new BInventoryButton(builderAll) {

-		for (final VoteSite voteSite : plugin.getVoteSites()) {
-			ItemBuilder builder = new ItemBuilder(Config.getInstance().getVoteURLAlreadyVotedItemSection());
-			if (user.canVoteSite(voteSite)) {
-				builder = new ItemBuilder(Config.getInstance().getVoteURLCanVoteItemSection());
-			} else {
-				builder.addLoreLine(Config.getInstance().getVoteURLNextVote().replace("%Info%",
-						Commands.getInstance().voteCommandNextInfo(user, voteSite)));
+					@Override
+					public void onClick(ClickEvent event) {
+						User user = UserManager.getInstance().getVotingPluginUser(event.getPlayer());
+						user.sendMessage(Commands.getInstance().voteURLs(user, true));
+					}
+				});
+
+				count++;
 			}

-			builder.setName(Config.getInstance().getVoteURLSiteName().replace("%Name%", voteSite.getDisplayName()));
+			for (final VoteSite voteSite : plugin.getVoteSites()) {
+				ItemBuilder builder = new ItemBuilder(Config.getInstance().getVoteURLAlreadyVotedItemSection());
+				if (user.canVoteSite(voteSite)) {
+					builder = new ItemBuilder(Config.getInstance().getVoteURLCanVoteItemSection());
+				} else {
+					builder.addLoreLine(Config.getInstance().getVoteURLNextVote().replace("%Info%",
+							Commands.getInstance().voteCommandNextInfo(user, voteSite)));
+				}

-			inv.addButton(count, new BInventoryButton(builder) {
+				builder.setName(Config.getInstance().getVoteURLSiteName().replace("%Name%", voteSite.getDisplayName()));

-				@Override
-				public void onClick(ClickEvent event) {
-					Player player = event.getPlayer();
-					if (player != null) {
-						if (Config.getInstance().isCommandsVoteRewardFromVoteURL()
-								&& event.getClick().equals(ClickType.RIGHT)) {
-							voteReward(player, voteSite.getKey());
+				inv.addButton(count, new BInventoryButton(builder) {
+
+					@Override
+					public void onClick(ClickEvent event) {
+						Player player = event.getPlayer();
+						if (player != null) {
+							if (Config.getInstance().isCommandsVoteRewardFromVoteURL()
+									&& event.getClick().equals(ClickType.RIGHT)) {
+								voteReward(player, voteSite.getKey());
+							} else {
+								User user = UserManager.getInstance().getVotingPluginUser(player);
+								user.sendMessage(
+										StringParser.getInstance()
+												.replacePlaceHolder(
+														StringParser.getInstance()
+																.replacePlaceHolder(
+																		StringParser.getInstance().replacePlaceHolder(
+																				Config.getInstance()
+																						.getGUIVoteURLURLText(),
+																				"voteurl", voteSite.getVoteURL()),
+																		"sitename", voteSite.getDisplayName()),
+														"player", player.getName()));
+							}
+						}
+
+					}
+				});
+				count++;
+			}
+
+			if (Config.getInstance().getGUIVoteURLBackButton()) {
+				inv.addButton(getBackButton());
+			}
+
+			inv.openInventory(player);
+		} else {
+			// book gui
+			ArrayList<BaseComponent[]> builder = new ArrayList<BaseComponent[]>();
+			BookUtil.PageBuilder currentPage = new BookUtil.PageBuilder();
+			int lines = 0;
+			for (final VoteSite site : plugin.getVoteSites()) {
+
+				try {
+					ArrayList<String> layout = Config.getInstance().getGUIVoteURLBookGUILayout();
+
+					lines += layout.size();
+					if (lines > 14) {
+						builder.add(currentPage.build());
+						currentPage = new BookUtil.PageBuilder();
+						lines = layout.size();
+						plugin.debug("New page");
+					}
+
+					HashMap<String, String> placeholders = new HashMap<String, String>();
+					placeholders.put("Sitename", site.getDisplayName());
+					ChatColor color = ChatColor.valueOf(Config.getInstance().getGUIVoteURLBookGUIAlreadyVotedColor());
+					String text = Config.getInstance().getGUIVoteURLBookGUIAlreadyVotedText();
+					if (user.canVoteSite(site)) {
+						color = ChatColor.valueOf(Config.getInstance().getGUIVoteURLBookGUICanVoteColor());
+						text = Config.getInstance().getGUIVoteURLBookGUICanVoteText();
+					}
+					String url = ChatColor.stripColor(StringParser.getInstance()
+							.colorize(StringParser.getInstance().parseJson(site.getVoteURL(false)).toPlainText()));
+					if (!url.startsWith("http")) {
+						if (!url.startsWith("www.")) {
+							url = "https://www." + url;
 						} else {
-							User user = UserManager.getInstance().getVotingPluginUser(player);
-							user.sendMessage(StringParser.getInstance().replacePlaceHolder(StringParser.getInstance()
-									.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
-											Config.getInstance().getGUIVoteURLURLText(), "voteurl",
-											voteSite.getVoteURL()), "sitename", voteSite.getDisplayName()),
-									"player", player.getName()));
+							url = "https://" + url;
 						}
 					}

+					for (String str : layout) {
+						str = StringParser.getInstance().replacePlaceHolder(str, placeholders);
+
+						if (StringParser.getInstance().containsIgnorecase(str, "[UrlText]")) {
+							String[] split = str.split("[UrlText]");
+							String s = split[0].substring(0, split[0].length() - 1);
+							BaseComponent comp = new TextComponent(StringParser.getInstance().colorize(s));
+							comp.addExtra(BookUtil.TextBuilder.of(text).color(color)
+									.onClick(BookUtil.ClickAction.openUrl(url))
+									.onHover(BookUtil.HoverAction.showText(url)).build());
+							comp.addExtra(StringParser.getInstance().colorize(str.substring(s.length() + 9)));
+							currentPage.add(comp);
+						} else {
+							currentPage.add(StringParser.getInstance().colorize(str));
+						}
+						currentPage.newLine();
+					}
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+
+			builder.add(currentPage.build());
+
+			ItemStack book = BookUtil.writtenBook().author(player.getName())
+					.title(StringParser.getInstance().colorize(Config.getInstance().getGUIVoteURLBookGUITitle()))
+					.pages(builder).build();
+
+			Bukkit.getScheduler().runTask(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					BookUtil.openPlayer(player, book);
 				}
 			});
-			count++;
+
 		}
-
-		if (Config.getInstance().getGUIVoteURLBackButton()) {
-			inv.addButton(getBackButton());
-		}
-
-		inv.openInventory(player);
-
 	}

 	public void openVoteURL(Player player, String voteSite) {
+		if (!plugin.isVoteSite(voteSite)) {
+			player.sendMessage("Not a valid votesite");
+			return;
+		}
 		User user = UserManager.getInstance().getVotingPluginUser(player);
 		VoteSite site = plugin.getVoteSite(voteSite);
-		BInventory inv = new BInventory(StringParser.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteURLSiteName(), "site", site.getDisplayName()));
+		BInventory inv = new BInventory(Config.getInstance().getGUIVoteURLSiteName());
+		inv.addPlaceholder("site", site.getDisplayName());
 		inv.setMeta(player, "VoteSite", site);
 		if (!Config.getInstance().isAlwaysCloseInventory()) {
 			inv.dontClose();
@@ -0,0 +1,82 @@
+package com.Ben12345rocks.VotingPlugin.Config;
+
+import java.io.File;
+
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.AnnotationHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataBoolean;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataInt;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataString;
+import com.Ben12345rocks.AdvancedCore.YML.YMLFile;
+import com.Ben12345rocks.VotingPlugin.Main;
+
+import lombok.Getter;
+
+public class BungeeSettings extends YMLFile {
+	/** The instance. */
+	static BungeeSettings instance = new BungeeSettings();
+
+	/** The plugin. */
+	static Main plugin = Main.plugin;
+
+	/**
+	 * Gets the single instance of Config.
+	 *
+	 * @return single instance of Config
+	 */
+	public static BungeeSettings getInstance() {
+		return instance;
+	}
+
+	@ConfigDataBoolean(path = "UseBungeecord", secondPath = "UseBungeecoord")
+	@Getter
+	private boolean useBungeecoord = false;
+
+	@ConfigDataBoolean(path = "BungeeBroadcast")
+	@Getter
+	private boolean bungeeBroadcast = false;
+
+	@ConfigDataBoolean(path = "BungeeBroadcastAlways")
+	@Getter
+	private boolean bungeeBroadcastAlways = false;
+
+	@ConfigDataBoolean(path = "BungeeDebug")
+	@Getter
+	private boolean bungeeDebug = false;
+
+	@ConfigDataString(path = "BungeeMethod")
+	@Getter
+	private String bungeeMethod = "SOCKETS";
+
+	@ConfigDataString(path = "BungeeServer.Host")
+	@Getter
+	private String bungeeServerHost = "";
+
+	@ConfigDataString(path = "Server")
+	@Getter
+	private String server = "PleaseSet";
+
+	@ConfigDataString(path = "SpigotServer.Host")
+	@Getter
+	private String spigotServerHost = "";
+
+	@ConfigDataInt(path = "BungeeServer.Port")
+	@Getter
+	private int bungeeServerPort = 1297;
+
+	@ConfigDataInt(path = "SpigotServer.Port")
+	@Getter
+	private int spigotServerPort = 1298;
+
+	public BungeeSettings() {
+		super(new File(Main.plugin.getDataFolder(), "BungeeSettings.yml"));
+	}
+
+	public void loadValues() {
+		new AnnotationHandler().load(getData(), this);
+	}
+
+	@Override
+	public void onFileCreation() {
+		plugin.saveResource("BungeeSettings.yml", true);
+	}
+}
@@ -9,10 +9,11 @@ import org.bukkit.configuration.ConfigurationSection;

 import com.Ben12345rocks.AdvancedCore.Util.Annotation.AnnotationHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataBoolean;
-import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataDouble;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataConfigurationSection;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataInt;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataListString;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataString;
+import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.YML.YMLFile;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
@@ -57,6 +58,14 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean commandsVoteRewardFromVoteURL = false;

+	@ConfigDataBoolean(path = "ClearCacheOnVoteShopPurchase")
+	@Getter
+	private boolean clearCacheOnVoteShopPurchase = true;
+
+	@ConfigDataBoolean(path = "ExtraBackgroundUpdate")
+	@Getter
+	private boolean extraBackgroundUpdate = false;
+
 	@ConfigDataString(path = "Format.Commands.Vote.Last.TimeFormat", defaultValue = "%amount% %TimeType%")
 	@Getter
 	private String formatCommandsVoteLastTimeFormat;
@@ -69,9 +78,9 @@ public class Config extends YMLFile {
 	@Getter
 	private String formatCommandsVoteLastNeverVoted;

-	@ConfigDataString(path = "Format.Commands.Vote.Last.LastVoted", defaultValue = "%times% ago")
+	@ConfigDataString(path = "Format.Commands.Vote.Last.LastVoted")
 	@Getter
-	private String formatCommandsVoteLastLastVoted;
+	private String formatCommandsVoteLastLastVoted = "%times% ago";

 	@ConfigDataString(path = "Format.TimeFormats.Days", defaultValue = "Days")
 	@Getter
@@ -125,28 +134,22 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean addTotals = true;

+	@ConfigDataBoolean(path = "AlterColumns")
 	@Getter
-	private String allSitesRewardPath = "AllSites";
+	private boolean alterColumns = true;
+
+	@Getter
+	@ConfigDataString(path = "VoteShopDisabled")
+	private String voteShopDisabled = "&cVote shop disabled";

 	@ConfigDataBoolean(path = "AlternateUUIDLookup")
 	@Getter
 	private boolean alternateUUIDLookup = false;

-	@Getter
-	private String anySiteRewardsPath = "AnySiteRewards";
-
 	@ConfigDataBoolean(path = "AutoCreateVoteSites")
 	@Getter
 	private boolean autoCreateVoteSites = true;

-	@ConfigDataBoolean(path = "UseBungeecoord")
-	@Getter
-	private boolean useBungeeCoord = false;
-
-	@ConfigDataBoolean(path = "BungeeBroadcast")
-	@Getter
-	private boolean bungeeBroadcast = false;
-
 	@ConfigDataBoolean(path = "GUI.VoteURL.AllUrlsButton.RequireAllSitesVoted")
 	@Getter
 	private boolean guiVoteURLAllUrlsButtonrequireAllSitesVoted = true;
@@ -207,9 +210,9 @@ public class Config extends YMLFile {
 	@Getter
 	private int convertDelay;

-	@ConfigDataBoolean(path = "EnableDailyRewards")
+	@ConfigDataInt(path = "ConvertAmount")
 	@Getter
-	private boolean enableDailyRewards = false;
+	private int convertAmount = 250;

 	@ConfigDataBoolean(path = "DisableUpdateChecking")
 	@Getter
@@ -219,48 +222,34 @@ public class Config extends YMLFile {
 	@Getter
 	private int delayBetweenUpdates = 3;

+	@ConfigDataInt(path = "MaxiumNumberOfTopVotersToLoad")
+	@Getter
+	private int MaxiumNumberOfTopVotersToLoad = -1;
+
 	@ConfigDataBoolean(path = "DisableNoServiceSiteMessage")
 	@Getter
 	private boolean disableNoServiceSiteMessage = false;

+	@ConfigDataListString(path = "DisabledDefaultPermissions")
+	@Getter
+	private ArrayList<String> disabledDefaultPermissions = new ArrayList<String>();
+
 	@ConfigDataBoolean(path = "DisableAdvancedTab")
 	@Getter
 	private boolean disableAdvancedTab = false;

+	@ConfigDataBoolean(path = "VoteShopRequireConfirmation")
 	@Getter
-	private String firstVoteRewardsPath = "FirstVote";
+	private boolean voteShopRequireConfirmation = false;
+
+	@ConfigDataBoolean(path = "Format.Commands.Vote.ForceLinks")
+	@Getter
+	private boolean formatCommandsVoteForceLinks = true;

 	@ConfigDataBoolean(path = "LogVotesToFile")
 	@Getter
 	private boolean logVotesToFile = false;

-	@ConfigDataBoolean(path = "EnableMonthlyAwards")
-	@Getter
-	private boolean enableMonthlyAwards = false;
-
-	@Getter
-	private String votePartyRewardsPath = "VoteParty.Rewards";
-
-	@ConfigDataBoolean(path = "EnableWeeklyAwards")
-	@Getter
-	private boolean enableWeeklyAwards = false;
-
-	@ConfigDataDouble(path = "VoteStreak.Requirement.Day")
-	@Getter
-	private double voteStreakRequirementDay = 50;
-
-	@ConfigDataDouble(path = "VoteStreak.Requirement.Week")
-	@Getter
-	private double voteStreakRequirementWeek = 50;
-
-	@ConfigDataDouble(path = "VoteStreak.Requirement.Month")
-	@Getter
-	private double voteStreakRequirementMonth = 50;
-
-	@ConfigDataBoolean(path = "VoteStreak.Requirement.UsePercentage")
-	@Getter
-	private boolean voteStreakRequirementUsePercentage = false;
-
 	@ConfigDataBoolean(path = "LoadCommandAliases")
 	@Getter
 	private boolean loadCommandAliases = true;
@@ -300,6 +289,22 @@ public class Config extends YMLFile {
 	@Getter
 	private String formatCommandsVoteTodayLine = "&6%player% : %VoteSite% : %Time%";

+	@ConfigDataString(path = "GUI.VoteToday.Line")
+	@Getter
+	private String GUIVoteTodayLine = "&6%VoteSite% : %Time%";
+
+	@ConfigDataBoolean(path = "GUI.VoteToday.UseSkull", defaultValue = true)
+	@Getter
+	private boolean GUIVoteTodayUseSkull = true;
+
+	@ConfigDataConfigurationSection(path = "GUI.VoteToday.PlayerItem")
+	@Getter
+	private ConfigurationSection GUIVoteTodayPlayerItem;
+
+	@ConfigDataString(path = "GUI.VoteToday.IconTitle")
+	@Getter
+	private String GUIVoteTodayIconTitle = "%player%";
+
 	@ConfigDataBoolean(path = "OverrideVersionDisable")
 	@Getter
 	private boolean overrideVersionDisable = false;
@@ -311,11 +316,61 @@ public class Config extends YMLFile {
 	@ConfigDataBoolean(path = "AllowUnJoinedCheckServer")
 	@Getter
 	private boolean allowUnJoinedCheckServer = true;
-	
+
+	@ConfigDataBoolean(path = "Commands.VoteBookGUI")
+	@Getter
+	private boolean commandsVoteBookGUI = false;
+
+	@ConfigDataBoolean(path = "UseJavascriptPlaceholders")
+	@Getter
+	private boolean useJavascriptPlaceholders = true;
+
+	@ConfigDataBoolean(path = "UseBungeecord", secondPath = "UseBungeecoord")
+	@Getter
+	@Deprecated
+	private boolean useBungeecoord = false;
+
+	@ConfigDataBoolean(path = "PreventRepeatMilestones")
+	@Getter
+	private boolean preventRepeatMilestones = false;
+
 	@ConfigDataListString(path = "DisabledCommands")
 	@Getter
 	private ArrayList<String> disabledCommands = new ArrayList<String>();

+	@ConfigDataListString(path = "VotingBroadcastBlacklist")
+	@Getter
+	private ArrayList<String> votingBroadcastBlacklist = new ArrayList<String>();
+
+	@ConfigDataListString(path = "GUI.VoteURLBookGUI.Layout")
+	@Getter
+	private ArrayList<String> GUIVoteURLBookGUILayout = ArrayUtils.getInstance()
+			.convert(new String[] { "&c%Sitename%", "[UrlText]" });
+
+	@ConfigDataString(path = "GUI.VoteURLBookGUI.Title")
+	@Getter
+	private String GUIVoteURLBookGUITitle = "&cVoteURL";
+
+	@ConfigDataString(path = "GUI.VoteURLBookGUI.SiteName")
+	@Getter
+	private String GUIVoteURLBookGUISiteName = "&c%name%";
+
+	@ConfigDataString(path = "GUI.VoteURLBookGUI.CanVoteText")
+	@Getter
+	private String GUIVoteURLBookGUICanVoteText = "Click me";
+
+	@ConfigDataString(path = "GUI.VoteURLBookGUI.AlreadyVotedText")
+	@Getter
+	private String GUIVoteURLBookGUIAlreadyVotedText = "Click me";
+
+	@ConfigDataString(path = "GUI.VoteURLBookGUI.CanVoteColor")
+	@Getter
+	private String GUIVoteURLBookGUICanVoteColor = "GREEN";
+
+	@ConfigDataString(path = "GUI.VoteURLBookGUI.AlreadyVotedColor")
+	@Getter
+	private String GUIVoteURLBookGUIAlreadyVotedColor = "RED";
+
 	/**
 	 * Instantiates a new config.
 	 */
@@ -337,78 +392,6 @@ public class Config extends YMLFile {
 		return (ArrayList<String>) getData().getList("BlackList", new ArrayList<String>());
 	}

-	/**
-	 * Gets the cumulative reward enabled.
-	 *
-	 * @param cumulative
-	 *            the cumulative
-	 * @return the cumulative reward enabled
-	 */
-	public boolean getCumulativeRewardEnabled(int cumulative) {
-		return getData().getBoolean("Cumulative." + cumulative + ".Enabled");
-	}
-
-	/**
-	 * Gets the cumulative rewards path
-	 *
-	 * @param cumulative
-	 *            the cumulative
-	 * @return the cumulative rewards
-	 */
-	public String getCumulativeRewardsPath(int cumulative) {
-		return "Cumulative." + cumulative + ".Rewards";
-	}
-
-	/**
-	 * Gets the cumulative votes.
-	 *
-	 * @return the cumulative votes
-	 */
-	public Set<String> getCumulativeVotes() {
-		try {
-			Set<String> set = getData().getConfigurationSection("Cumulative").getKeys(false);
-			if (set != null) {
-				return set;
-			}
-			return new HashSet<String>();
-		} catch (Exception ex) {
-			return new HashSet<String>();
-		}
-	}
-
-	/**
-	 * Gets the cumulative votes in same day.
-	 *
-	 * @param cumulative
-	 *            the cumulative
-	 * @return the cumulative votes in same day
-	 */
-	public boolean getCumulativeVotesInSameDay(int cumulative) {
-		return getData().getBoolean("Cumulative." + cumulative + ".VotesInSameDay");
-	}
-
-	public boolean getCumulativeVotesInSameWeek(int cumulative) {
-		return getData().getBoolean("Cumulative." + cumulative + ".VotesInSameWeek");
-	}
-
-	public String getDailyAwardRewardsPath(String path) {
-		return "DailyAwards." + path + ".Rewards";
-	}
-
-	/**
-	 * Gets the daily possible reward places.
-	 *
-	 * @return the daily possible reward places
-	 */
-	public Set<String> getDailyPossibleRewardPlaces() {
-		try {
-			return getData().getConfigurationSection("DailyAwards").getKeys(false);
-		} catch (Exception ex) {
-			return new HashSet<String>();
-
-		}
-	}
-
 	/**
 	 * Gets the broad cast msg.
 	 *
@@ -949,6 +932,10 @@ public class Config extends YMLFile {
 		return getData().getInt("Shop." + identifier + ".Cost");
 	}

+	public String getIdentifierIdentifierName(String identifier) {
+		return getData().getString("Shop." + identifier + ".Identifier_Name", identifier);
+	}
+
 	public int getIdentifierLimit(String identifier) {
 		return getData().getInt("Shop." + identifier + ".Limit", -1);
 	}
@@ -1001,62 +988,6 @@ public class Config extends YMLFile {
 		return getData().getBoolean("LoadTopVoter.Weekly");
 	}

-	/**
-	 * Gets the milestone reward enabled.
-	 *
-	 * @param milestones
-	 *            the milestones
-	 * @return the milestone reward enabled
-	 */
-	public boolean getMilestoneRewardEnabled(int milestones) {
-		return getData().getBoolean("MileStones." + milestones + ".Enabled");
-	}
-
-	/**
-	 * Gets the milestone rewards.
-	 *
-	 * @param milestones
-	 *            the milestones
-	 * @return the milestone rewards
-	 */
-	public String getMilestoneRewardsPath(int milestones) {
-		return "MileStones." + milestones + ".Rewards";
-	}
-
-	/**
-	 * Gets the milestone votes.
-	 *
-	 * @return the milestone votes
-	 */
-	public Set<String> getMilestoneVotes() {
-		try {
-			Set<String> set = getData().getConfigurationSection("MileStones").getKeys(false);
-			if (set != null) {
-				return set;
-			}
-			return new HashSet<String>();
-		} catch (Exception ex) {
-			return new HashSet<String>();
-		}
-	}
-
-	public String getMonthlyAwardRewardsPath(String path) {
-		return "MonthlyAwards." + path + ".Rewards";
-	}
-
-	/**
-	 * Gets the monthly possible reward places.
-	 *
-	 * @return the monthly possible reward places
-	 */
-	public Set<String> getMonthlyPossibleRewardPlaces() {
-		try {
-			return getData().getConfigurationSection("MonthlyAwards").getKeys(false);
-		} catch (Exception ex) {
-			return new HashSet<String>();
-		}
-	}
-
 	public int getPointsOnVote() {
 		return getData().getInt("PointsOnVote", 1);
 	}
@@ -1088,10 +1019,6 @@ public class Config extends YMLFile {
 		return (ArrayList<String>) getData().getList("RequestAPI.DisabledMethods", new ArrayList<String>());
 	}

-	public boolean getResetMilestonesMonthly() {
-		return getData().getBoolean("ResetMilestonesMonthly");
-	}
-
 	/**
 	 * Gets the store top voters daily.
 	 *
@@ -1179,62 +1106,6 @@ public class Config extends YMLFile {
 		return getData().getInt("GUI.VoteGUI." + slot + ".Slot", -1);
 	}

-	public String getVotePartyBroadcast() {
-		return getData().getString("VoteParty.Broadcast", "");
-	}
-
-	@SuppressWarnings("unchecked")
-	public ArrayList<String> getVotePartyCommands() {
-		return (ArrayList<String>) getData().getList("VoteParty.Commands", new ArrayList<String>());
-	}
-
-	public boolean getVotePartyCountFakeVotes() {
-		return getData().getBoolean("VoteParty.CountFakeVotes", true);
-	}
-
-	/**
-	 * Gets the vote party enabled.
-	 *
-	 * @return the vote party enabled
-	 */
-	public boolean getVotePartyEnabled() {
-		return getData().getBoolean("VoteParty.Enabled");
-	}
-
-	/**
-	 * Gets the vote party give all players.
-	 *
-	 * @return the vote party give all players
-	 */
-	public boolean getVotePartyGiveAllPlayers() {
-		return getData().getBoolean("VoteParty.GiveAllPlayers");
-	}
-
-	public int getVotePartyIncreaseVotesRquired() {
-		return getData().getInt("VoteParty.IncreaseVotesRquired", 0);
-	}
-
-	public boolean getVotePartyResetEachDay() {
-		return getData().getBoolean("VoteParty.ResetEachDay");
-	}
-
-	public boolean getVotePartyResetMontly() {
-		return getData().getBoolean("VoteParty.ResetMonthly");
-	}
-
-	public int getVotePartyUserVotesRequired() {
-		return getData().getInt("VoteParty.UserVotesRequired");
-	}
-
-	/**
-	 * Gets the vote party votes required.
-	 *
-	 * @return the vote party votes required
-	 */
-	public int getVotePartyVotesRequired() {
-		return getData().getInt("VoteParty.VotesRequired");
-	}
-
 	/**
 	 * Gets the enabled.
 	 *
@@ -1300,6 +1171,18 @@ public class Config extends YMLFile {
 		return getData().getString("Shop." + ident + ".Permission", "");
 	}

+	public boolean getVoteShopResetDaily(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Daily", false);
+	}
+
+	public boolean getVoteShopResetMonthly(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Monthly", false);
+	}
+
+	public boolean getVoteShopResetWeekly(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Weekly", false);
+	}
+
 	/**
 	 * Gets the vote site items.
 	 *
@@ -1335,35 +1218,6 @@ public class Config extends YMLFile {
 		return getData().getInt("GUI.VoteReward." + siteName + ".Items." + item + ".Slot");
 	}

-	/**
-	 * Gets the votes required.
-	 *
-	 * @return the votes required
-	 */
-	public int getVotesRequired() {
-		return getData().getInt("VotesRequired");
-	}
-
-	public boolean getVoteStreakRewardEnabled(String type, String s) {
-		return getData().getBoolean("VoteStreak." + type + "." + s + ".Enabled");
-	}
-
-	public String getVoteStreakRewardsPath(String type, String string) {
-		return "VoteStreak." + type + "." + string + ".Rewards";
-	}
-
-	public Set<String> getVoteStreakVotes(String type) {
-		try {
-			Set<String> set = getData().getConfigurationSection("VoteStreak." + type).getKeys(false);
-			if (set != null) {
-				return set;
-			}
-			return new HashSet<String>();
-		} catch (Exception ex) {
-			return new HashSet<String>();
-		}
-	}
-
 	public String getVoteTopDefault() {
 		return getData().getString("VoteTopDefault", "Monthly");
 	}
@@ -1429,23 +1283,6 @@ public class Config extends YMLFile {
 		return getData().getBoolean("GUI.VoteURL.ViewAllUrlsButtonEnabled");
 	}

-	public String getWeeklyAwardRewardsPath(String path) {
-		return "WeeklyAwards." + path + ".Rewards";
-	}
-
-	/**
-	 * Gets the weekly possible reward places.
-	 *
-	 * @return the weekly possible reward places
-	 */
-	public Set<String> getWeeklyPossibleRewardPlaces() {
-		try {
-			return getData().getConfigurationSection("WeeklyAwards").getKeys(false);
-		} catch (Exception ex) {
-			return new HashSet<String>();
-		}
-	}
-
 	public void loadValues() {
 		new AnnotationHandler().load(getData(), this);
 	}
@@ -6,11 +6,14 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;

+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;

+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.YML.YMLFile;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -60,11 +63,18 @@ public class ConfigVoteSites extends YMLFile {
 			setServiceSite(siteName, org);
 			setVoteURL(siteName, "VoteURL");
 			setVoteDelay(siteName, 24);
-			set(siteName, "Item.Material", "GRASS");
-			set(siteName, "Item.Amount", 1);
+			set(siteName, "DisplayItem.Material", "GRASS");
+			set(siteName, "DisplayItem.Amount", 1);
 			set(siteName, "Rewards.Messages.Player", "&aThanks for voting on %ServiceSite%!");

 			plugin.loadVoteSites();
+
+			for (Player p : Bukkit.getOnlinePlayers()) {
+				if (p.hasPermission("VotingPlugin.Admin.GenerateServiceSite") || p.isOp()) {
+					p.sendMessage(StringParser.getInstance().colorize("&cGenerating votesite for service site "
+							+ siteName + ", please check console for details"));
+				}
+			}
 		}
 	}

@@ -88,6 +98,9 @@ public class ConfigVoteSites extends YMLFile {
 	}

 	public ConfigurationSection getItem(String site) {
+		if (getData(site).isConfigurationSection("DisplayItem")) {
+			return getData(site).getConfigurationSection("DisplayItem");
+		}
 		return getData(site).getConfigurationSection("Item");
 	}

@@ -124,6 +137,10 @@ public class ConfigVoteSites extends YMLFile {
 		return getData(siteName).getString("ServiceSite");
 	}

+	public int getTimeOffSet(String siteName) {
+		return getData(siteName).getInt("TimeOffSet", 0);
+	}
+
 	/**
 	 * Gets the vote delay.
 	 *
@@ -135,6 +152,10 @@ public class ConfigVoteSites extends YMLFile {
 		return getData(siteName).getInt("VoteDelay");
 	}

+	public int getVoteDelayMin(String siteName) {
+		return getData(siteName).getInt("VoteDelayMin", 0);
+	}
+
 	/**
 	 * Gets the vote site enabled.
 	 *
@@ -0,0 +1,303 @@
+package com.Ben12345rocks.VotingPlugin.Config;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.AnnotationHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataBoolean;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataDouble;
+import com.Ben12345rocks.AdvancedCore.YML.YMLFile;
+import com.Ben12345rocks.VotingPlugin.Main;
+
+import lombok.Getter;
+
+public class SpecialRewardsConfig extends YMLFile {
+	/** The instance. */
+	static SpecialRewardsConfig instance = new SpecialRewardsConfig();
+
+	/** The plugin. */
+	static Main plugin = Main.plugin;
+
+	/**
+	 * Gets the single instance of Config.
+	 *
+	 * @return single instance of Config
+	 */
+	public static SpecialRewardsConfig getInstance() {
+		return instance;
+	}
+
+	@ConfigDataBoolean(path = "EnableWeeklyAwards")
+	@Getter
+	private boolean enableWeeklyAwards = false;
+
+	@ConfigDataBoolean(path = "EnableDailyRewards")
+	@Getter
+	private boolean enableDailyRewards = false;
+
+	@ConfigDataBoolean(path = "EnableMonthlyAwards")
+	@Getter
+	private boolean enableMonthlyAwards = false;
+
+	@Getter
+	private String anySiteRewardsPath = "AnySiteRewards";
+
+	@ConfigDataDouble(path = "VoteStreak.Requirement.Day")
+	@Getter
+	private double voteStreakRequirementDay = 50;
+
+	@ConfigDataDouble(path = "VoteStreak.Requirement.Week")
+	@Getter
+	private double voteStreakRequirementWeek = 50;
+
+	@ConfigDataDouble(path = "VoteStreak.Requirement.Month")
+	@Getter
+	private double voteStreakRequirementMonth = 50;
+
+	@ConfigDataBoolean(path = "VoteStreak.Requirement.UsePercentage")
+	@Getter
+	private boolean voteStreakRequirementUsePercentage = false;
+
+	@ConfigDataBoolean(path = "VoteParty.ResetExtraVotesMonthly")
+	@Getter
+	private boolean votePartyResetExtraVotesMonthly = false;
+
+	@Getter
+	private String allSitesRewardPath = "AllSites";
+
+	@Getter
+	private String votePartyRewardsPath = "VoteParty.Rewards";
+
+	@Getter
+	private String firstVoteRewardsPath = "FirstVote";
+
+	public SpecialRewardsConfig() {
+		super(new File(Main.plugin.getDataFolder(), "SpecialRewards.yml"));
+	}
+
+	public boolean getCumulativeRewardEnabled(int cumulative) {
+		return getData().getBoolean("Cumulative." + cumulative + ".Enabled");
+	}
+
+	public String getCumulativeRewardsPath(int cumulative) {
+		return "Cumulative." + cumulative + ".Rewards";
+	}
+
+	/**
+	 * Gets the cumulative votes.
+	 *
+	 * @return the cumulative votes
+	 */
+	public Set<String> getCumulativeVotes() {
+		try {
+			Set<String> set = getData().getConfigurationSection("Cumulative").getKeys(false);
+			if (set != null) {
+				return set;
+			}
+			return new HashSet<String>();
+		} catch (Exception ex) {
+			return new HashSet<String>();
+		}
+	}
+
+	/**
+	 * Gets the cumulative votes in same day.
+	 *
+	 * @param cumulative
+	 *            the cumulative
+	 * @return the cumulative votes in same day
+	 */
+	public boolean getCumulativeVotesInSameDay(int cumulative) {
+		return getData().getBoolean("Cumulative." + cumulative + ".VotesInSameDay");
+	}
+
+	public boolean getCumulativeVotesInSameMonth(int cumulative) {
+		return getData().getBoolean("Cumulative." + cumulative + ".VotesInSameMonth");
+	}
+
+	public boolean getCumulativeVotesInSameWeek(int cumulative) {
+		return getData().getBoolean("Cumulative." + cumulative + ".VotesInSameWeek");
+	}
+
+	public String getDailyAwardRewardsPath(String path) {
+		return "DailyAwards." + path + ".Rewards";
+	}
+
+	/**
+	 * Gets the daily possible reward places.
+	 *
+	 * @return the daily possible reward places
+	 */
+	public Set<String> getDailyPossibleRewardPlaces() {
+		try {
+			return getData().getConfigurationSection("DailyAwards").getKeys(false);
+		} catch (Exception ex) {
+			return new HashSet<String>();
+
+		}
+	}
+
+	/**
+	 * Gets the milestone reward enabled.
+	 *
+	 * @param milestones
+	 *            the milestones
+	 * @return the milestone reward enabled
+	 */
+	public boolean getMilestoneRewardEnabled(int milestones) {
+		return getData().getBoolean("MileStones." + milestones + ".Enabled");
+	}
+
+	/**
+	 * Gets the milestone rewards.
+	 *
+	 * @param milestones
+	 *            the milestones
+	 * @return the milestone rewards
+	 */
+	public String getMilestoneRewardsPath(int milestones) {
+		return "MileStones." + milestones + ".Rewards";
+	}
+
+	/**
+	 * Gets the milestone votes.
+	 *
+	 * @return the milestone votes
+	 */
+	public Set<String> getMilestoneVotes() {
+		try {
+			Set<String> set = getData().getConfigurationSection("MileStones").getKeys(false);
+			if (set != null) {
+				return set;
+			}
+			return new HashSet<String>();
+		} catch (Exception ex) {
+			return new HashSet<String>();
+		}
+	}
+
+	public String getMonthlyAwardRewardsPath(String path) {
+		return "MonthlyAwards." + path + ".Rewards";
+	}
+
+	/**
+	 * Gets the monthly possible reward places.
+	 *
+	 * @return the monthly possible reward places
+	 */
+	public Set<String> getMonthlyPossibleRewardPlaces() {
+		try {
+			return getData().getConfigurationSection("MonthlyAwards").getKeys(false);
+		} catch (Exception ex) {
+			return new HashSet<String>();
+		}
+	}
+
+	public boolean getResetMilestonesMonthly() {
+		return getData().getBoolean("ResetMilestonesMonthly");
+	}
+
+	public String getVotePartyBroadcast() {
+		return getData().getString("VoteParty.Broadcast", "");
+	}
+
+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getVotePartyCommands() {
+		return (ArrayList<String>) getData().getList("VoteParty.Commands", new ArrayList<String>());
+	}
+
+	public boolean getVotePartyCountFakeVotes() {
+		return getData().getBoolean("VoteParty.CountFakeVotes", true);
+	}
+
+	/**
+	 * Gets the vote party enabled.
+	 *
+	 * @return the vote party enabled
+	 */
+	public boolean getVotePartyEnabled() {
+		return getData().getBoolean("VoteParty.Enabled");
+	}
+
+	/**
+	 * Gets the vote party give all players.
+	 *
+	 * @return the vote party give all players
+	 */
+	public boolean getVotePartyGiveAllPlayers() {
+		return getData().getBoolean("VoteParty.GiveAllPlayers");
+	}
+
+	public int getVotePartyIncreaseVotesRquired() {
+		return getData().getInt("VoteParty.IncreaseVotesRquired", 0);
+	}
+
+	public boolean getVotePartyResetEachDay() {
+		return getData().getBoolean("VoteParty.ResetEachDay");
+	}
+
+	public boolean getVotePartyResetMontly() {
+		return getData().getBoolean("VoteParty.ResetMonthly");
+	}
+
+	public int getVotePartyUserVotesRequired() {
+		return getData().getInt("VoteParty.UserVotesRequired");
+	}
+
+	/**
+	 * Gets the vote party votes required.
+	 *
+	 * @return the vote party votes required
+	 */
+	public int getVotePartyVotesRequired() {
+		return getData().getInt("VoteParty.VotesRequired");
+	}
+
+	public boolean getVoteStreakRewardEnabled(String type, String s) {
+		return getData().getBoolean("VoteStreak." + type + "." + s + ".Enabled");
+	}
+
+	public String getVoteStreakRewardsPath(String type, String string) {
+		return "VoteStreak." + type + "." + string + ".Rewards";
+	}
+
+	public Set<String> getVoteStreakVotes(String type) {
+		try {
+			Set<String> set = getData().getConfigurationSection("VoteStreak." + type).getKeys(false);
+			if (set != null) {
+				return set;
+			}
+			return new HashSet<String>();
+		} catch (Exception ex) {
+			return new HashSet<String>();
+		}
+	}
+
+	public String getWeeklyAwardRewardsPath(String path) {
+		return "WeeklyAwards." + path + ".Rewards";
+	}
+
+	/**
+	 * Gets the weekly possible reward places.
+	 *
+	 * @return the weekly possible reward places
+	 */
+	public Set<String> getWeeklyPossibleRewardPlaces() {
+		try {
+			return getData().getConfigurationSection("WeeklyAwards").getKeys(false);
+		} catch (Exception ex) {
+			return new HashSet<String>();
+		}
+	}
+
+	public void loadValues() {
+		new AnnotationHandler().load(getData(), this);
+	}
+
+	@Override
+	public void onFileCreation() {
+		plugin.saveResource("SpecialRewards.yml", true);
+	}
+}
@@ -1,6 +1,7 @@
 package com.Ben12345rocks.VotingPlugin.CoolDown;

-import org.bukkit.Bukkit;
+import java.util.TimerTask;
+
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -10,7 +11,7 @@ import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
 import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DateChangedEvent;
 import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.VotingPlugin.Main;
-import com.Ben12345rocks.VotingPlugin.Config.Config;
+import com.Ben12345rocks.VotingPlugin.Config.SpecialRewardsConfig;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteCoolDownEndEvent;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
@@ -53,26 +54,32 @@ public class CoolDownCheck implements Listener {
 	}

 	public void checkAll() {
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+		Main.plugin.getTimer().schedule(new TimerTask() {

 			@Override
 			public void run() {
-				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-					if (Main.plugin != null) {
-						User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-						if (user.getUserData().hasData() && user.hasLoggedOnBefore()) {
-							user.checkCoolDownEvents();
+				if (Main.plugin != null) {
+					for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+						if (Main.plugin != null) {
+							User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+							if (user.getUserData().hasData() && user.hasLoggedOnBefore()) {
+								user.checkCoolDownEvents();
+							}
+						} else {
+							cancel();
 						}
 					}
+				} else {
+					cancel();
 				}
 			}
-		});
+		}, 1000 * 60 * 3);

 	}

 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onCoolDownEnd(PlayerVoteCoolDownEndEvent event) {
-		RewardHandler.getInstance().giveReward(event.getPlayer(), Config.getInstance().getData(),
+		RewardHandler.getInstance().giveReward(event.getPlayer(), SpecialRewardsConfig.getInstance().getData(),
 				"VoteCoolDownEndedReward",
 				new RewardOptions().addPlaceholder("Votesite", event.getVoteSite().getDisplayName()));
 	}
@@ -127,22 +127,6 @@ public class ServerData {
 				getData().getDouble("Signs." + sign + ".Z"));
 	}

-	/**
-	 * Gets the sign location.
-	 *
-	 * @param sign
-	 *            the sign
-	 * @return the sign location
-	 */
-	public Location getSignSkullLocation(String sign) {
-		if (getData().getString("Signs." + sign + ".Skull.World", "").isEmpty()) {
-			return null;
-		}
-		return new Location(Bukkit.getWorld(getData().getString("Signs." + sign + ".Skull.World")),
-				getData().getDouble("Signs." + sign + ".Skull.X"), getData().getDouble("Signs." + sign + ".Skull.Y"),
-				getData().getDouble("Signs." + sign + ".Skull.Z"));
-	}
-
 	/**
 	 * Gets the sign position.
 	 *
@@ -167,6 +151,22 @@ public class ServerData {
 		}
 	}

+	/**
+	 * Gets the sign location.
+	 *
+	 * @param sign
+	 *            the sign
+	 * @return the sign location
+	 */
+	public Location getSignSkullLocation(String sign) {
+		if (getData().getString("Signs." + sign + ".Skull.World", "").isEmpty()) {
+			return null;
+		}
+		return new Location(Bukkit.getWorld(getData().getString("Signs." + sign + ".Skull.World")),
+				getData().getDouble("Signs." + sign + ".Skull.X"), getData().getDouble("Signs." + sign + ".Skull.Y"),
+				getData().getDouble("Signs." + sign + ".Skull.Z"));
+	}
+
 	public int getVotePartyExtraRequired() {
 		return getData().getInt("VotePartyExtraRequired", 0);
 	}
@@ -42,14 +42,26 @@ public class PlayerVoteEvent extends Event {
 	@Setter
 	private boolean realVote = true;

+	@Getter
+	@Setter
+	private boolean addTotals = true;
+
 	@Getter
 	@Setter
 	private String serviceSite = "";
-	
+
 	@Getter
 	@Setter
 	private long time;

+	@Getter
+	@Setter
+	private boolean bungee = false;
+
+	@Getter
+	@Setter
+	private boolean forceBungee = false;
+
 	public PlayerVoteEvent(VoteSite voteSite, String voteUsername, String serviceSite, boolean realVote) {
 		super(true);
 		this.player = voteUsername;
@@ -67,8 +79,4 @@ public class PlayerVoteEvent extends Event {
 		return handlers;
 	}

-	@Getter
-	@Setter
-	private boolean bungee = false;
-
 }
@@ -30,18 +30,24 @@ public class PlayerCommandSendListener implements Listener {
 			return;
 		}
 		ArrayList<String> removeCmds = new ArrayList<String>();
-		ArrayList<String> whiteListed = new ArrayList<String>();
-		for (String cmd : event.getCommands()) {
-			if (CommandLoader.getInstance().isVotingPluginCommand(event.getPlayer(), cmd)) {
-				if (!CommandLoader.getInstance().hasPermission(event.getPlayer(), cmd) && !whiteListed.contains(cmd)) {
-					removeCmds.add(cmd);
-					// plugin.debug("removed " + cmd);
-				} else {
-					removeCmds.remove(cmd);
-					whiteListed.add(cmd);
-					// plugin.debug("has " + cmd);
+		if (!Main.plugin.getAdvancedTab().containsKey(event.getPlayer().getUniqueId())) {
+			ArrayList<String> whiteListed = new ArrayList<String>();
+			for (String cmd : event.getCommands()) {
+				if (CommandLoader.getInstance().isVotingPluginCommand(event.getPlayer(), cmd)) {
+					if (!CommandLoader.getInstance().hasPermission(event.getPlayer(), cmd)
+							&& !whiteListed.contains(cmd)) {
+						removeCmds.add(cmd);
+						// plugin.debug("removed " + cmd);
+					} else {
+						removeCmds.remove(cmd);
+						whiteListed.add(cmd);
+						// plugin.debug("has " + cmd);
+					}
 				}
 			}
+			Main.plugin.getAdvancedTab().put(event.getPlayer().getUniqueId(), removeCmds);
+		} else {
+			removeCmds = Main.plugin.getAdvancedTab().get(event.getPlayer().getUniqueId());
 		}
 		event.getCommands().removeAll(removeCmds);
 	}
@@ -1,9 +1,11 @@
 package com.Ben12345rocks.VotingPlugin.Listeners;

+import org.bukkit.Bukkit;
 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.Ben12345rocks.AdvancedCore.Listeners.AdvancedCoreLoginEvent;
 import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
@@ -52,9 +54,6 @@ public class PlayerJoinEvent implements Listener {
 		}

 		boolean data = user.getData().hasData();
-		if (Main.plugin.getOptions().isProcessRewards() && Config.getInstance().isUseBungeeCoord() && data) {
-			user.bungeeVote();
-		}

 		// run remind
 		user.loginMessage();
@@ -63,6 +62,21 @@ public class PlayerJoinEvent implements Listener {
 			// give offline vote (if they voted offline)
 			user.offVote();
 		}
+	}
+
+	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+	public void onPlayerQuit(PlayerQuitEvent event) {
+		if (Config.getInstance().isDisableAdvancedTab()) {
+			return;
+		}
+		final java.util.UUID uuid = event.getPlayer().getUniqueId();
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				Main.plugin.getAdvancedTab().remove(uuid);
+			}
+		});

 	}
 }
@@ -1,14 +1,20 @@
 package com.Ben12345rocks.VotingPlugin.Listeners;

+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.ArrayList;

+import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;

 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
+import com.Ben12345rocks.AdvancedCore.Util.PluginMessage.PluginMessage;
+import com.Ben12345rocks.VotingPlugin.BungeeHandler;
 import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Config.BungeeSettings;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
@@ -17,6 +23,7 @@ import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
 import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
+import com.Ben12345rocks.VotingPlugin.bungee.BungeeMethod;

 // TODO: Auto-generated Javadoc
 /**
@@ -84,7 +91,7 @@ public class PlayerVoteListener implements Listener {
 		User user = UserManager.getInstance().getVotingPluginUser(playerName);
 		user.updateName();

-		if (Config.getInstance().isClearCacheOnVote() || Config.getInstance().isUseBungeeCoord()) {
+		if (Config.getInstance().isClearCacheOnVote() || BungeeSettings.getInstance().isUseBungeecoord()) {
 			user.clearCache();
 		}

@@ -99,7 +106,8 @@ public class PlayerVoteListener implements Listener {
 			VoteParty.getInstance().vote(user, event.isRealVote());

 			// broadcast vote if enabled in config
-			if (config.isBroadcastVotesEnabled()) {
+			if (config.isBroadcastVotesEnabled()
+					&& (BungeeSettings.getInstance().isBungeeBroadcast() || !event.isBungee())) {
 				if (!Config.getInstance().getFormatBroadcastWhenOnline() || user.isOnline()) {
 					voteSite.broadcastVote(user);
 				}
@@ -113,6 +121,16 @@ public class PlayerVoteListener implements Listener {
 			}
 			user.setLastVoteCoolDownCheck(false, voteSite);

+			// try logging to file
+			if (Config.getInstance().isLogVotesToFile()) {
+				try {
+					Main.plugin.logVote(LocalDateTime.now().atZone(ZoneId.systemDefault()).toLocalDateTime(),
+							playerName, voteSite.getKey());
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+
 			// check first vote rewards
 			SpecialRewards.getInstance().checkFirstVote(user);

@@ -124,7 +142,7 @@ public class PlayerVoteListener implements Listener {

 			if (((user.isOnline() || voteSite.isGiveOffline()) && Main.plugin.getOptions().isProcessRewards())
 					|| event.isBungee()) {
-				user.playerVote(voteSite, true, false, event.isBungee());
+				user.playerVote(voteSite, true, false, event.isForceBungee());
 				user.closeInv();
 			} else {
 				user.addOfflineVote(voteSite.getKey());
@@ -133,7 +151,7 @@ public class PlayerVoteListener implements Listener {
 			}

 			// add to total votes
-			if (Config.getInstance().isCountFakeVotes() || event.isRealVote()) {
+			if ((Config.getInstance().isCountFakeVotes() || event.isRealVote()) && event.isAddTotals()) {
 				if (Config.getInstance().isAddTotals()) {
 					user.addTotal();
 					user.addTotalDaily();
@@ -148,6 +166,22 @@ public class PlayerVoteListener implements Listener {
 			SpecialRewards.getInstance().checkAllSites(user);
 			SpecialRewards.getInstance().checkCumualativeVotes(user);
 			SpecialRewards.getInstance().checkMilestone(user);
+
+			if (BungeeSettings.getInstance().isUseBungeecoord()) {
+				if (BungeeHandler.getInstance().getMethod().equals(BungeeMethod.MYSQL)) {
+					final String uuid = user.getUUID();
+					Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+						@Override
+						public void run() {
+							if (Bukkit.getOnlinePlayers().size() > 0) {
+								PluginMessage.getInstance().sendPluginMessage(
+										PlayerUtils.getInstance().getRandomOnlinePlayer(), "VoteUpdate", uuid);
+							}
+						}
+					}, 40);
+				}
+			}
 		}

 		plugin.setUpdate(true);
@@ -69,7 +69,7 @@ public class VotiferEvent implements Listener {
 		}

 		plugin.getLogger()
-				.info("Recieved a vote from service site '" + voteSite + "' by player '" + voteUsername + "'!");
+				.info("Received a vote from service site '" + voteSite + "' by player '" + voteUsername + "'!");

 		plugin.debug("PlayerUsername: " + voteUsername);
 		plugin.debug("VoteSite: " + voteSite);
@@ -6,6 +6,9 @@ import org.bukkit.event.Listener;

 import com.Ben12345rocks.AdvancedCore.Listeners.PluginUpdateVersionEvent;
 import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Config.BungeeSettings;
+import com.Ben12345rocks.VotingPlugin.Config.Config;
+import com.Ben12345rocks.VotingPlugin.Config.SpecialRewardsConfig;

 // TODO: Auto-generated Javadoc
 /**
@@ -32,12 +35,59 @@ public class VotingPluginUpdateEvent implements Listener {
 	 * @param event
 	 *            the event
 	 */
+	@SuppressWarnings("deprecation")
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onPluginUpdate(PluginUpdateVersionEvent event) {
 		if (event.getPlugin().getName().equals(plugin.getDescription().getName())) {
 			if (!event.getOldVersion().equals("")) {
 				plugin.getLogger().info("VotingPlugin Updated to " + plugin.getDescription().getVersion() + " from "
 						+ event.getOldVersion());
+
+				if (SpecialRewardsConfig.getInstance().isJustCreated()) {
+					// copy old data over
+					plugin.getLogger().info("Coping data from Config.yml into SpecialRewards.yml");
+
+					String[] copies = new String[] { "VoteCoolDownEndedReward", "AnySiteRewards", "VoteStreak",
+							"MileStones", "VoteParty", "Cumulative", "AllSites", "FirstVote", "DailyAwards",
+							"WeeklyAwards", "MonthlyAwards" };
+					for (String str : copies) {
+						SpecialRewardsConfig.getInstance().getData().set(str,
+								Config.getInstance().getData().getConfigurationSection(str));
+					}
+
+					String[] copies1 = new String[] { "ResetMilestonesMonthly", "EnableMonthlyAwards",
+							"EnableWeeklyAwards", "EnableDailyRewards" };
+					for (String str : copies1) {
+						SpecialRewardsConfig.getInstance().getData().set(str,
+								Config.getInstance().getData().getBoolean(str));
+					}
+					SpecialRewardsConfig.getInstance().saveData();
+				}
+
+				if (BungeeSettings.getInstance().isJustCreated()) {
+					// copy old data over
+					plugin.getLogger().info("Coping data from Config.yml into BungeeSettings.yml");
+
+					String[] copies = new String[] { "BungeeServer", "SpigotServer" };
+					for (String str : copies) {
+						BungeeSettings.getInstance().getData().set(str,
+								Config.getInstance().getData().getConfigurationSection(str));
+					}
+
+					BungeeSettings.getInstance().getData().set("UseBungeecord",
+							Config.getInstance().isUseBungeecoord());
+
+					String[] copies1 = new String[] { "BungeeBroadcastAlways", "BungeeDebug", "BungeeBroadcast" };
+					for (String str : copies1) {
+						BungeeSettings.getInstance().getData().set(str, Config.getInstance().getData().getBoolean(str));
+					}
+
+					String[] copies2 = new String[] { "BungeeMethod", "Server" };
+					for (String str : copies2) {
+						BungeeSettings.getInstance().getData().set(str, Config.getInstance().getData().getString(str));
+					}
+					BungeeSettings.getInstance().saveData();
+				}
 			}
 		}
 	}
@@ -2,17 +2,15 @@ package com.Ben12345rocks.VotingPlugin;

 import java.io.File;
 import java.io.IOException;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 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 org.bukkit.Bukkit;
@@ -53,8 +51,10 @@ import com.Ben12345rocks.VotingPlugin.Commands.Executers.CommandVote;
 import com.Ben12345rocks.VotingPlugin.Commands.GUI.AdminGUI;
 import com.Ben12345rocks.VotingPlugin.Commands.TabCompleter.AdminVoteTabCompleter;
 import com.Ben12345rocks.VotingPlugin.Commands.TabCompleter.VoteTabCompleter;
+import com.Ben12345rocks.VotingPlugin.Config.BungeeSettings;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Config.SpecialRewardsConfig;
 import com.Ben12345rocks.VotingPlugin.CoolDown.CoolDownCheck;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
 import com.Ben12345rocks.VotingPlugin.Listeners.BlockBreak;
@@ -137,6 +137,26 @@ public class Main extends AdvancedCorePlugin {
 	@Getter
 	private boolean ymlError = false;

+	private boolean votifierLoaded = true;
+
+	@Getter
+	private LinkedHashMap<java.util.UUID, ArrayList<String>> advancedTab = new LinkedHashMap<java.util.UUID, ArrayList<String>>();
+
+	@Getter
+	private SpecialRewardsConfig specialRewardsConfig;
+
+	@Getter
+	private BungeeSettings bungeeSettings;
+
+	public void basicBungeeUpdate() {
+		for (Player player : Bukkit.getOnlinePlayers()) {
+			User user = UserManager.getInstance().getVotingPluginUser(player);
+			user.clearCache();
+			user.offVote();
+			user.checkOfflineRewards();
+		}
+	}
+
 	/**
 	 * Check votifier.
 	 */
@@ -144,8 +164,13 @@ public class Main extends AdvancedCorePlugin {
 		try {
 			Class.forName("com.vexsoftware.votifier.model.VotifierEvent");
 		} catch (ClassNotFoundException e) {
-			plugin.getLogger()
-					.warning("No VotifierEvent found, install Votifier, NuVotifier, or another Votifier plugin");
+			if (!BungeeSettings.getInstance().isUseBungeecoord()) {
+				plugin.getLogger()
+						.warning("No VotifierEvent found, install Votifier, NuVotifier, or another Votifier plugin");
+			} else {
+				plugin.debug("No VotifierEvent found, but usebungeecoord enabled");
+			}
+			votifierLoaded = false;
 		}
 	}

@@ -213,7 +238,7 @@ public class Main extends AdvancedCorePlugin {

 			ArrayList<String> converted = new ArrayList<String>();
 			int i = 0;
-			while (i < 250 && i < uuids.size()) {
+			while (i < Config.getInstance().getConvertAmount() && i < uuids.size()) {
 				String uuid = uuids.get(i);
 				try {
 					User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
@@ -379,6 +404,15 @@ public class Main extends AdvancedCorePlugin {
 		return false;
 	}

+	public boolean isVoteSite(String voteSite) {
+		for (VoteSite site : getVoteSites()) {
+			if (site.getKey().equalsIgnoreCase(voteSite)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	private void loadTimer() {
 		Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {

@@ -408,6 +442,18 @@ public class Main extends AdvancedCorePlugin {
 					}
 				}, 1000 * 60 * 10, 1000 * 60 * 5);

+				getTimer().schedule(new TimerTask() {
+
+					@Override
+					public void run() {
+						if (plugin != null && Config.getInstance().isExtraBackgroundUpdate()) {
+							basicBungeeUpdate();
+						} else {
+							cancel();
+						}
+					}
+				}, 1000, 1000 * 30);
+
 			}
 		}, 40L);

@@ -439,9 +485,10 @@ public class Main extends AdvancedCorePlugin {
 	 * @param voteSite
 	 *            the vote site
 	 */
-	public void logVote(Date date, String playerName, String voteSite) {
+	public void logVote(LocalDateTime date, String playerName, String voteSite) {
 		if (Config.getInstance().isLogVotesToFile()) {
-			String str = new SimpleDateFormat("EEE, d MMM yyyy HH:mm").format(date);
+			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+			String str = formatter.format(date);
 			voteLog.logToFile(str + ": " + playerName + " voted on " + voteSite);
 		}
 	}
@@ -464,8 +511,8 @@ public class Main extends AdvancedCorePlugin {

 			@Override
 			public String getValue() {
-				if (RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-						Config.getInstance().getFirstVoteRewardsPath())) {
+				if (RewardHandler.getInstance().hasRewards(SpecialRewardsConfig.getInstance().getData(),
+						SpecialRewardsConfig.getInstance().getFirstVoteRewardsPath())) {
 					return "True";
 				} else {
 					return "False";
@@ -488,8 +535,8 @@ public class Main extends AdvancedCorePlugin {

 			@Override
 			public String getValue() {
-				if (RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-						Config.getInstance().getAllSitesRewardPath())) {
+				if (RewardHandler.getInstance().hasRewards(SpecialRewardsConfig.getInstance().getData(),
+						SpecialRewardsConfig.getInstance().getAllSitesRewardPath())) {
 					return "True";
 				} else {
 					return "False";
@@ -500,11 +547,11 @@ public class Main extends AdvancedCorePlugin {

 			@Override
 			public String getValue() {
-				if (Config.getInstance().getCumulativeVotes().size() == 0) {
+				if (SpecialRewardsConfig.getInstance().getCumulativeVotes().size() == 0) {
 					return "False";
 				} else {
-					for (String cum : Config.getInstance().getCumulativeVotes()) {
-						if (Config.getInstance().getCumulativeRewardEnabled(Integer.parseInt(cum))) {
+					for (String cum : SpecialRewardsConfig.getInstance().getCumulativeVotes()) {
+						if (SpecialRewardsConfig.getInstance().getCumulativeRewardEnabled(Integer.parseInt(cum))) {
 							return "True";
 						}
 					}
@@ -516,7 +563,7 @@ public class Main extends AdvancedCorePlugin {

 			@Override
 			public String getValue() {
-				if (!Config.getInstance().getVotePartyEnabled()) {
+				if (!SpecialRewardsConfig.getInstance().getVotePartyEnabled()) {
 					return "False";
 				} else {
 					return "True";
@@ -527,11 +574,11 @@ public class Main extends AdvancedCorePlugin {

 			@Override
 			public String getValue() {
-				if (Config.getInstance().getMilestoneVotes().size() == 0) {
+				if (SpecialRewardsConfig.getInstance().getMilestoneVotes().size() == 0) {
 					return "False";
 				} else {
-					for (String milestone : Config.getInstance().getMilestoneVotes()) {
-						if (Config.getInstance().getMilestoneRewardEnabled(Integer.parseInt(milestone))) {
+					for (String milestone : SpecialRewardsConfig.getInstance().getMilestoneVotes()) {
+						if (SpecialRewardsConfig.getInstance().getMilestoneRewardEnabled(Integer.parseInt(milestone))) {
 							return "True";
 						}
 					}
@@ -543,8 +590,8 @@ public class Main extends AdvancedCorePlugin {

 			@Override
 			public String getValue() {
-				if (RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-						Config.getInstance().getAnySiteRewardsPath())) {
+				if (RewardHandler.getInstance().hasRewards(SpecialRewardsConfig.getInstance().getData(),
+						SpecialRewardsConfig.getInstance().getAnySiteRewardsPath())) {
 					return "True";
 				} else {
 					return "False";
@@ -555,11 +602,11 @@ public class Main extends AdvancedCorePlugin {

 			@Override
 			public String getValue() {
-				for (String s : Config.getInstance().getVoteStreakVotes("Day")) {
+				for (String s : SpecialRewardsConfig.getInstance().getVoteStreakVotes("Day")) {

-					if (Config.getInstance().getVoteStreakRewardEnabled("Day", s)
-							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-									Config.getInstance().getVoteStreakRewardsPath("Day", s))) {
+					if (SpecialRewardsConfig.getInstance().getVoteStreakRewardEnabled("Day", s)
+							&& RewardHandler.getInstance().hasRewards(SpecialRewardsConfig.getInstance().getData(),
+									SpecialRewardsConfig.getInstance().getVoteStreakRewardsPath("Day", s))) {
 						return "True";
 					}

@@ -572,11 +619,11 @@ public class Main extends AdvancedCorePlugin {

 			@Override
 			public String getValue() {
-				for (String s : Config.getInstance().getVoteStreakVotes("Week")) {
+				for (String s : SpecialRewardsConfig.getInstance().getVoteStreakVotes("Week")) {

-					if (Config.getInstance().getVoteStreakRewardEnabled("Week", s)
-							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-									Config.getInstance().getVoteStreakRewardsPath("Week", s))) {
+					if (SpecialRewardsConfig.getInstance().getVoteStreakRewardEnabled("Week", s)
+							&& RewardHandler.getInstance().hasRewards(SpecialRewardsConfig.getInstance().getData(),
+									SpecialRewardsConfig.getInstance().getVoteStreakRewardsPath("Week", s))) {
 						return "True";
 					}
 				}
@@ -589,11 +636,11 @@ public class Main extends AdvancedCorePlugin {

 			@Override
 			public String getValue() {
-				for (String s : Config.getInstance().getVoteStreakVotes("Month")) {
+				for (String s : SpecialRewardsConfig.getInstance().getVoteStreakVotes("Month")) {

-					if (Config.getInstance().getVoteStreakRewardEnabled("Month", s)
-							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-									Config.getInstance().getVoteStreakRewardsPath("Month", s))) {
+					if (SpecialRewardsConfig.getInstance().getVoteStreakRewardEnabled("Month", s)
+							&& RewardHandler.getInstance().hasRewards(SpecialRewardsConfig.getInstance().getData(),
+									SpecialRewardsConfig.getInstance().getVoteStreakRewardsPath("Month", s))) {
 						return "True";
 					}
 				}
@@ -747,20 +794,21 @@ public class Main extends AdvancedCorePlugin {

 	@Override
 	public void onPostLoad() {
-		if (Config.getInstance().isUseBungeeCoord()) {
-			registerBungeeChannels();
+		if (BungeeSettings.getInstance().isUseBungeecoord()) {
 			BungeeHandler.getInstance().load();
-			if (Config.getInstance().isUseBungeeCoord()) {
-				if (getOptions().getServer().equalsIgnoreCase("PleaseSet")) {
-					getLogger().warning(
-							"Bungeecoord is true and server name is not set, bungeecoord features may not work");
-				}
+
+			if (getOptions().getServer().equalsIgnoreCase("PleaseSet")) {
+				getLogger()
+						.warning("Bungeecoord is true and server name is not set, bungeecoord features may not work");
 			}
+
 		}

+		getOptions().setServer(BungeeSettings.getInstance().getServer());
+
 		registerCommands();
-		registerEvents();
 		checkVotifier();
+		registerEvents();
 		CheckUpdate.getInstance().startUp();
 		VoteReminding.getInstance().loadRemindChecking();
 		plugin.signs = new ArrayList<SignHandler>();
@@ -792,7 +840,7 @@ public class Main extends AdvancedCorePlugin {
 		AdminGUI.getInstance().loadHook();

 		// vote party
-		if (Config.getInstance().getVotePartyEnabled()) {
+		if (SpecialRewardsConfig.getInstance().getVotePartyEnabled()) {
 			VoteParty.getInstance().check();
 		}
 		VoteParty.getInstance().register();
@@ -822,7 +870,7 @@ public class Main extends AdvancedCorePlugin {
 		}

 		// set columns
-		if (getStorageType().equals(UserStorage.MYSQL)) {
+		if (getStorageType().equals(UserStorage.MYSQL) && Config.getInstance().isAlterColumns()) {
 			getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
 			getMysql().alterColumnType("CheckWorld", "VARCHAR(5)");
 			getMysql().alterColumnType("Reminded", "VARCHAR(5)");
@@ -839,13 +887,13 @@ public class Main extends AdvancedCorePlugin {
 			getMysql().alterColumnType("MonthVoteStreak", "INT DEFAULT '0'");
 			getMysql().alterColumnType("Points", "INT DEFAULT '0'");
 			getMysql().alterColumnType("HighestDailyTotal", "INT DEFAULT '0'");
-			getMysql().alterColumnType("MileStoneTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("AllTimeTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("HighestMonthlyTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("MilestoneCount", "INT DEFAULT '0'");
 			getMysql().alterColumnType("MonthTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
 		}

 		// Add rewards
@@ -963,7 +1011,7 @@ public class Main extends AdvancedCorePlugin {

 		// disable plugin for older versions below 1.12

-		if (NMSManager.getInstance().isVersion("1.7", "1.8", "1.9", "1.10", "1.11", "1.12")) {
+		if (NMSManager.getInstance().isVersion("1.7", "1.8", "1.9", "1.10", "1.11")) {
 			plugin.getLogger().severe("Detected running " + Bukkit.getVersion()
 					+ ", this version is not supported on this build, read the plugin page. Disabling...");
 			if (!Config.getInstance().isOverrideVersionDisable()) {
@@ -989,14 +1037,15 @@ public class Main extends AdvancedCorePlugin {
 	 */
 	@Override
 	public void onUnLoad() {
-		new Timer().schedule(new TimerTask() {
-
-			@Override
-			public void run() {
-				Signs.getInstance().storeSigns();
-			}
-		}, 0);
+		Signs.getInstance().storeSigns();
 		HandlerList.unregisterAll(plugin);
+		if (BungeeSettings.getInstance().isUseBungeecoord()) {
+			try {
+				BungeeHandler.getInstance().close();
+			} catch (Exception e) {
+				debug(e);
+			}
+		}
 		plugin = null;
 	}

@@ -1040,13 +1089,17 @@ public class Main extends AdvancedCorePlugin {
 		PluginManager pm = getServer().getPluginManager();

 		pm.registerEvents(new PlayerJoinEvent(this), this);
-		pm.registerEvents(new VotiferEvent(this), this);
+		if (votifierLoaded) {
+			pm.registerEvents(new VotiferEvent(this), this);
+		}
 		pm.registerEvents(new PlayerVoteListener(this), this);
 		pm.registerEvents(new SignChange(this), this);
 		pm.registerEvents(new BlockBreak(this), this);
 		pm.registerEvents(new PlayerInteract(this), this);
 		pm.registerEvents(new VotingPluginUpdateEvent(this), this);
-		pm.registerEvents(new PlayerCommandSendListener(this), this);
+		if (!NMSManager.getInstance().isVersion("1.12")) {
+			pm.registerEvents(new PlayerCommandSendListener(this), this);
+		}
 		pm.registerEvents(new CoolDownCheck(this), this);

 		plugin.debug("Loaded Events");
@@ -1064,11 +1117,16 @@ public class Main extends AdvancedCorePlugin {
 		config.loadValues();

 		configVoteSites.reloadData();
+
+		specialRewardsConfig.reloadData();
+
+		bungeeSettings.reloadData();
 		checkYMLError();

 		updateAdvancedCoreHook();
 		plugin.loadVoteSites();
 		reloadAdvancedCore();
+		getOptions().setServer(BungeeSettings.getInstance().getServer());
 		PlaceHolders.getInstance().load();
 		CoolDownCheck.getInstance().checkAll();
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
@@ -1088,6 +1146,14 @@ public class Main extends AdvancedCorePlugin {
 		configVoteSites = ConfigVoteSites.getInstance();
 		configVoteSites.setup();

+		specialRewardsConfig = SpecialRewardsConfig.getInstance();
+		specialRewardsConfig.setup();
+		specialRewardsConfig.loadValues();
+
+		bungeeSettings = BungeeSettings.getInstance();
+		bungeeSettings.setup();
+		bungeeSettings.loadValues();
+
 		checkYMLError();

 		plugin.debug("Loaded Files");
@@ -1098,7 +1164,7 @@ public class Main extends AdvancedCorePlugin {
 	 * Update.
 	 */
 	public void update() {
-		if (update || Config.getInstance().isAlwaysUpdate() || Config.getInstance().isUseBungeeCoord()) {
+		if (update || Config.getInstance().isAlwaysUpdate()) {
 			if (!updateStarted && plugin != null) {
 				if (!Config.getInstance().isUpdateWithPlayersOnlineOnly() || Bukkit.getOnlinePlayers().size() != 0) {
 					updateStarted = true;
@@ -1110,7 +1176,7 @@ public class Main extends AdvancedCorePlugin {
 								plugin.debug("MySQL not loaded yet");
 								return;
 							} else if (Config.getInstance().isClearCacheOnUpdate()
-									|| Config.getInstance().isUseBungeeCoord()) {
+									|| BungeeSettings.getInstance().isUseBungeecoord()) {
 								getMysql().clearCache();
 							} else {
 								getMysql().clearCacheBasic();
@@ -1139,12 +1205,10 @@ public class Main extends AdvancedCorePlugin {
 							ServerData.getInstance().updateValues();
 							Signs.getInstance().updateSigns();

-							boolean bungee = Config.getInstance().isUseBungeeCoord();
-							for (Player player : Bukkit.getOnlinePlayers()) {
-								User user = UserManager.getInstance().getVotingPluginUser(player);
-								user.offVote();
-								if (bungee) {
-									user.bungeeVote(false);
+							if (!Config.getInstance().isExtraBackgroundUpdate()) {
+								for (Player player : Bukkit.getOnlinePlayers()) {
+									User user = UserManager.getInstance().getVotingPluginUser(player);
+									user.offVote();
 								}
 							}
 							time1 = ((System.currentTimeMillis() - time) / 1000);
@@ -2,6 +2,7 @@ package com.Ben12345rocks.VotingPlugin.Objects;

 import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.YearMonth;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -21,9 +22,11 @@ import com.Ben12345rocks.AdvancedCore.TimeChecker.TimeChecker;
 import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
+import com.Ben12345rocks.VotingPlugin.BungeeHandler;
 import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Config.BungeeSettings;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
-import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Config.SpecialRewardsConfig;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerReceivePointsEvent;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteCoolDownEndEvent;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
@@ -31,6 +34,7 @@ import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
 import com.Ben12345rocks.VotingPlugin.VoteReminding.VoteReminding;
+import com.Ben12345rocks.VotingPlugin.bungee.BungeeMethod;

 // TODO: Auto-generated Javadoc
 /**
@@ -173,6 +177,62 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		setWeekVoteStreak(getWeekVoteStreak() + 1);
 	}

+	public void bungeeVote(String service) {
+		if (BungeeSettings.getInstance().isUseBungeecoord()) {
+			Main.plugin.debug("Bungee vote for " + getPlayerName() + " on " + service);
+
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
+					true);
+			voteEvent.setBungee(true);
+			voteEvent.setForceBungee(true);
+			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
+				}
+			});
+		}
+	}
+
+	public void bungeeVoteOnline(String service) {
+		if (BungeeSettings.getInstance().isUseBungeecoord()) {
+			Main.plugin.debug("Bungee online vote for " + getPlayerName() + " on " + service);
+
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
+					true);
+			voteEvent.setBungee(true);
+			voteEvent.setForceBungee(false);
+			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
+				}
+			});
+		}
+	}
+
+	public void bungeeVotePluginMessaging(String service, long time) {
+		if (BungeeSettings.getInstance().isUseBungeecoord()) {
+			Main.plugin.debug("Pluginmessaging vote for " + getPlayerName() + " on " + service);
+
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
+					true);
+			voteEvent.setBungee(true);
+			voteEvent.setForceBungee(true);
+			voteEvent.setTime(time);
+			voteEvent.setAddTotals(false);
+			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
+				}
+			});
+		}
+	}
+
 	/**
 	 * Can vote all.
 	 *
@@ -198,16 +258,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return false;
 	}

-	public int getSitesVotedOn() {
-		int amount = 0;
-		for (VoteSite site : plugin.getVoteSites()) {
-			if (!canVoteSite(site)) {
-				amount++;
-			}
-		}
-		return amount;
-	}
-
 	/**
 	 * Can vote site.
 	 *
@@ -217,31 +267,36 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	 */
 	public boolean canVoteSite(VoteSite voteSite) {

-		String siteName = voteSite.getKey();
 		long time = getTime(voteSite);
 		if (time == 0) {
 			return true;
 		}
-		LocalDateTime now = TimeChecker.getInstance().getTime();
-		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault())
-				.plusHours(Main.plugin.getOptions().getTimeHourOffSet());
+		try {
+			LocalDateTime now = TimeChecker.getInstance().getTime();
+			LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault())
+					.plusHours(Main.plugin.getOptions().getTimeHourOffSet());

-		if (!voteSite.isVoteDelayDaily()) {
-			int votedelay = ConfigVoteSites.getInstance().getVoteDelay(siteName);
+			if (!voteSite.isVoteDelayDaily()) {
+				double votedelay = voteSite.getVoteDelay();

-			if (votedelay == 0) {
+				if (votedelay == 0) {
+					return false;
+				}
+
+				LocalDateTime nextvote = lastVote.plusHours((long) votedelay)
+						.plusMinutes((long) voteSite.getVoteDelayMin());
+
+				return now.isAfter(nextvote);
+			} else {
+				if (now.getDayOfYear() != lastVote.getDayOfYear() || now.getYear() != lastVote.getYear()) {
+					return true;
+				}
 				return false;
 			}
-
-			LocalDateTime nextvote = lastVote.plusHours(votedelay);
-
-			return now.isAfter(nextvote);
-		} else {
-			if (now.getDayOfYear() != lastVote.getDayOfYear() || now.getYear() != lastVote.getYear()) {
-				return true;
-			}
-			return false;
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
+		return false;

 	}

@@ -296,8 +351,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {

 	public void checkDayVoteStreak() {
 		if (!voteStreakUpdatedToday(LocalDateTime.now())) {
-			if (!Config.getInstance().isVoteStreakRequirementUsePercentage()
-					|| hasPercentageTotal(TopVoter.Daily, Config.getInstance().getVoteStreakRequirementDay(), null)) {
+			if (!SpecialRewardsConfig.getInstance().isVoteStreakRequirementUsePercentage() || hasPercentageTotal(
+					TopVoter.Daily, SpecialRewardsConfig.getInstance().getVoteStreakRequirementDay(), null)) {
 				addDayVoteStreak();
 				SpecialRewards.getInstance().checkVoteStreak(this, "Day");
 				setDayVoteStreakLastUpdate(System.currentTimeMillis());
@@ -482,6 +537,16 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return getUserData().getInt("Points");
 	}

+	public int getSitesVotedOn() {
+		int amount = 0;
+		for (VoteSite site : plugin.getVoteSites()) {
+			if (!canVoteSite(site)) {
+				amount++;
+			}
+		}
+		return amount;
+	}
+
 	/**
 	 * Gets the time.
 	 *
@@ -531,15 +596,17 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	}

 	public void giveDailyTopVoterAward(int place, String path) {
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getDailyAwardRewardsPath(path))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Daily")
-				.withPlaceHolder("votes", "" + getTotal(TopVoter.Daily)).setOnline(isOnline()).send(this);
+		new RewardBuilder(SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getDailyAwardRewardsPath(path)).withPlaceHolder("place", "" + place)
+						.withPlaceHolder("topvoter", "Daily").withPlaceHolder("votes", "" + getTotal(TopVoter.Daily))
+						.setOnline(isOnline()).send(this);
 	}

 	public void giveMonthlyTopVoterAward(int place, String path) {
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMonthlyAwardRewardsPath(path))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly")
-				.withPlaceHolder("votes", "" + getTotal(TopVoter.Monthly)).setOnline(isOnline()).send(this);
+		new RewardBuilder(SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getMonthlyAwardRewardsPath(path))
+						.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly")
+						.withPlaceHolder("votes", "" + getTotal(TopVoter.Monthly)).setOnline(isOnline()).send(this);
 	}

 	public void giveOfflineOtherRewards() {
@@ -557,7 +624,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				if (StringParser.getInstance().isInt(st)) {
 					int votesRequired = Integer.parseInt(st);
 					if (votesRequired != 0) {
-						if (Config.getInstance().getCumulativeRewardEnabled(votesRequired)) {
+						if (SpecialRewardsConfig.getInstance().getCumulativeRewardEnabled(votesRequired)) {
 							SpecialRewards.getInstance().giveCumulativeVoteReward(this, false, votesRequired);
 						}
 					}
@@ -567,7 +634,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				if (StringParser.getInstance().isInt(st)) {
 					int votesRequired = Integer.parseInt(st);
 					if (votesRequired > 0) {
-						if (Config.getInstance().getMilestoneRewardEnabled(votesRequired)) {
+						if (SpecialRewardsConfig.getInstance().getMilestoneRewardEnabled(votesRequired)) {
 							SpecialRewards.getInstance().giveMilestoneVoteReward(this, true, votesRequired);
 						}
 					}
@@ -578,7 +645,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 					String type = args[1];
 					String st = args[2];

-					if (Config.getInstance().getVoteStreakRewardEnabled(type, st)) {
+					if (SpecialRewardsConfig.getInstance().getVoteStreakRewardEnabled(type, st)) {
 						SpecialRewards.getInstance().giveVoteStreakReward(this, false, type, "" + st, -1);
 					}

@@ -594,50 +661,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	}

 	public void giveWeeklyTopVoterAward(int place, String path) {
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getWeeklyAwardRewardsPath(path))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Weekly")
-				.withPlaceHolder("votes", "" + getTotal(TopVoter.Weekly)).setOnline(isOnline()).send(this);
-	}
-
-	public void bungeeVote() {
-		bungeeVote(true);
-	}
-
-	public void bungeeVote(boolean clearCache) {
-		if (Config.getInstance().isUseBungeeCoord()) {
-			if (clearCache) {
-				Main.plugin.getMysql().clearCache(getUUID());
-			}
-
-			checkBungeeData(getData().getString("Proxy_" + Main.plugin.getOptions().getServer()));
-			getData().setString("Proxy_" + Main.plugin.getOptions().getServer(), "");
-
-			checkBungeeData(getData().getString("Proxy_Online"));
-			getData().setString("Proxy_Online", "");
-		}
-	}
-
-	private void checkBungeeData(String data) {
-		if (!data.isEmpty()) {
-			for (String serviceData : data.split("%line%")) {
-				String[] d = serviceData.split("%time%");
-				if (d.length == 2) {
-					String service = d[0];
-					String time = d[1];
-					PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(),
-							service, false);
-					voteEvent.setBungee(true);
-					voteEvent.setTime(Long.parseLong(time));
-					Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-						@Override
-						public void run() {
-							plugin.getServer().getPluginManager().callEvent(voteEvent);
-						}
-					});
-				}
-			}
-		}
+		new RewardBuilder(SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getWeeklyAwardRewardsPath(path)).withPlaceHolder("place", "" + place)
+						.withPlaceHolder("topvoter", "Weekly").withPlaceHolder("votes", "" + getTotal(TopVoter.Weekly))
+						.setOnline(isOnline()).send(this);
 	}

 	/**
@@ -646,6 +673,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	 * @return true if user got the first vote reward
 	 */
 	public boolean hasGottenFirstVote() {
+		if (BungeeSettings.getInstance().isUseBungeecoord()
+				&& BungeeHandler.getInstance().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
+			return getTotal(TopVoter.AllTime) > 1;
+		}
 		return getTotal(TopVoter.AllTime) != 0;
 	}

@@ -766,8 +797,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	 *            the online
 	 */
 	public void sendVoteEffects(boolean online) {
-		RewardHandler.getInstance().giveReward(this, Config.getInstance().getData(),
-				Config.getInstance().getAnySiteRewardsPath(), new RewardOptions().setOnline(online));
+		RewardHandler.getInstance().giveReward(this, SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getAnySiteRewardsPath(), new RewardOptions().setOnline(online));
 	}

 	@Deprecated
@@ -893,7 +924,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	 *            the new points
 	 */
 	public void setPoints(int value) {
-		getUserData().setInt("Points", value);
+		getUserData().setInt("Points", value, !BungeeSettings.getInstance().isUseBungeecoord());
 	}

 	public void setReminded(boolean reminded) {
@@ -924,8 +955,9 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				break;
 			case Monthly:
 				if (Config.getInstance().isLimitMonthlyVotes()) {
-					int days = TimeChecker.getInstance().getTime().getMonth().maxLength();
-					if (value > days) {
+					LocalDateTime time = TimeChecker.getInstance().getTime();
+					int days = YearMonth.of(time.getYear(), time.getMonth()).lengthOfMonth();
+					if (value >= days * plugin.getVoteSites().size()) {
 						value = days * plugin.getVoteSites().size();
 					}
 				}
@@ -16,11 +16,14 @@ import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
 import com.Ben12345rocks.AdvancedCore.Util.PluginMessage.PluginMessage;
+import com.Ben12345rocks.VotingPlugin.BungeeHandler;
 import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Config.BungeeSettings;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+import com.Ben12345rocks.VotingPlugin.bungee.BungeeMethod;

 import lombok.Getter;
 import lombok.Setter;
@@ -39,7 +42,6 @@ public class VoteSite {
 	/** The plugin. */
 	static Main plugin = Main.plugin;

-	@Getter
 	@Setter
 	private String voteURL;

@@ -59,6 +61,14 @@ public class VoteSite {
 	@Setter
 	private double voteDelay;

+	@Getter
+	@Setter
+	private double voteDelayMin;
+
+	@Getter
+	@Setter
+	private double timeOffSet;
+
 	@Getter
 	@Setter
 	private boolean enabled;
@@ -117,11 +127,27 @@ public class VoteSite {
 	 */
 	public void broadcastVote(User user, boolean checkBungee) {
 		if (!user.isVanished()) {
-			if (checkBungee && Config.getInstance().isBungeeBroadcast()) {
-				PluginMessage.getInstance().sendPluginMessage(PlayerUtils.getInstance().getRandomPlayer(), "Broadcast",
-						getServiceSite(), user.getPlayerName());
+			if (checkBungee && BungeeSettings.getInstance().isBungeeBroadcast()
+					&& BungeeSettings.getInstance().isUseBungeecoord()) {
+				if (BungeeHandler.getInstance().getMethod().equals(BungeeMethod.SOCKETS)) {
+					BungeeHandler.getInstance().sendData("Broadcast", getServiceSite(), user.getPlayerName());
+				} else if (BungeeHandler.getInstance().getMethod().equals(BungeeMethod.MYSQL)
+						|| BungeeHandler.getInstance().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
+					String uuid = user.getUUID();
+					String service = getServiceSite();
+
+					if (Bukkit.getOnlinePlayers().size() > 0) {
+						PluginMessage.getInstance().sendPluginMessage(PlayerUtils.getInstance().getRandomOnlinePlayer(),
+								"VoteBroadcast", uuid, service);
+					}
+				}
+
 			} else {
 				String playerName = user.getPlayerName();
+				if (config.getVotingBroadcastBlacklist().contains(playerName)) {
+					plugin.getLogger().info("Not broadcasting for " + playerName + ", in blacklist");
+					return;
+				}
 				String bc = StringParser.getInstance().colorize(config.getFormatBroadCastMsg());
 				HashMap<String, String> placeholders = new HashMap<String, String>();
 				placeholders.put("player", playerName);
@@ -130,6 +156,7 @@ public class VoteSite {
 				placeholders.put("sitename", getDisplayName());
 				placeholders.put("servicesite", getServiceSite());
 				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()) {
@@ -161,6 +188,21 @@ public class VoteSite {
 		return configVoteSites.getData(key);
 	}

+	public String getVoteURL() {
+		return getVoteURL(true);
+	}
+
+	public String getVoteURL(boolean json) {
+		if (!Config.getInstance().isFormatCommandsVoteForceLinks() || !json) {
+			return voteURL;
+		} else {
+			if (!voteURL.startsWith("http")) {
+				return "[Text=\"" + voteURL + "\",url=\"http://" + voteURL + "\"]";
+			}
+			return "[Text=\"" + voteURL + "\",url=\"" + voteURL + "\"]";
+		}
+	}
+
 	public void giveRewards(User user, boolean online, boolean bungee) {
 		new RewardBuilder(configVoteSites.getData(), configVoteSites.getRewardsPath(key)).setOnline(online)
 				.withPlaceHolder("ServiceSite", getServiceSite()).withPlaceHolder("SiteName", getDisplayName())
@@ -184,6 +226,7 @@ public class VoteSite {
 		setVoteURL(configVoteSites.getVoteURL(key));
 		setServiceSite(configVoteSites.getServiceSite(key));
 		setVoteDelay(configVoteSites.getVoteDelay(key));
+		setVoteDelayMin(configVoteSites.getVoteDelayMin(key));
 		setEnabled(configVoteSites.getVoteSiteEnabled(key));
 		setPriority(configVoteSites.getPriority(key));
 		displayName = configVoteSites.getDisplayName(key);
@@ -194,6 +237,7 @@ public class VoteSite {
 		voteDelayDaily = configVoteSites.getVoteSiteResetVoteDelayDaily(key);
 		giveOffline = configVoteSites.getVoteSiteGiveOffline(key);
 		waitUntilVoteDelay = configVoteSites.getWaitUntilVoteDelay(key);
+		timeOffSet = configVoteSites.getTimeOffSet(key);
 	}

 	public boolean isVaidServiceSite() {
@@ -11,6 +11,7 @@ import org.bukkit.block.Sign;
 import org.bukkit.block.Skull;
 import org.bukkit.block.data.Directional;

+import com.Ben12345rocks.AdvancedCore.NMSManager.NMSManager;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -86,10 +87,6 @@ public class SignHandler {
 		return false;
 	}

-	public boolean isSkullSet() {
-		return skullLocation != null;
-	}
-
 	/**
 	 * Check skulls.
 	 */
@@ -151,6 +148,10 @@ public class SignHandler {
 		return loc.equals(getLocation());
 	}

+	public boolean isSkullSet() {
+		return skullLocation != null;
+	}
+
 	/**
 	 * Removes the sign.
 	 */
@@ -259,19 +260,21 @@ public class SignHandler {
 	}

 	public void updateSkulls(Location loc1, Location loc2) {
-		BlockState state = getLocation().getBlock().getState();
-		if (state instanceof Sign && state.getBlockData() instanceof Directional) {
-			Directional s = (Directional) state.getBlockData();
-			Block b = location.getBlock().getRelative(s.getFacing());
-			Block above = b.getRelative(BlockFace.UP);
-			if (checkSkull(above)) {
-				return;
+		if (!NMSManager.getInstance().isVersion("1.12")) {
+			BlockState state = getLocation().getBlock().getState();
+			if (state instanceof Sign && state.getBlockData() instanceof Directional) {
+				Directional s = (Directional) state.getBlockData();
+				Block b = location.getBlock().getRelative(s.getFacing());
+				Block above = b.getRelative(BlockFace.UP);
+				if (checkSkull(above)) {
+					return;
+				}
+
 			}

-		}
-
-		for (Block block : MiscUtils.getInstance().getRegionBlocks(location.getWorld(), loc1, loc2)) {
-			checkSkull(block);
+			for (Block block : MiscUtils.getInstance().getRegionBlocks(location.getWorld(), loc1, loc2)) {
+				checkSkull(block);
+			}
 		}
 	}
 }
@@ -90,7 +90,8 @@ public class Signs {
 		int time = 0;
 		for (int i = plugin.getSigns().size() - 1; i >= 0; i--) {
 			if (!plugin.getSigns().get(i).isValid()) {
-				plugin.debug("Sign " + i + " invalid, removing from data.");
+				plugin.debug("Sign " + i + " invalid, removing from data: "
+						+ plugin.getSigns().get(i).getLocation().toString());
 				plugin.getSigns().get(i).removeSign();
 				plugin.getSigns().remove(i);
 			} else {
@@ -1,5 +1,6 @@
 package com.Ben12345rocks.VotingPlugin.SpecialRewards;

+import java.util.ArrayList;
 import java.util.Set;

 import org.bukkit.Bukkit;
@@ -11,6 +12,7 @@ import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Config.SpecialRewardsConfig;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerSpecialRewardEvent;
 import com.Ben12345rocks.VotingPlugin.Events.SpecialRewardType;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
@@ -83,19 +85,21 @@ public class SpecialRewards {
 	 */
 	public boolean checkCumualativeVotes(User user) {
 		boolean gotCumulative = false;
-		Set<String> votes = Config.getInstance().getCumulativeVotes();
+		Set<String> votes = SpecialRewardsConfig.getInstance().getCumulativeVotes();
 		for (String vote : votes) {
 			if (StringParser.getInstance().isInt(vote)) {
 				int votesRequired = Integer.parseInt(vote);
 				if (votesRequired != 0) {
-					if (Config.getInstance().getCumulativeRewardEnabled(votesRequired)
-							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-									Config.getInstance().getCumulativeRewardsPath(votesRequired))) {
+					if (SpecialRewardsConfig.getInstance().getCumulativeRewardEnabled(votesRequired)
+							&& RewardHandler.getInstance().hasRewards(SpecialRewardsConfig.getInstance().getData(),
+									SpecialRewardsConfig.getInstance().getCumulativeRewardsPath(votesRequired))) {
 						int total = 0;
-						if (Config.getInstance().getCumulativeVotesInSameDay(votesRequired)) {
+						if (SpecialRewardsConfig.getInstance().getCumulativeVotesInSameDay(votesRequired)) {
 							total = user.getTotal(TopVoter.Daily);
-						} else if (Config.getInstance().getCumulativeVotesInSameWeek(votesRequired)) {
+						} else if (SpecialRewardsConfig.getInstance().getCumulativeVotesInSameWeek(votesRequired)) {
 							total = user.getTotal(TopVoter.Weekly);
+						} else if (SpecialRewardsConfig.getInstance().getCumulativeVotesInSameMonth(votesRequired)) {
+							total = user.getTotal(TopVoter.Monthly);
 						} else {
 							total = user.getTotal(TopVoter.AllTime);
 						}
@@ -125,8 +129,8 @@ public class SpecialRewards {
 	 * @return true, if successful
 	 */
 	public boolean checkFirstVote(User user) {
-		if (RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-				Config.getInstance().getFirstVoteRewardsPath())) {
+		if (RewardHandler.getInstance().hasRewards(SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getFirstVoteRewardsPath())) {
 			if (!user.hasGottenFirstVote()) {
 				giveFirstVoteRewards(user, user.isOnline());
 				return true;
@@ -144,15 +148,40 @@ public class SpecialRewards {
 	 * @return true, if successful
 	 */
 	public boolean checkMilestone(User user) {
+		if (Config.getInstance().isPreventRepeatMilestones()) {
+			ArrayList<Integer> nums = new ArrayList<Integer>();
+
+			for (String str : SpecialRewardsConfig.getInstance().getMilestoneVotes()) {
+				try {
+					nums.add(Integer.parseInt(str));
+				} catch (Exception e) {
+					plugin.getLogger().warning("Failed to get number from " + str);
+				}
+			}
+
+			int milestoneCount = user.getMilestoneCount();
+			for (int num : nums) {
+				if (milestoneCount >= num) {
+					if (!user.hasGottenMilestone(num)) {
+						plugin.getLogger().info("Milestone " + 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);
+					}
+				}
+			}
+		}
+
 		boolean gotMilestone = false;
-		Set<String> votes = Config.getInstance().getMilestoneVotes();
+		Set<String> votes = SpecialRewardsConfig.getInstance().getMilestoneVotes();
 		for (String vote : votes) {
 			if (StringParser.getInstance().isInt(vote)) {
 				int votesRequired = Integer.parseInt(vote);
 				if (votesRequired != 0) {
-					if (Config.getInstance().getMilestoneRewardEnabled(votesRequired)
-							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-									Config.getInstance().getMilestoneRewardsPath(votesRequired))) {
+					if (SpecialRewardsConfig.getInstance().getMilestoneRewardEnabled(votesRequired)
+							&& RewardHandler.getInstance().hasRewards(SpecialRewardsConfig.getInstance().getData(),
+									SpecialRewardsConfig.getInstance().getMilestoneRewardsPath(votesRequired))) {

 						int userVotesTotal = user.getMilestoneCount();
 						if (userVotesTotal >= votesRequired && !user.hasGottenMilestone(votesRequired)) {
@@ -173,7 +202,7 @@ public class SpecialRewards {
 	public boolean checkVoteStreak(User user, String type) {
 		boolean gotReward = false;

-		Set<String> streaks = Config.getInstance().getVoteStreakVotes(type);
+		Set<String> streaks = SpecialRewardsConfig.getInstance().getVoteStreakVotes(type);
 		for (String streak : streaks) {
 			String s = streak.replaceAll("-", "");
 			boolean multiple = false;
@@ -184,9 +213,9 @@ public class SpecialRewards {
 			if (StringParser.getInstance().isInt(s)) {
 				int streakRequired = Integer.parseInt(s);
 				if (streakRequired != 0) {
-					if (Config.getInstance().getVoteStreakRewardEnabled(type, streak)
-							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-									Config.getInstance().getVoteStreakRewardsPath(type, "" + streak))) {
+					if (SpecialRewardsConfig.getInstance().getVoteStreakRewardEnabled(type, streak)
+							&& RewardHandler.getInstance().hasRewards(SpecialRewardsConfig.getInstance().getData(),
+									SpecialRewardsConfig.getInstance().getVoteStreakRewardsPath(type, "" + streak))) {
 						int curStreak = 0;
 						if (type.equalsIgnoreCase("day")) {
 							curStreak = user.getDayVoteStreak();
@@ -235,8 +264,8 @@ public class SpecialRewards {
 		if (event.isCancelled()) {
 			return;
 		}
-		RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-				Config.getInstance().getAllSitesRewardPath(), new RewardOptions().setOnline(online));
+		RewardHandler.getInstance().giveReward(user, SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getAllSitesRewardPath(), new RewardOptions().setOnline(online));
 	}

 	/**
@@ -258,8 +287,9 @@ public class SpecialRewards {
 			return;
 		}

-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getCumulativeRewardsPath(cumulative))
-				.setOnline(online).withPlaceHolder("Cumulative", "" + cumulative).send(user);
+		new RewardBuilder(SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getCumulativeRewardsPath(cumulative)).setOnline(online)
+						.withPlaceHolder("Cumulative", "" + cumulative).send(user);
 	}

 	/**
@@ -277,8 +307,8 @@ public class SpecialRewards {
 		if (event.isCancelled()) {
 			return;
 		}
-		RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-				Config.getInstance().getFirstVoteRewardsPath(), new RewardOptions().setOnline(online));
+		RewardHandler.getInstance().giveReward(user, SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getFirstVoteRewardsPath(), new RewardOptions().setOnline(online));
 	}

 	/**
@@ -299,8 +329,9 @@ public class SpecialRewards {
 		if (event.isCancelled()) {
 			return;
 		}
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMilestoneRewardsPath(milestone))
-				.setOnline(online).withPlaceHolder("Milestone", "" + milestone).send(user);
+		new RewardBuilder(SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getMilestoneRewardsPath(milestone)).setOnline(online)
+						.withPlaceHolder("Milestone", "" + milestone).send(user);
 	}

 	public void giveVoteStreakReward(User user, boolean online, String type, String string, int votes) {
@@ -311,8 +342,9 @@ public class SpecialRewards {
 		if (event.isCancelled()) {
 			return;
 		}
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getVoteStreakRewardsPath(type, string))
-				.setOnline(online).withPlaceHolder("Type", type).withPlaceHolder("Streak", "" + votes).send(user);
+		new RewardBuilder(SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getVoteStreakRewardsPath(type, string)).setOnline(online)
+						.withPlaceHolder("Type", type).withPlaceHolder("Streak", "" + votes).send(user);
 	}

 }
@@ -15,6 +15,10 @@ public enum TopVoter {
 		return AllTime;
 	}

+	public static TopVoter[] valuesMinusAllTime() {
+		return new TopVoter[] { TopVoter.Daily, TopVoter.Weekly, TopVoter.Monthly };
+	}
+
 	public static TopVoter getTopVoter(String str) {
 		for (TopVoter value : values()) {
 			if (value.toString().equalsIgnoreCase(str)) {
@@ -27,6 +27,7 @@ import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.YML.YMLFileHandler;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
+import com.Ben12345rocks.VotingPlugin.Config.SpecialRewardsConfig;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
@@ -125,106 +126,140 @@ public class TopVoterHandler implements Listener {

 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onDayChange(DayChangeEvent event) {
-		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (!user.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
-				if (user.getDayVoteStreak() != 0) {
-					user.setDayVoteStreak(0);
+		synchronized (Main.plugin) {
+			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				if (!user.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
+					if (user.getDayVoteStreak() != 0) {
+						user.setDayVoteStreak(0);
+					}
+				}
+
+				if (user.getHighestDailyTotal() < user.getTotal(TopVoter.Daily)) {
+					user.setHighestDailyTotal(user.getTotal(TopVoter.Daily));
+				}
+				for (String shopIdent : Config.getInstance().getIdentifiers()) {
+					if (Config.getInstance().getVoteShopResetDaily(shopIdent)) {
+						user.setVoteShopIdentifierLimit(shopIdent, 0);
+					}
 				}
 			}

-			if (user.getHighestDailyTotal() < user.getTotal(TopVoter.Daily)) {
-				user.setHighestDailyTotal(user.getTotal(TopVoter.Daily));
+			if (Config.getInstance().getStoreTopVotersDaily()) {
+				plugin.getLogger().info("Saving TopVoters Daily");
+				storeTopVoters(TopVoter.Daily);
 			}
-		}

-		if (Config.getInstance().getStoreTopVotersDaily()) {
-			plugin.getLogger().info("Saving TopVoters Daily");
-			storeTopVoters(TopVoter.Daily);
-		}
-
-		if (Config.getInstance().isEnableDailyRewards()) {
-			HashMap<Integer, String> places = handlePlaces(Config.getInstance().getDailyPossibleRewardPlaces());
-			int i = 0;
-			int lastTotal = -1;
-			for (User user : plugin.getTopVoter(TopVoter.Daily).keySet()) {
-				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					if (Config.getInstance().getTopVoterAwardsTies()) {
-						if (user.getTotal(TopVoter.Daily) != lastTotal) {
-							i++;
+			try {
+				if (SpecialRewardsConfig.getInstance().isEnableDailyRewards()) {
+					HashMap<Integer, String> places = handlePlaces(
+							SpecialRewardsConfig.getInstance().getDailyPossibleRewardPlaces());
+					int i = 0;
+					int lastTotal = -1;
+					@SuppressWarnings("unchecked")
+					LinkedHashMap<User, Integer> clone = (LinkedHashMap<User, Integer>) plugin
+							.getTopVoter(TopVoter.Daily).clone();
+					for (User user : clone.keySet()) {
+						if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
+							if (Config.getInstance().getTopVoterAwardsTies()) {
+								if (user.getTotal(TopVoter.Daily) != lastTotal) {
+									i++;
+								}
+							} else {
+								i++;
+							}
+							if (places.containsKey(i)) {
+								user.giveDailyTopVoterAward(i, places.get(i));
+							}
 						}
-					} else {
-						i++;
-					}
-					if (places.containsKey(i)) {
-						user.giveDailyTopVoterAward(i, places.get(i));
+						lastTotal = user.getTotal(TopVoter.Daily);
 					}
 				}
-				lastTotal = user.getTotal(TopVoter.Daily);
+			} catch (Exception e) {
+				e.printStackTrace();
 			}
-		}
-		resetTotals(TopVoter.Daily);

+			resetTotals(TopVoter.Daily);
+		}
 	}

 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onMonthChange(MonthChangeEvent event) {
-		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getTotal(TopVoter.Monthly) == 0 && user.getMonthVoteStreak() != 0) {
-				user.setMonthVoteStreak(0);
-			} else {
-				if (!Config.getInstance().isVoteStreakRequirementUsePercentage() || user.hasPercentageTotal(
-						TopVoter.Monthly, Config.getInstance().getVoteStreakRequirementMonth(),
-						LocalDateTime.now().minusDays(1))) {
-					user.addMonthVoteStreak();
-					SpecialRewards.getInstance().checkVoteStreak(user, "Month");
-				}
-			}
-
-			user.setLastMonthTotal(user.getTotal(TopVoter.Monthly));
-
-			if (user.getHighestMonthlyTotal() < user.getTotal(TopVoter.Monthly)) {
-				user.setHighestMonthlyTotal(user.getTotal(TopVoter.Monthly));
-			}
-		}
-
-		if (Config.getInstance().getStoreTopVotersMonthly()) {
-			plugin.getLogger().info("Saving TopVoters Monthly");
-			storeTopVoters(TopVoter.Monthly);
-		}
-
-		if (Config.getInstance().isEnableMonthlyAwards()) {
-			HashMap<Integer, String> places = handlePlaces(Config.getInstance().getMonthlyPossibleRewardPlaces());
-			int i = 0;
-			int lastTotal = -1;
-			for (User user : plugin.getTopVoter(TopVoter.Monthly).keySet()) {
-
-				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					if (Config.getInstance().getTopVoterAwardsTies()) {
-						if (user.getTotal(TopVoter.Monthly) != lastTotal) {
-							i++;
-						}
-					} else {
-						i++;
-					}
-					if (places.containsKey(i)) {
-						user.giveMonthlyTopVoterAward(i, places.get(i));
-					}
-				}
-				lastTotal = user.getTotal(TopVoter.Monthly);
-			}
-		}
-
-		resetTotals(TopVoter.Monthly);
-
-		if (Config.getInstance().getResetMilestonesMonthly()) {
+		synchronized (Main.plugin) {
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				user.setMilestoneCount(0);
-				user.setHasGottenMilestone(new HashMap<String, Boolean>());
+				if (user.getTotal(TopVoter.Monthly) == 0 && user.getMonthVoteStreak() != 0) {
+					user.setMonthVoteStreak(0);
+				} else {
+					if (!SpecialRewardsConfig.getInstance().isVoteStreakRequirementUsePercentage()
+							|| user.hasPercentageTotal(TopVoter.Monthly,
+									SpecialRewardsConfig.getInstance().getVoteStreakRequirementMonth(),
+									LocalDateTime.now().minusDays(1))) {
+						user.addMonthVoteStreak();
+						SpecialRewards.getInstance().checkVoteStreak(user, "Month");
+					}
+				}
+
+				for (String shopIdent : Config.getInstance().getIdentifiers()) {
+					if (Config.getInstance().getVoteShopResetMonthly(shopIdent)) {
+						user.setVoteShopIdentifierLimit(shopIdent, 0);
+					}
+				}
+
+				user.setLastMonthTotal(user.getTotal(TopVoter.Monthly));
+
+				if (user.getHighestMonthlyTotal() < user.getTotal(TopVoter.Monthly)) {
+					user.setHighestMonthlyTotal(user.getTotal(TopVoter.Monthly));
+				}
 			}

+			if (Config.getInstance().getStoreTopVotersMonthly()) {
+				plugin.getLogger().info("Saving TopVoters Monthly");
+				storeTopVoters(TopVoter.Monthly);
+			}
+
+			try {
+				if (SpecialRewardsConfig.getInstance().isEnableMonthlyAwards()) {
+					HashMap<Integer, String> places = handlePlaces(
+							SpecialRewardsConfig.getInstance().getMonthlyPossibleRewardPlaces());
+					int i = 0;
+					int lastTotal = -1;
+
+					@SuppressWarnings("unchecked")
+					LinkedHashMap<User, Integer> clone = (LinkedHashMap<User, Integer>) plugin
+							.getTopVoter(TopVoter.Monthly).clone();
+					for (User user : clone.keySet()) {
+
+						if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
+							if (Config.getInstance().getTopVoterAwardsTies()) {
+								if (user.getTotal(TopVoter.Monthly) != lastTotal) {
+									i++;
+								}
+							} else {
+								i++;
+							}
+							if (places.containsKey(i)) {
+								user.giveMonthlyTopVoterAward(i, places.get(i));
+							}
+						}
+						lastTotal = user.getTotal(TopVoter.Monthly);
+					}
+
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			resetTotals(TopVoter.Monthly);
+
+			if (SpecialRewardsConfig.getInstance().getResetMilestonesMonthly()) {
+				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+					User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+					user.setMilestoneCount(0);
+					user.setHasGottenMilestone(new HashMap<String, Boolean>());
+				}
+
+			}
 		}
 	}

@@ -236,50 +271,66 @@ public class TopVoterHandler implements Listener {

 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onWeekChange(WeekChangeEvent event) {
-		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getTotal(TopVoter.Weekly) == 0 && user.getWeekVoteStreak() != 0) {
-				user.setWeekVoteStreak(0);
-			} else {
-				if (!Config.getInstance().isVoteStreakRequirementUsePercentage() || user.hasPercentageTotal(
-						TopVoter.Weekly, Config.getInstance().getVoteStreakRequirementWeek(), null)) {
-					user.addWeekVoteStreak();
-					SpecialRewards.getInstance().checkVoteStreak(user, "Week");
+		synchronized (Main.plugin) {
+			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				if (user.getTotal(TopVoter.Weekly) == 0 && user.getWeekVoteStreak() != 0) {
+					user.setWeekVoteStreak(0);
+				} else {
+					if (!SpecialRewardsConfig.getInstance().isVoteStreakRequirementUsePercentage()
+							|| user.hasPercentageTotal(TopVoter.Weekly,
+									SpecialRewardsConfig.getInstance().getVoteStreakRequirementWeek(), null)) {
+						user.addWeekVoteStreak();
+						SpecialRewards.getInstance().checkVoteStreak(user, "Week");
+					}
+				}
+
+				for (String shopIdent : Config.getInstance().getIdentifiers()) {
+					if (Config.getInstance().getVoteShopResetWeekly(shopIdent)) {
+						user.setVoteShopIdentifierLimit(shopIdent, 0);
+					}
+				}
+
+				if (user.getHighestWeeklyTotal() < user.getTotal(TopVoter.Weekly)) {
+					user.setHighestWeeklyTotal(user.getTotal(TopVoter.Weekly));
 				}
 			}

-			if (user.getHighestWeeklyTotal() < user.getTotal(TopVoter.Weekly)) {
-				user.setHighestWeeklyTotal(user.getTotal(TopVoter.Weekly));
+			if (Config.getInstance().getStoreTopVotersWeekly()) {
+				plugin.getLogger().info("Saving TopVoters Weekly");
+				storeTopVoters(TopVoter.Weekly);
 			}
-		}

-		if (Config.getInstance().getStoreTopVotersWeekly()) {
-			plugin.getLogger().info("Saving TopVoters Weekly");
-			storeTopVoters(TopVoter.Weekly);
-		}
-
-		if (Config.getInstance().isEnableWeeklyAwards()) {
-			HashMap<Integer, String> places = handlePlaces(Config.getInstance().getWeeklyPossibleRewardPlaces());
-			int i = 0;
-			int lastTotal = -1;
-			for (User user : plugin.getTopVoter(TopVoter.Weekly).keySet()) {
-				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					if (Config.getInstance().getTopVoterAwardsTies()) {
-						if (user.getTotal(TopVoter.Weekly) != lastTotal) {
-							i++;
+			try {
+				if (SpecialRewardsConfig.getInstance().isEnableWeeklyAwards()) {
+					HashMap<Integer, String> places = handlePlaces(
+							SpecialRewardsConfig.getInstance().getWeeklyPossibleRewardPlaces());
+					int i = 0;
+					int lastTotal = -1;
+					@SuppressWarnings("unchecked")
+					LinkedHashMap<User, Integer> clone = (LinkedHashMap<User, Integer>) plugin
+							.getTopVoter(TopVoter.Weekly).clone();
+					for (User user : clone.keySet()) {
+						if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
+							if (Config.getInstance().getTopVoterAwardsTies()) {
+								if (user.getTotal(TopVoter.Weekly) != lastTotal) {
+									i++;
+								}
+							} else {
+								i++;
+							}
+							if (places.containsKey(i)) {
+								user.giveWeeklyTopVoterAward(i, places.get(i));
+							}
 						}
-					} else {
-						i++;
-					}
-					if (places.containsKey(i)) {
-						user.giveWeeklyTopVoterAward(i, places.get(i));
+						lastTotal = user.getTotal(TopVoter.Weekly);
 					}
 				}
-				lastTotal = user.getTotal(TopVoter.Weekly);
+			} catch (Exception e) {
+				e.printStackTrace();
 			}
+			resetTotals(TopVoter.Weekly);
 		}
-		resetTotals(TopVoter.Weekly);
-
 	}

 	public void register() {
@@ -602,16 +653,32 @@ public class TopVoterHandler implements Listener {
 			}
 		}

+		plugin.debug("Number of users to check top voter: " + users.size());
+
 		for (TopVoter top : TopVoter.values()) {
-			plugin.getTopVoter(top).clear();
 			if (Config.getInstance().getLoadTopVoter(top)) {
+				LinkedHashMap<User, Integer> map = new LinkedHashMap<User, Integer>();
+
 				for (User user : users) {
 					int total = user.getTotal(top);
 					if (total > 0) {
-						plugin.getTopVoter(top).put(user, total);
+						map.put(user, total);
 					}
 				}
-				plugin.getTopVoter().put(top, sortByValues(plugin.getTopVoter(top), false));
+
+				map = sortByValues(map, false);
+				int limitSize = Config.getInstance().getMaxiumNumberOfTopVotersToLoad();
+				if (limitSize > 0) {
+					ArrayList<User> listKeys = new ArrayList<User>(map.keySet());
+					if (listKeys.size() > limitSize) {
+						for (int i = listKeys.size() - 1; i >= 0 && i >= limitSize; i--) {
+							map.remove(listKeys.get(i));
+						}
+					}
+
+				}
+				plugin.getTopVoter(top).clear();
+				plugin.getTopVoter().put(top, map);
 				plugin.debug(top.toString() + " TopVoter loaded");
 			}
 		}
@@ -1,6 +1,9 @@
 package com.Ben12345rocks.VotingPlugin.Util.PlaceHolders;

+import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map.Entry;

 import org.bukkit.OfflinePlayer;
@@ -63,7 +66,9 @@ public class PlaceHolders {
 	}

 	public String getPlaceHolder(OfflinePlayer p, String identifier) {
-		identifier = StringParser.getInstance().replaceJavascript(p, identifier);
+		if (Config.getInstance().isUseJavascriptPlaceholders()) {
+			identifier = StringParser.getInstance().replaceJavascript(p, identifier);
+		}

 		for (PlaceHolder<User> placeholder : nonPlayerPlaceholders) {
 			if (placeholder.matches(identifier)) {
@@ -83,7 +88,9 @@ public class PlaceHolders {
 	}

 	public String getPlaceHolder(Player p, String identifier) {
-		identifier = StringParser.getInstance().replaceJavascript(p, identifier);
+		if (Config.getInstance().isUseJavascriptPlaceholders()) {
+			identifier = StringParser.getInstance().replaceJavascript(p, identifier);
+		}
 		return getPlaceHolder((OfflinePlayer) p, identifier);
 	}

@@ -236,6 +243,15 @@ public class PlaceHolders {
 			}
 		}.withDescription("User points"));

+		placeholders.add(new PlaceHolder<User>("Points_Format") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);
+				return numberFormat.format(user.getPoints());
+			}
+		}.withDescription("User points"));
+
 		placeholders.add(new PlaceHolder<User>("CanVote") {

 			@Override
@@ -244,6 +260,35 @@ public class PlaceHolders {
 			}
 		}.withDescription("Return true/false if player can vote on all sites"));

+		placeholders.add(new PlaceHolder<User>("Next_AnySite") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				if (user.canVoteAny()) {
+					return Config.getInstance().getFormatCommandsVoteNextInfoCanVote();
+				}
+				long smallest = -1;
+				HashMap<Long, VoteSite> times = new HashMap<Long, VoteSite>();
+				for (VoteSite site : plugin.getVoteSites()) {
+					long t = Commands.getInstance().voteNextDurationTime(user, site);
+					if (smallest == -1) {
+						smallest = t;
+					}
+					if (t < smallest) {
+						smallest = t;
+					}
+					times.put(t, site);
+				}
+				for (Entry<Long, VoteSite> entry : times.entrySet()) {
+					if (entry.getKey().longValue() == smallest) {
+						return Commands.getInstance().voteCommandNextInfo(user, entry.getValue());
+					}
+				}
+
+				return "Error";
+			}
+		}.withDescription("How long until user can vote on anysite"));
+
 		for (final VoteSite voteSite : plugin.getVoteSites()) {
 			placeholders.add(new PlaceHolder<User>("Next_" + voteSite.getKey()) {

@@ -18,6 +18,7 @@ import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
+import com.Ben12345rocks.VotingPlugin.Config.SpecialRewardsConfig;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
 import com.Ben12345rocks.VotingPlugin.Events.VotePartyEvent;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
@@ -95,12 +96,12 @@ public class VoteParty implements Listener {
 			if (event.isCancelled()) {
 				return;
 			}
-			MiscUtils.getInstance().broadcast(Config.getInstance().getVotePartyBroadcast());
+			MiscUtils.getInstance().broadcast(SpecialRewardsConfig.getInstance().getVotePartyBroadcast());
 			giveRewards();

-			if (Config.getInstance().getVotePartyIncreaseVotesRquired() > 0) {
+			if (SpecialRewardsConfig.getInstance().getVotePartyIncreaseVotesRquired() > 0) {
 				ServerData.getInstance().setVotePartyExtraRequired(ServerData.getInstance().getVotePartyExtraRequired()
-						+ Config.getInstance().getVotePartyIncreaseVotesRquired());
+						+ SpecialRewardsConfig.getInstance().getVotePartyIncreaseVotesRquired());
 			}
 		}

@@ -113,7 +114,7 @@ public class VoteParty implements Listener {
 	 *            the sender
 	 */
 	public void commandVoteParty(CommandSender sender) {
-		if (Config.getInstance().getVotePartyEnabled()) {
+		if (SpecialRewardsConfig.getInstance().getVotePartyEnabled()) {
 			ArrayList<String> msg = Config.getInstance().getFormatCommandsVoteParty();
 			int votesRequired = getVotesRequired();
 			int votes = getTotalVotes();
@@ -165,7 +166,7 @@ public class VoteParty implements Listener {
 	}

 	public int getVotesRequired() {
-		int required = Config.getInstance().getVotePartyVotesRequired();
+		int required = SpecialRewardsConfig.getInstance().getVotePartyVotesRequired();
 		int extra = ServerData.getInstance().getVotePartyExtraRequired();
 		if (extra > 0) {
 			return required + extra;
@@ -174,8 +175,8 @@ public class VoteParty implements Listener {
 	}

 	public void giveReward(User user) {
-		if (Config.getInstance().getVotePartyUserVotesRequired() > 0) {
-			if (user.getVotePartyVotes() < Config.getInstance().getVotePartyUserVotesRequired()) {
+		if (SpecialRewardsConfig.getInstance().getVotePartyUserVotesRequired() > 0) {
+			if (user.getVotePartyVotes() < SpecialRewardsConfig.getInstance().getVotePartyUserVotesRequired()) {
 				return;
 			}
 		}
@@ -183,16 +184,18 @@ public class VoteParty implements Listener {
 	}

 	public void giveReward(User user, boolean online) {
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getVotePartyRewardsPath())
-				.setOnline(online)
-				.withPlaceHolder("VotesRequired", "" + Config.getInstance().getVotePartyVotesRequired()).send(user);
+		new RewardBuilder(SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getVotePartyRewardsPath()).setOnline(online)
+						.withPlaceHolder("VotesRequired",
+								"" + SpecialRewardsConfig.getInstance().getVotePartyVotesRequired())
+						.send(user);
 	}

 	/**
 	 * Give rewards.
 	 */
 	public void giveRewards() {
-		for (final String cmd : Config.getInstance().getVotePartyCommands()) {
+		for (final String cmd : SpecialRewardsConfig.getInstance().getVotePartyCommands()) {
 			Bukkit.getScheduler().runTask(plugin, new Runnable() {

 				@Override
@@ -203,13 +206,14 @@ public class VoteParty implements Listener {
 			});
 		}

-		if (Config.getInstance().getVotePartyGiveAllPlayers()) {
-			plugin.debug("Giving all players vote party");
+		if (SpecialRewardsConfig.getInstance().getVotePartyGiveAllPlayers()) {
+			plugin.debug("Trying to give all players vote party");
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
 				giveReward(user);
 			}
 		} else {
+			plugin.debug("Trying to give all online players vote party");
 			plugin.debug(ArrayUtils.getInstance().makeStringList(getVotedUsers()));
 			for (String uuid : getVotedUsers()) {
 				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
@@ -221,16 +225,20 @@ public class VoteParty implements Listener {

 	@EventHandler
 	public void onDayChange(DayChangeEvent event) {
-		if (Config.getInstance().getVotePartyResetEachDay()) {
+		if (SpecialRewardsConfig.getInstance().getVotePartyResetEachDay()) {
 			reset();
 		}
 	}

 	@EventHandler
 	public void onMonthChange(MonthChangeEvent event) {
-		if (Config.getInstance().getVotePartyResetMontly()) {
+		if (SpecialRewardsConfig.getInstance().getVotePartyResetMontly()) {
 			reset();
 		}
+
+		if (SpecialRewardsConfig.getInstance().isVotePartyResetExtraVotesMonthly()) {
+			ServerData.getInstance().setVotePartyExtraRequired(0);
+		}
 	}

 	public void register() {
@@ -272,8 +280,8 @@ public class VoteParty implements Listener {
 	}

 	public synchronized void vote(User user, boolean realVote) {
-		if (Config.getInstance().getVotePartyEnabled()) {
-			if (Config.getInstance().getVotePartyCountFakeVotes() || realVote) {
+		if (SpecialRewardsConfig.getInstance().getVotePartyEnabled()) {
+			if (SpecialRewardsConfig.getInstance().getVotePartyCountFakeVotes() || realVote) {
 				addTotal(user);
 				addVotePlayer(user);
 				check();
@@ -58,7 +58,7 @@ public class VoteReminding {

 		if (PlayerUtils.getInstance().hasServerPermission(playerName, "VotingPlugin.Login.RemindVotes")
 				|| PlayerUtils.getInstance().hasServerPermission(playerName, "VotingPlugin.Player")) {
-			if (user.canVoteAll()) {
+			if (user.canVoteAll() || (user.canVoteAny() && user.hasPermission("VotingPlugin.Login.RemindVotes.Any"))) {
 				Player player = Bukkit.getPlayer(playerName);
 				if (player != null) {
 					if (!Config.getInstance().getVoteRemindingRemindOnlyOnce()) {
@@ -1,20 +1,45 @@
 package com.Ben12345rocks.VotingPlugin.bungee;

+import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;

+import com.Ben12345rocks.AdvancedCore.UserStorage.sql.Column;
 import com.Ben12345rocks.AdvancedCore.UserStorage.sql.DataType;
+import com.Ben12345rocks.AdvancedCore.Util.Encryption.EncryptionHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.ClientHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketReceiver;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.vexsoftware.votifier.bungee.events.VotifierEvent;
 import com.vexsoftware.votifier.model.Vote;

 import lombok.Getter;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.PluginMessageEvent;
+import net.md_5.bungee.api.event.ServerConnectedEvent;
 import net.md_5.bungee.api.plugin.Plugin;
+import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.event.EventHandler;

 public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listener {
@@ -25,10 +50,127 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 	@Getter
 	private BungeeMySQL mysql;

+	private SocketHandler socketHandler;
+
+	private HashMap<String, ClientHandler> clientHandles;
+
+	private EncryptionHandler encryptionHandler;
+
+	@Getter
+	private BungeeMethod method;
+
+	private HashMap<String, ArrayList<OfflineBungeeVote>> cachedVotes = new HashMap<String, ArrayList<OfflineBungeeVote>>();
+
+	private HashMap<String, ArrayList<OfflineBungeeVote>> cachedOnlineVotes = new HashMap<String, ArrayList<OfflineBungeeVote>>();
+
+	private VoteCache voteCacheFile;
+
+	public void checkCachedVotes(String server) {
+		if (getProxy().getServerInfo(server) != null) {
+			if (!getProxy().getServerInfo(server).getPlayers().isEmpty()) {
+				if (cachedVotes.containsKey(server)) {
+					ArrayList<OfflineBungeeVote> c = cachedVotes.get(server);
+					if (!c.isEmpty()) {
+						for (OfflineBungeeVote cache : c) {
+							sendPluginMessageServer(server, "Vote", cache.getPlayerName(), cache.getUuid(),
+									cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
+									"" + cache.isRealVote());
+						}
+						cachedVotes.put(server, new ArrayList<OfflineBungeeVote>());
+					}
+				}
+			}
+		}
+	}
+
+	public void checkOnlineVotes(ProxiedPlayer player, String uuid) {
+		if (player != null && player.isConnected() && cachedOnlineVotes.containsKey(uuid)) {
+			ArrayList<OfflineBungeeVote> c = cachedOnlineVotes.get(uuid);
+			if (!c.isEmpty()) {
+				for (OfflineBungeeVote cache : c) {
+					sendPluginMessageServer(getProxy().getPlayer(UUID.fromString(uuid)).getServer().getInfo().getName(),
+							"VoteOnline", cache.getPlayerName(), cache.getUuid(), cache.getService(),
+							"" + cache.getTime(), Boolean.FALSE.toString(), "" + cache.isRealVote());
+				}
+				cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
+			}
+		}
+	}
+
+	public void debug(String msg) {
+		if (config.getDebug()) {
+			getLogger().info("Debug: " + msg);
+		}
+	}
+
+	public UUID fetchUUID(String playerName) throws Exception {
+		// Get response from Mojang API
+		URL url = new URL("https://api.mojang.com/users/profiles/minecraft/" + playerName);
+		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+		connection.connect();
+
+		if (connection.getResponseCode() == 400) {
+			getProxy().getLogger().info("There is no player with the name \"" + playerName + "\"!");
+			return null;
+		}
+
+		InputStream inputStream = connection.getInputStream();
+		BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+
+		// Parse JSON response and get UUID
+		JsonElement element = new JsonParser().parse(bufferedReader);
+		JsonObject object = element.getAsJsonObject();
+		String uuidAsString = object.get("id").getAsString();
+
+		// Return UUID
+		return parseUUIDFromString(uuidAsString);
+	}
+
+	public String getProperName(String uuid, String currentName) {
+		ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
+		if (p != null && p.isConnected()) {
+			return p.getName();
+		}
+		return currentName;
+	}
+
+	public String getUUID(String playerName) {
+		ProxiedPlayer p = getProxy().getPlayer(playerName);
+		if (p != null && p.isConnected()) {
+			return p.getUniqueId().toString();
+		}
+		String str = mysql.getUUID(playerName);
+		if (str != null) {
+			return str;
+		}
+		return "";
+	}
+
+	@Override
+	public void onDisable() {
+		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			for (Entry<String, ArrayList<OfflineBungeeVote>> entry : cachedVotes.entrySet()) {
+				String server = entry.getKey();
+				int num = 0;
+				for (OfflineBungeeVote voteData : entry.getValue()) {
+					voteCacheFile.addVote(server, num, voteData);
+					num++;
+				}
+			}
+			for (Entry<String, ArrayList<OfflineBungeeVote>> entry : cachedOnlineVotes.entrySet()) {
+				String name = entry.getKey();
+				int num = 0;
+				for (OfflineBungeeVote voteData : entry.getValue()) {
+					voteCacheFile.addVoteOnline(name, num, voteData);
+					num++;
+				}
+			}
+		}
+	}
+
 	@Override
 	public void onEnable() {
 		getProxy().getPluginManager().registerListener(this, this);
-		this.getProxy().registerChannel("VotingPlugin:VotingPlugin".toLowerCase());
 		config = new Config(this);
 		config.load();

@@ -51,19 +193,117 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 		getMysql().alterColumnType("MonthVoteStreak", "INT DEFAULT '0'");
 		getMysql().alterColumnType("Points", "INT DEFAULT '0'");
 		getMysql().alterColumnType("HighestDailyTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("MileStoneTotal", "INT DEFAULT '0'");
 		getMysql().alterColumnType("AllTimeTotal", "INT DEFAULT '0'");
 		getMysql().alterColumnType("HighestMonthlyTotal", "INT DEFAULT '0'");
 		getMysql().alterColumnType("MilestoneCount", "INT DEFAULT '0'");
 		getMysql().alterColumnType("MonthTotal", "INT DEFAULT '0'");
 		getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
 		getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");

 		getProxy().getPluginManager().registerCommand(this, new VotingPluginBungeeCommand(this));
-	}

-	public void reload() {
-		config.load();
+		method = BungeeMethod.getByName(config.getBungeeMethod());
+
+		if (method.equals(BungeeMethod.MYSQL)) {
+			this.getProxy().registerChannel("VotingPlugin:VotingPlugin".toLowerCase());
+
+		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			voteCacheFile = new VoteCache(this);
+			voteCacheFile.load();
+
+			try {
+				for (String server : voteCacheFile.getServers()) {
+					ArrayList<OfflineBungeeVote> vote = new ArrayList<OfflineBungeeVote>();
+					for (String num : voteCacheFile.getServerVotes(server)) {
+						Configuration data = voteCacheFile.getServerVotes(server, num);
+						vote.add(new OfflineBungeeVote(data.getString("Name"), data.getString("UUID"),
+								data.getString("Service"), data.getLong("Time"), data.getBoolean("Real")));
+					}
+					cachedVotes.put(server, vote);
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			try {
+				for (String player : voteCacheFile.getPlayers()) {
+					ArrayList<OfflineBungeeVote> vote = new ArrayList<OfflineBungeeVote>();
+					for (String num : voteCacheFile.getServerVotes(player)) {
+						Configuration data = voteCacheFile.getOnlineVotes(player, num);
+						vote.add(new OfflineBungeeVote(data.getString("Name"), data.getString("UUID"),
+								data.getString("Service"), data.getLong("Time"), data.getBoolean("Real")));
+					}
+					cachedOnlineVotes.put(player, vote);
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			voteCacheFile.clearData();
+
+			getProxy().getScheduler().schedule(this, new Runnable() {
+
+				@Override
+				public void run() {
+					for (String server : cachedVotes.keySet()) {
+						checkCachedVotes(server);
+					}
+
+					for (String player : cachedOnlineVotes.keySet()) {
+						checkOnlineVotes(getProxy().getPlayer(UUID.fromString(player)), player);
+					}
+				}
+			}, 15l, TimeUnit.SECONDS);
+
+			this.getProxy().registerChannel("VotingPlugin:VotingPlugin".toLowerCase());
+		} else if (method.equals(BungeeMethod.SOCKETS)) {
+			encryptionHandler = new EncryptionHandler(new File(getDataFolder(), "secretkey.key"));
+
+			socketHandler = new SocketHandler(getDescription().getVersion(), config.getBungeeHost(),
+					config.getBungeePort(), encryptionHandler, config.getDebug());
+
+			socketHandler.add(new SocketReceiver() {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 1) {
+						if (data.length > 2) {
+							if (data[0].equalsIgnoreCase("Broadcast")) {
+								sendServerMessage(data);
+							}
+						}
+					}
+
+				}
+			});
+
+			socketHandler.add(new SocketReceiver() {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 1) {
+						if (data[0].equalsIgnoreCase("StatusOkay")) {
+							String server = data[1];
+							getLogger().info("Voting communicaton okay with " + server);
+						}
+					}
+
+				}
+			});
+
+			clientHandles = new HashMap<String, ClientHandler>();
+			List<String> l = config.getBlockedServers();
+			for (String s : config.getSpigotServers()) {
+				if (!l.contains(s)) {
+					Configuration d = config.getSpigotServerConfiguration(s);
+					clientHandles.put(s, new ClientHandler(d.getString("Host", ""), d.getInt("Port", 1298),
+							encryptionHandler, config.getDebug()));
+				}
+			}
+		}
+
+		getLogger().info("VotingPlugin loaded, using method: " + method.toString());
 	}

 	@EventHandler
@@ -94,47 +334,53 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 		}
 	}

+	@EventHandler
+	public void onServerConnected(ServerConnectedEvent event) {
+		final String server = event.getServer().getInfo().getName();
+		final String uuid = event.getPlayer().getUniqueId().toString();
+		getProxy().getScheduler().schedule(this, new Runnable() {
+
+			@Override
+			public void run() {
+				checkCachedVotes(server);
+				checkOnlineVotes(event.getPlayer(), uuid);
+			}
+
+		}, 2, TimeUnit.SECONDS);
+	}
+
+	@EventHandler
 	public void onVote(VotifierEvent event) {
 		Vote vote = event.getVote();
-		saveVote(vote.getUsername(), vote.getServiceName());
+		getLogger().info("Vote received " + vote.getUsername() + " from service site " + vote.getServiceName());
+
+		vote(vote.getUsername(), vote.getServiceName(), true);
+
 	}

-	public String getUUID(String playerName) {
-		ProxiedPlayer p = getProxy().getPlayer(playerName);
-		if (p != null && p.isConnected()) {
-			return p.getUniqueId().toString();
-		}
-		String str = mysql.getUUID(playerName);
-		if (str != null) {
-			return str;
-		}
-		return "";
+	private UUID parseUUIDFromString(String uuidAsString) {
+		String[] parts = { "0x" + uuidAsString.substring(0, 8), "0x" + uuidAsString.substring(8, 12),
+				"0x" + uuidAsString.substring(12, 16), "0x" + uuidAsString.substring(16, 20),
+				"0x" + uuidAsString.substring(20, 32) };
+
+		long mostSigBits = Long.decode(parts[0]).longValue();
+		mostSigBits <<= 16;
+		mostSigBits |= Long.decode(parts[1]).longValue();
+		mostSigBits <<= 16;
+		mostSigBits |= Long.decode(parts[2]).longValue();
+
+		long leastSigBits = Long.decode(parts[3]).longValue();
+		leastSigBits <<= 48;
+		leastSigBits |= Long.decode(parts[4]).longValue();
+
+		return new UUID(mostSigBits, leastSigBits);
 	}

-	public void saveVote(String name, String service) {
-		String uuid = getUUID(name);
-
-		if (!uuid.isEmpty()) {
-			String data = mysql.getProxyVotes(uuid, "online");
-			String finalData = service + "%time%"
-					+ LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
-			if (data != null && !data.isEmpty()) {
-				finalData = data + "%line%" + service + "%time%"
-						+ LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
-			}
-			if (config.getSendVotesToAllServers()) {
-				for (String send : getProxy().getServers().keySet()) {
-					mysql.update(uuid, "Proxy_" + send, finalData, DataType.STRING);
-					sendPluginMessage("bungeevote", uuid, name);
-				}
-			} else if (config.getSendToOnlineServer()) {
-				mysql.update(uuid, "Proxy_Online", finalData, DataType.STRING);
-				sendPluginMessage("bungeevote", uuid, name);
-			}
-		}
+	public void reload() {
+		config.load();
 	}

-	public void sendPluginMessage(String channel, String... messageData) {
+	public void sendPluginMessageServer(String server, String channel, String... messageData) {
 		ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
 		DataOutputStream out = new DataOutputStream(byteOutStream);
 		try {
@@ -143,16 +389,165 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 			for (String message : messageData) {
 				out.writeUTF(message);
 			}
-			for (String send : getProxy().getServers().keySet()) {
-				if (getProxy().getServers().get(send).getPlayers().size() > 0) {
-					getProxy().getServers().get(send).sendData("VotingPlugin:VotingPlugin".toLowerCase(),
-							byteOutStream.toByteArray());
-				}
+			if (getProxy().getServers().get(server).getPlayers().size() > 0) {
+				getProxy().getServers().get(server).sendData("VotingPlugin:VotingPlugin".toLowerCase(),
+						byteOutStream.toByteArray(), false);
 			}
 			out.close();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
+		debug("Sending plugin message " + server + " " + channel + " "
+				+ ArrayUtils.getInstance().makeStringList(ArrayUtils.getInstance().convert(messageData)));
+
+	}
+
+	public void sendServerMessage(String... messageData) {
+		for (ClientHandler h : clientHandles.values()) {
+			h.sendMessage(messageData);
+		}
+	}
+
+	public void sendServerMessageServer(String server, String... messageData) {
+		if (clientHandles.containsKey(server)) {
+			clientHandles.get(server).sendMessage(messageData);
+		}
+	}
+
+	public void sendSocketVote(String name, String service) {
+		String uuid = getUUID(name);
+
+		if (config.getSendVotesToAllServers()) {
+			sendServerMessage("bungeevote", uuid, name, service);
+			if (config.getBroadcast()) {
+				sendServerMessage("BungeeBroadcast", service, uuid, name);
+			}
+		} else {
+			// online server only
+			ProxiedPlayer p = getProxy().getPlayer(name);
+
+			String server = "";
+			if (p != null && p.isConnected()) {
+				server = p.getServer().getInfo().getName();
+			} else {
+				server = config.getFallBack();
+			}
+			if (config.getBlockedServers().contains(server)) {
+				server = config.getFallBack();
+			}
+
+			sendServerMessageServer(server, "bungeevoteonline", uuid, name, service);
+			if (config.getBroadcast()) {
+				sendServerMessage("BungeeBroadcast", service, uuid, name);
+			}
+			sendServerMessage("BungeeUpdate");
+		}
+
+	}
+
+	public void status(CommandSender sender) {
+		sendServerMessage("status");
+	}
+
+	public void vote(String player, String service, boolean realVote) {
+		if (player == null || player.isEmpty()) {
+			getLogger().info("No name from vote on " + service);
+			return;
+		}
+		if (method.equals(BungeeMethod.SOCKETS)) {
+			sendSocketVote(player, service);
+		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			String uuid = getUUID(player);
+			if (uuid.isEmpty()) {
+				UUID u = null;
+				try {
+					u = fetchUUID(player);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				if (u == null) {
+					debug("Failed to get uuid for " + player);
+					return;
+				}
+				uuid = u.toString();
+			}
+
+			player = getProperName(uuid, player);
+
+			if (!mysql.getUuids().contains(uuid)) {
+				mysql.update(uuid, "PlayerName", player, DataType.STRING);
+			}
+
+			// add totals here
+			ArrayList<Column> data = mysql.getExactQuery(new Column("uuid", uuid, DataType.STRING));
+			for (Column d : data) {
+				if (d.getName().equalsIgnoreCase("alltimetotal") || d.getName().equalsIgnoreCase("monthtotal")
+						|| d.getName().equalsIgnoreCase("weeklytotal") || d.getName().equalsIgnoreCase("dailytotal")
+						|| d.getName().equalsIgnoreCase("Points") || d.getName().equalsIgnoreCase("MilestoneCount")) {
+					Object value = d.getValue();
+					int num = 0;
+					if (value instanceof Integer) {
+						try {
+							num = (int) value;
+						} catch (ClassCastException | NullPointerException ex) {
+						}
+					} else if (value instanceof String) {
+						try {
+							num = Integer.parseInt((String) value);
+						} catch (Exception e) {
+						}
+					}
+					mysql.update(uuid, d.getName(), num + 1, DataType.STRING);
+
+					debug("Setting " + d.getName() + " to " + (num + 1));
+
+				}
+			}
+
+			long time = LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+
+			if (config.getSendVotesToAllServers()) {
+				for (String s : getProxy().getServers().keySet()) {
+					if (!config.getBlockedServers().contains(s)) {
+						ServerInfo info = getProxy().getServerInfo(s);
+						if (info.getPlayers().isEmpty()) {
+							// cache
+							if (!cachedVotes.containsKey(s)) {
+								cachedVotes.put(s, new ArrayList<OfflineBungeeVote>());
+							}
+							ArrayList<OfflineBungeeVote> list = cachedVotes.get(s);
+							list.add(new OfflineBungeeVote(player, uuid, service, time, realVote));
+							cachedVotes.put(s, list);
+
+							debug("Caching vote for " + player + " on " + service + " for " + s);
+
+						} else {
+							// send
+							sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
+									Boolean.TRUE.toString(), "" + realVote);
+						}
+					}
+				}
+			} else {
+				ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
+				if (p != null && p.isConnected()) {
+					sendPluginMessageServer(p.getServer().getInfo().getName(), "VoteOnline", player, uuid, service,
+							"" + time, Boolean.TRUE.toString(), "" + realVote);
+				} else {
+					if (!cachedOnlineVotes.containsKey(uuid)) {
+						cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
+					}
+					ArrayList<OfflineBungeeVote> list = cachedOnlineVotes.get(uuid);
+					if (list == null) {
+						list = new ArrayList<OfflineBungeeVote>();
+					}
+					list.add(new OfflineBungeeVote(player, uuid, service, time, realVote));
+					cachedOnlineVotes.put(uuid, list);
+					debug("Caching online vote for " + player + " on " + service);
+				}
+			}
+
+		}
 	}

 }
@@ -0,0 +1,14 @@
+package com.Ben12345rocks.VotingPlugin.bungee;
+
+public enum BungeeMethod {
+	SOCKETS, PLUGINMESSAGING, MYSQL;
+
+	public static BungeeMethod getByName(String str) {
+		for (BungeeMethod method : values()) {
+			if (method.toString().equalsIgnoreCase(str)) {
+				return method;
+			}
+		}
+		return SOCKETS;
+	}
+}
@@ -1,6 +1,7 @@
 package com.Ben12345rocks.VotingPlugin.bungee;

 import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -47,6 +48,7 @@ public class BungeeMySQL {
 		String database = section.getString("Database");
 		long lifeTime = section.getLong("MaxLifeTime", -1);
 		int maxThreads = section.getInt("MaxConnections", 1);
+		String str = section.getString("Line", "");
 		if (maxThreads < 1) {
 			maxThreads = 1;
 		}
@@ -60,7 +62,7 @@ public class BungeeMySQL {
 			name = tablePrefix + tableName;
 		}
 		mysql = new com.Ben12345rocks.AdvancedCore.UserStorage.mysql.api.MySQL(maxThreads);
-		if (!mysql.connect(hostName, "" + port, user, pass, database, useSSL, lifeTime)) {
+		if (!mysql.connect(hostName, "" + port, user, pass, database, useSSL, lifeTime, str)) {

 		}
 		try {
@@ -128,43 +130,6 @@ public class BungeeMySQL {
 		}
 	}

-	public String getUUID(String playerName) {
-		String query = "SELECT uuid FROM " + getName() + " WHERE " + "PlayerName" + "='" + playerName + "';";
-		try {
-			Query sql = new Query(mysql, query);
-
-			ResultSet rs = sql.executeQuery();
-			rs.next();
-			String uuid = rs.getString("uuid");
-			if (uuid != null && !uuid.isEmpty()) {
-				return uuid;
-			}
-		} catch (SQLException e) {
-			e.printStackTrace();
-		} catch (ArrayIndexOutOfBoundsException e) {
-		}
-		return null;
-	}
-
-	public String getProxyVotes(String uuid, String server) {
-		checkColumn("Proxy_" + server, DataType.STRING);
-		String query = "SELECT Proxy_" + server + " FROM " + getName() + " WHERE " + "uuid" + "='" + uuid + "';";
-		try {
-			Query sql = new Query(mysql, query);
-
-			ResultSet rs = sql.executeQuery();
-			rs.next();
-			String str = rs.getString("Proxy_" + server);
-			if (str != null && !str.isEmpty()) {
-				return str;
-			}
-		} catch (SQLException e) {
-			e.printStackTrace();
-		} catch (ArrayIndexOutOfBoundsException e) {
-		}
-		return null;
-	}
-
 	public void checkColumn(String column, DataType dataType) {
 		synchronized (object4) {
 			if (!getColumns().contains(column)) {
@@ -191,17 +156,27 @@ public class BungeeMySQL {
 	}

 	public boolean containsKeyQuery(String index) {
-		String sql = "SELECT uuid FROM " + getName() + ";";
+		String sqlStr = "SELECT uuid FROM " + getName() + ";";
 		try {
-			Query query = new Query(mysql, sql);
+			ResultSet rs = null;

-			ResultSet rs = query.executeQuery();
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement(sqlStr);
+
+			rs = sql.executeQuery();
+			/*
+			 * Query query = new Query(mysql, sql);
+			 * ResultSet rs = query.executeQuery();
+			 */
 			while (rs.next()) {
 				if (rs.getString("uuid").equals(index)) {
+					sql.close();
+					conn.close();
 					return true;
 				}
 			}
-
+			sql.close();
+			conn.close();
 		} catch (SQLException ex) {
 			ex.printStackTrace();
 		}
@@ -218,9 +193,16 @@ public class BungeeMySQL {
 	public ArrayList<String> getColumnsQueury() {
 		ArrayList<String> columns = new ArrayList<String>();
 		try {
-			Query query = new Query(mysql, "SELECT * FROM " + getName() + ";");
+			ResultSet rs = null;

-			ResultSet rs = query.executeQuery();
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement("SELECT * FROM " + getName() + ";");
+
+			rs = sql.executeQuery();
+			/*
+			 * Query query = new Query(mysql, "SELECT * FROM " + getName() + ";");
+			 * ResultSet rs = query.executeQuery();
+			 */

 			ResultSetMetaData metadata = rs.getMetaData();
 			int columnCount = 0;
@@ -231,10 +213,13 @@ public class BungeeMySQL {
 					String columnName = metadata.getColumnName(i);
 					columns.add(columnName);
 				}
+				sql.close();
+				conn.close();
 				return columns;
 			}
-
-		} catch (SQLException e) {
+			sql.close();
+			conn.close();
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
 		return columns;
@@ -243,29 +228,40 @@ public class BungeeMySQL {

 	public ArrayList<Column> getExactQuery(Column column) {
 		ArrayList<Column> result = new ArrayList<>();
-		String query = "SELECT * FROM " + getName() + " WHERE `" + column.getName() + "`=?" + ";";
+		String query = "SELECT * FROM " + getName() + " WHERE `" + column.getName() + "`='"
+				+ column.getValue().toString() + "';";

 		try {
-			Query sql = new Query(mysql, query);
+			ResultSet rs = null;

-			sql.setParameter(1, column.getValue().toString());
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement(query);

-			ResultSet rs = sql.executeQuery();
-			rs.next();
-			for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
-				String columnName = rs.getMetaData().getColumnLabel(i);
-				Column rCol = null;
-				if (intColumns.contains(columnName)) {
-					rCol = new Column(columnName, DataType.INTEGER);
-				} else {
-					rCol = new Column(columnName, DataType.STRING);
+			rs = sql.executeQuery();
+
+			/*
+			 * Query sql = new Query(mysql, query);
+			 * sql.setParameter(1, column.getValue().toString());
+			 * ResultSet rs = sql.executeQuery();
+			 */
+			if (rs.next()) {
+				for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
+					String columnName = rs.getMetaData().getColumnLabel(i);
+					Column rCol = null;
+					if (intColumns.contains(columnName)) {
+						rCol = new Column(columnName, DataType.INTEGER);
+					} else {
+						rCol = new Column(columnName, DataType.STRING);
+					}
+					// System.out.println(i + " " +
+					// rs.getMetaData().getColumnLabel(i));
+					rCol.setValue(rs.getString(i));
+					// System.out.println(rCol.getValue());
+					result.add(rCol);
 				}
-				// System.out.println(i + " " +
-				// rs.getMetaData().getColumnLabel(i));
-				rCol.setValue(rs.getString(i));
-				// System.out.println(rCol.getValue());
-				result.add(rCol);
 			}
+			sql.close();
+			conn.close();
 			return result;
 		} catch (SQLException e) {
 			e.printStackTrace();
@@ -298,16 +294,26 @@ public class BungeeMySQL {

 	public ArrayList<Column> getRowsNameQuery() {
 		ArrayList<Column> result = new ArrayList<Column>();
-		String sql = "SELECT PlayerName FROM " + getName() + ";";
+		String sqlStr = "SELECT PlayerName FROM " + getName() + ";";

 		try {
-			Query query = new Query(mysql, sql);
-			ResultSet rs = query.executeQuery();
+			ResultSet rs = null;
+
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement(sqlStr);
+
+			rs = sql.executeQuery();
+			/*
+			 * Query query = new Query(mysql, sql);
+			 * ResultSet rs = query.executeQuery();
+			 */

 			while (rs.next()) {
 				Column rCol = new Column("PlayerName", rs.getString("PlayerName"), DataType.STRING);
 				result.add(rCol);
 			}
+			sql.close();
+			conn.close();
 		} catch (SQLException e) {
 		}

@@ -316,16 +322,26 @@ public class BungeeMySQL {

 	public ArrayList<Column> getRowsQuery() {
 		ArrayList<Column> result = new ArrayList<Column>();
-		String sql = "SELECT uuid FROM " + getName() + ";";
+		String sqlStr = "SELECT uuid FROM " + getName() + ";";

 		try {
-			Query query = new Query(mysql, sql);
-			ResultSet rs = query.executeQuery();
+			ResultSet rs = null;
+
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement(sqlStr);
+
+			rs = sql.executeQuery();
+			/*
+			 * Query query = new Query(mysql, sql);
+			 * ResultSet rs = query.executeQuery();
+			 */

 			while (rs.next()) {
 				Column rCol = new Column("uuid", rs.getString("uuid"), DataType.STRING);
 				result.add(rCol);
 			}
+			sql.close();
+			conn.close();
 		} catch (SQLException e) {
 			return null;
 		}
@@ -333,6 +349,36 @@ public class BungeeMySQL {
 		return result;
 	}

+	public String getUUID(String playerName) {
+		String query = "SELECT uuid FROM " + getName() + " WHERE " + "PlayerName" + "='" + playerName + "';";
+		try {
+			ResultSet rs = null;
+
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement(query);
+
+			rs = sql.executeQuery();
+			/*
+			 * Query sql = new Query(mysql, query);
+			 * ResultSet rs = sql.executeQuery();
+			 */
+			if (rs.next()) {
+				String uuid = rs.getString("uuid");
+				if (uuid != null && !uuid.isEmpty()) {
+					sql.close();
+					conn.close();
+					return uuid;
+				}
+			}
+			sql.close();
+			conn.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		} catch (ArrayIndexOutOfBoundsException e) {
+		}
+		return null;
+	}
+
 	public Set<String> getUuids() {
 		if (uuids == null || uuids.size() == 0) {
 			uuids.clear();
@@ -419,4 +465,4 @@ public class BungeeMySQL {
 		}

 	}
-}
+}
@@ -4,6 +4,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
+import java.util.Collection;
+import java.util.List;

 import lombok.Getter;
 import net.md_5.bungee.config.Configuration;
@@ -19,9 +21,54 @@ public class Config {
 		this.bungee = bungee;
 	}

+	public List<String> getBlockedServers() {
+		return getData().getStringList("BlockedServers");
+	}
+
+	public boolean getBroadcast() {
+		return getData().getBoolean("Broadcast", false);
+	}
+
+	public String getBungeeHost() {
+		return getData().getString("BungeeServer.Host", "");
+	}
+
+	public String getBungeeMethod() {
+		return getData().getString("BungeeMethod", "SOCKETS");
+	}
+
+	public int getBungeePort() {
+		return getData().getInt("BungeeServer.Port", 1297);
+	}
+
+	public boolean getDebug() {
+		return getData().getBoolean("Debug", false);
+	}
+
+	public String getFallBack() {
+		return getData().getString("FallBackServer", "");
+	}
+
+	public boolean getSendToOnlineServer() {
+		return getData().getBoolean("SendToOnlineServer");
+	}
+
+	public boolean getSendVotesToAllServers() {
+		return getData().getBoolean("SendVotesToAllServers");
+	}
+
+	public Configuration getSpigotServerConfiguration(String s) {
+		return getData().getSection("SpigotServers." + s);
+	}
+
+	public Collection<String> getSpigotServers() {
+		return getData().getSection("SpigotServers").getKeys();
+	}
+
 	public void load() {
-		if (!bungee.getDataFolder().exists())
+		if (!bungee.getDataFolder().exists()) {
 			bungee.getDataFolder().mkdir();
+		}

 		File file = new File(bungee.getDataFolder(), "bungeeconfig.yml");

@@ -49,12 +96,4 @@ public class Config {
 		}
 	}

-	public boolean getSendVotesToAllServers() {
-		return getData().getBoolean("SendVotesToAllServers");
-	}
-
-	public boolean getSendToOnlineServer() {
-		return getData().getBoolean("SendVotesToAllServers");
-	}
-
 }
@@ -0,0 +1,26 @@
+package com.Ben12345rocks.VotingPlugin.bungee;
+
+import lombok.Getter;
+
+public class OfflineBungeeVote {
+
+	@Getter
+	private String playerName;
+	@Getter
+	private String uuid;
+	@Getter
+	private String service;
+	@Getter
+	private long time;
+	@Getter
+	private boolean realVote;
+
+	public OfflineBungeeVote(String playerName, String uuid, String service, long time, boolean realVote) {
+		this.playerName = playerName;
+		this.uuid = uuid;
+		this.service = service;
+		this.time = time;
+		this.realVote = realVote;
+	}
+
+}
@@ -0,0 +1,102 @@
+package com.Ben12345rocks.VotingPlugin.bungee;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+
+import lombok.Getter;
+import net.md_5.bungee.config.Configuration;
+import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.config.YamlConfiguration;
+
+public class VoteCache {
+	private Bungee bungee;
+	@Getter
+	private Configuration data;
+
+	public VoteCache(Bungee bungee) {
+		this.bungee = bungee;
+	}
+
+	public void addVote(String server, int num, OfflineBungeeVote voteData) {
+		Configuration section = getData().getSection("VoteCache." + server + "." + num);
+		section.set("Name", voteData.getPlayerName());
+		section.set("Service", voteData.getService());
+		section.set("UUID", voteData.getUuid());
+		section.set("Time", voteData.getTime());
+		section.set("Real", voteData.isRealVote());
+		save();
+	}
+
+	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
+		Configuration section = getData().getSection("OnlineCache." + player + "." + num);
+		section.set("Name", voteData.getPlayerName());
+		section.set("Service", voteData.getService());
+		section.set("UUID", voteData.getUuid());
+		section.set("Time", voteData.getTime());
+		section.set("Real", voteData.isRealVote());
+		save();
+	}
+
+	public void clearData() {
+		getData().set("VoteCache", null);
+		getData().set("OnlineCache", null);
+		save();
+	}
+
+	public Collection<String> getOnlineVotes(String name) {
+		return getData().getSection("OnlineCache." + name).getKeys();
+	}
+
+	public Configuration getOnlineVotes(String name, String num) {
+		return getData().getSection("OnlineCache." + name + "." + num);
+	}
+
+	public Collection<String> getPlayers() {
+		return getData().getSection("OnlineCache").getKeys();
+	}
+
+	public Collection<String> getServers() {
+		return getData().getSection("VoteCache").getKeys();
+	}
+
+	public Collection<String> getServerVotes(String server) {
+		return getData().getSection("VoteCache." + server).getKeys();
+	}
+
+	public Configuration getServerVotes(String server, String num) {
+		return getData().getSection("VoteCache." + server + "." + num);
+	}
+
+	public void load() {
+		if (!bungee.getDataFolder().exists()) {
+			bungee.getDataFolder().mkdir();
+		}
+
+		File file = new File(bungee.getDataFolder(), "votecache.yml");
+
+		if (!file.exists()) {
+			try {
+				file.createNewFile();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		try {
+			data = ConfigurationProvider.getProvider(YamlConfiguration.class)
+					.load(new File(bungee.getDataFolder(), "votecache.yml"));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void save() {
+		try {
+			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
+					new File(bungee.getDataFolder(), "votecache.yml"));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+}
@@ -8,24 +8,45 @@ public class VotingPluginBungeeCommand extends Command {
 	private Bungee bungee;

 	public VotingPluginBungeeCommand(Bungee bungee) {
-		super("votingpluginbungee");
+		super("votingpluginbungee", "votingplugin.admin");
 		this.bungee = bungee;
 	}

 	@Override
 	public void execute(CommandSender sender, String[] args) {
-		if (args.length > 0) {
-			if (args[0].equalsIgnoreCase("reload")) {
-				bungee.reload();
-				sender.sendMessage(new TextComponent("Reloading VotingPluginBungee"));
-			}
-			if (args[0].equalsIgnoreCase("vote")) {
-				if (args.length >= 2) {
-					String user = args[1];
-					String site = args[2];
-					bungee.saveVote(user, site);
+		if (sender.hasPermission("votingplugin.admin")) {
+			if (args.length > 0) {
+				if (args[0].equalsIgnoreCase("reload")) {
+					bungee.reload();
+					sender.sendMessage(new TextComponent("Reloading VotingPluginBungee"));
+				}
+				if (args[0].equalsIgnoreCase("vote")) {
+					if (args.length >= 2) {
+						String user = args[1];
+						String site = args[2];
+						bungee.vote(user, site, false);
+						sender.sendMessage(new TextComponent("Sending vote"));
+					}
+				}
+				if (args[0].equalsIgnoreCase("status")) {
+					if (bungee.getMethod().equals(BungeeMethod.SOCKETS)) {
+						sender.sendMessage(new TextComponent(
+								"Checking status, waiting for response, check console, only for socket method"));
+						bungee.status(sender);
+					} else {
+						sender.sendMessage(new TextComponent("Not using socket method, command unavailable"));
+					}
+				}
+				if (args[0].equalsIgnoreCase("help")) {
+					TextComponent[] msg = new TextComponent[3];
+					msg[0] = new TextComponent("&avotingpluginbungee reload - Reload plugin");
+					msg[1] = new TextComponent("&avotingpluginbungee vote (player) (servicesite) - Send bungee vote");
+					msg[2] = new TextComponent("&avotingplugin status - Check socket connection status");
+					sender.sendMessage(msg);
 				}
 			}
+		} else {
+			sender.sendMessage(new TextComponent("You do not have permission to do this!"));
 		}
 	}
 }
Author	SHA1	Message	Date
Ben12345rocks	d96490e60b	Update version number	2020-10-03 20:18:55 -04:00
Ben12345rocks	2198c5d4a0	Bug fix	2020-10-03 20:13:31 -04:00
Ben12345rocks	776179e41d	Little improvements	2020-10-03 19:31:14 -04:00
Ben12345rocks	7bda38ff48	Little improvement	2020-10-03 07:56:09 -04:00
Ben12345rocks	a23ead4d9c	Little command improvement	2020-10-02 19:42:37 -04:00
Ben12345rocks	0f820738c6	Add safe guard for milestones with config option	2020-10-02 19:14:52 -04:00
Ben12345rocks	30d912114d	Improvements to book GUI	2020-09-29 19:45:04 -04:00
Ben12345rocks	567288309c	Bug fix	2020-09-29 17:22:12 -04:00
Ben12345rocks	7cd67f55f1	Little improvement	2020-09-29 16:44:52 -04:00
Ben12345rocks	59e7dcd8e8	Bug fix and little improvements	2020-09-28 19:21:54 -04:00
Ben12345rocks	90e55a0a7d	Add command /av resyncmilestonesalreadygiven	2020-09-25 20:04:25 -04:00
Ben12345rocks	a280d91c05	Add book GUI for /vote	2020-09-24 19:27:21 -04:00
Ben12345rocks	feb54aeb9e	Undo test commit	2020-09-20 13:24:06 -04:00
Ben12345rocks	ee96bf500e	Test commit	2020-09-20 13:23:26 -04:00
Ben12345rocks	91a266889f	Code cleanup	2020-09-20 12:39:59 -04:00
Ben12345rocks	6051138613	Test change	2020-09-14 17:03:17 -04:00
Ben12345rocks	d9780f9954	Add a command to force top voter awards	2020-09-13 14:23:31 -04:00
Ben12345rocks	453287dc1c	Fix logging votes to file	2020-09-12 18:23:21 -04:00
Ben12345rocks	8f119862d0	Update to 1.16.3	2020-09-10 19:22:46 -04:00
Ben12345rocks	df1fc4a734	Little change	2020-09-07 14:51:35 -04:00
Ben12345rocks	a545462410	Update version number	2020-09-06 20:01:13 -04:00
Ben12345rocks	bb7cc4d6e7	Change default config option	2020-09-05 18:24:01 -04:00
Ben12345rocks	eb69cf41a5	Add config options	2020-09-05 16:22:59 -04:00
Ben12345rocks	642164b1b4	Little fix	2020-09-03 16:29:38 -04:00
Ben12345rocks	ff99a462d7	Add /av user (player) ForceVoteShop (Shop)	2020-09-03 16:27:56 -04:00
Ben12345rocks	e7de87e8aa	Merge branch 'master' of https://github.com/Ben12345rocks/VotingPlugin	2020-09-03 15:17:46 -04:00
Ben12345rocks	e5d91037cb	Bug fix	2020-09-03 15:16:47 -04:00
Ben	e7db5b8aa2	Merge pull request #937 from DrBot7/master More reminding options	2020-09-03 15:13:02 -04:00
DrBot7	551c962cd2	More reminding options With this change, players with the votingplugin.login.remindvotes.any permission will be reminded to vote as long as they can vote on any of their voting sites.	2020-09-02 23:33:39 -05:00
Ben12345rocks	5ada4e05a2	Bug fix	2020-09-01 15:22:52 -04:00
Ben12345rocks	1f3243e362	Bug fix	2020-08-31 15:10:06 -04:00
Ben12345rocks	303b944128	Update version number	2020-08-29 20:38:21 -04:00
Ben12345rocks	989e8fd7a2	Bug fixes	2020-08-29 19:46:53 -04:00
Ben12345rocks	9a21e37516	Bug fix	2020-08-29 19:16:09 -04:00
Ben12345rocks	29a27477b6	Implement config changes	2020-08-29 19:03:47 -04:00
Ben12345rocks	0ebc5a4c6e	More improvements	2020-08-27 15:50:05 -04:00
Ben12345rocks	1c6131589f	Little change	2020-08-27 15:13:49 -04:00
Ben12345rocks	a183335df7	Add info on real vote to bungee voting	2020-08-25 16:37:30 -04:00
Ben12345rocks	c0447ab6e0	Add http to urls if forcing	2020-08-25 16:23:33 -04:00
Ben12345rocks	0c9c2dacfa	Update version number	2020-08-23 13:26:39 -04:00
Ben12345rocks	48dbd26d24	Improvements	2020-08-23 13:19:38 -04:00
Ben12345rocks	65de370539	Add top placeholder	2020-08-23 12:14:28 -04:00
Ben12345rocks	1ffb050939	Add voteshop disabled message to config	2020-08-22 17:22:15 -04:00
Ben12345rocks	0f15c69831	Bug fix	2020-08-22 15:27:51 -04:00
Ben12345rocks	5d99ea6154	Add placeholder	2020-08-22 14:57:11 -04:00
Ben12345rocks	7224cb76de	Bug fix	2020-08-17 15:55:34 -04:00
Ben12345rocks	1ac9df057d	Bug fix	2020-08-16 17:54:39 -04:00
Ben12345rocks	033941388c	Bug fix	2020-08-16 17:50:42 -04:00
Ben12345rocks	fc979bc6bf	Bug fix	2020-08-16 17:34:09 -04:00
Ben12345rocks	f1860f2934	Use config option	2020-08-16 13:44:55 -04:00
Ben12345rocks	ab8696a3a4	Bug fix	2020-08-16 13:28:31 -04:00
Ben12345rocks	09cd00a563	Bug fix	2020-08-16 12:56:11 -04:00
Ben12345rocks	f2ca7c3240	Add placeholder	2020-08-16 12:39:31 -04:00
Ben12345rocks	6928c15147	Bug fixes	2020-08-16 12:15:27 -04:00
Ben12345rocks	9e278de881	Fix spelling mistake	2020-08-15 20:02:52 -04:00
Ben12345rocks	af9e207012	Update version number	2020-08-15 19:20:53 -04:00
Ben12345rocks	c667a6ba56	Improvements	2020-08-15 19:18:50 -04:00
Ben12345rocks	37c6888962	Improvements	2020-08-15 18:52:33 -04:00
Ben12345rocks	5729968630	Bug fix	2020-08-15 15:21:48 -04:00
Ben	5fb377da21	Merge pull request #902 from DrBot7/patch-1 Fix vnext	2020-08-13 16:50:00 -04:00
DrBot7	92f0c284cd	Fix vnext The current state with build 325 is telling me that I can't vote even though I can. https://imgur.com/a/ueRrMao I noticed that MCMP, which has a daily timer with no offset, tells me that I am able to vote in 8 hours. However, I should be able to vote now. I wrote up some code and tested locally. This seems to have fixed my issue.	2020-08-13 15:43:50 -05:00
Ben12345rocks	7c8be94d88	Bug fix	2020-08-13 15:43:36 -04:00
Ben12345rocks	19690712ba	Bug fix	2020-08-12 19:28:16 -04:00
Ben12345rocks	7c32a0c883	Bug fix	2020-08-12 17:08:57 -04:00
Ben12345rocks	df87848caa	Another change	2020-08-12 17:05:56 -04:00
Ben12345rocks	534253fbfc	Bug fix	2020-08-12 16:43:15 -04:00
Ben12345rocks	afbbbcfd45	Code cleanup	2020-08-12 15:22:54 -04:00
Ben12345rocks	f5ea7e8490	Bug fix	2020-08-12 15:21:52 -04:00
Ben12345rocks	c0b1c82ec4	Little performance improvement	2020-08-11 19:33:10 -04:00
Ben12345rocks	99eb028a62	Update to 1.16.2	2020-08-11 19:13:11 -04:00
Ben12345rocks	ce3a40a155	Little change	2020-08-11 19:06:16 -04:00
Ben12345rocks	da5e71a614	Bug fix	2020-08-11 17:28:41 -04:00
Ben12345rocks	c2e509e4c7	Bug fix	2020-08-11 17:19:00 -04:00
Ben12345rocks	a068c0b1db	Bug fix	2020-08-11 16:25:05 -04:00
Ben12345rocks	b1fa69ed26	Little improvements	2020-08-10 20:24:27 -04:00
Ben12345rocks	d91f485f1e	Little improvements	2020-08-10 15:39:27 -04:00
Ben12345rocks	0252dd3535	Improvements	2020-08-09 12:53:45 -04:00
Ben12345rocks	21cf18f34e	Little change	2020-08-08 20:30:27 -04:00
Ben12345rocks	892cae605b	A lot of bungee improvements	2020-08-08 19:32:53 -04:00
Ben12345rocks	c97fd708e0	Add more log info for bungee	2020-08-07 21:58:28 -04:00
Ben12345rocks	12dd52af3d	Add another method to bungee voting, untested	2020-08-07 20:22:48 -04:00
Ben12345rocks	3a3d784d6d	Bug fix	2020-07-24 15:25:12 -04:00
Ben12345rocks	86c98ccae1	Bug fix	2020-07-23 15:18:42 -04:00
Ben12345rocks	e004121081	Little change	2020-07-19 19:14:40 -04:00
Ben12345rocks	27c3bf71ec	Undo changes	2020-07-19 16:57:38 -04:00
Ben12345rocks	c5da78712f	Little change	2020-07-19 16:11:29 -04:00
Ben12345rocks	7cd12844fd	Little change	2020-07-19 14:50:09 -04:00
Ben12345rocks	f04d03fa90	Little fix	2020-07-19 14:27:01 -04:00
Ben12345rocks	10af3797d1	Little change	2020-07-19 12:28:15 -04:00
Ben12345rocks	5dd9de8310	Bug fix	2020-07-14 15:49:58 -04:00
Ben12345rocks	75c7b6b703	Change Item to DisplayItem to avoid confusion	2020-07-12 13:23:32 -04:00
Ben12345rocks	70ef27deb8	Some improvements	2020-07-12 12:07:40 -04:00
Ben12345rocks	007f2e7b73	Bug fix	2020-07-09 15:25:18 -04:00
Ben12345rocks	f7cafaefdc	Little more improvements	2020-07-08 15:19:38 -04:00
Ben12345rocks	cb6e27e700	Little config change	2020-07-08 15:10:20 -04:00
Ben12345rocks	fd5ba1f98e	Add option to use an item instead of skull for vote today	2020-07-07 15:39:01 -04:00
Ben12345rocks	e63fd4d79c	Improvements	2020-07-06 17:05:00 -04:00
Ben12345rocks	be2a7e2ee3	Add command for current plugin time	2020-07-04 14:50:52 -04:00
Ben12345rocks	85a8a29e69	Add option to clear cache for vote shop	2020-07-03 08:06:51 -04:00
Ben12345rocks	b07fe783dd	Improve bungee efficiency	2020-06-27 20:43:48 -04:00
Ben12345rocks	75e4f45e9f	Little change	2020-06-26 16:24:33 -04:00
Ben12345rocks	826d353bfd	Update version number	2020-06-25 19:26:22 -04:00
Ben12345rocks	2891607947	Update to 1.16.1	2020-06-24 21:15:05 -04:00
Ben12345rocks	b7a4955766	Separate bungee debug	2020-06-20 08:42:42 -04:00
Ben12345rocks	d1f7c78bbe	Bug fix	2020-06-20 08:05:34 -04:00
Ben12345rocks	289980aa41	Improve debugging for sockets	2020-06-19 16:39:32 -04:00
Ben12345rocks	217d1b60a3	Bug fix	2020-06-14 12:12:09 -04:00
Ben12345rocks	fce1b38a24	Bug fix	2020-06-11 16:45:32 -04:00
Ben12345rocks	6538465add	Maven updates	2020-06-07 17:13:17 -04:00
Ben12345rocks	a70b9e46a8	Change default color codes for /vote	2020-06-06 18:17:03 -04:00
Ben12345rocks	22d7c75261	Add bungee help command	2020-06-05 19:24:56 -04:00
Ben12345rocks	1cdf7a1033	Bug fix	2020-06-03 16:21:47 -04:00
Ben12345rocks	27afaf8e1b	Add bungee status command	2020-06-01 19:35:14 -04:00
Ben12345rocks	019699ae75	Bug fix	2020-06-01 18:58:19 -04:00
Ben12345rocks	745df69024	Add a status command for bungee voting	2020-06-01 17:38:35 -04:00
Ben12345rocks	6e84130261	Little improvement	2020-05-31 14:01:16 -04:00
Ben12345rocks	124485b4f0	Little imrprovement	2020-05-31 12:26:03 -04:00
Ben12345rocks	f6f9028680	Little improvement	2020-05-31 12:09:42 -04:00
Ben12345rocks	7fab7c5ca8	Add config option for vote shop	2020-05-30 15:34:53 -04:00
Ben12345rocks	355bcfa4d1	Fix perm	2020-05-29 18:50:46 -04:00
Ben12345rocks	87715a1e93	Add command to clear points	2020-05-29 18:49:42 -04:00
Ben12345rocks	cf5faca040	Little fix	2020-05-28 21:25:54 -04:00
Ben12345rocks	099ceb3bca	Improvement	2020-05-28 20:19:30 -04:00
Ben12345rocks	56dd38b6e0	little change	2020-05-28 16:18:01 -04:00
Ben12345rocks	ad752e024a	Improvement	2020-05-27 19:05:54 -04:00
Ben12345rocks	fc6f1052d6	Little improvement	2020-05-26 19:01:20 -04:00
Ben12345rocks	f663b06626	Improvement	2020-05-23 20:17:32 -04:00
Ben12345rocks	7a38a4d7f8	Little improvement	2020-05-23 17:35:28 -04:00
Ben12345rocks	28b8c04f95	Bug fix	2020-05-23 17:30:05 -04:00
Ben12345rocks	85bc09c3da	Little config change	2020-05-23 15:23:29 -04:00
Ben12345rocks	b817ea25e6	Added persite level offset for /vote next only	2020-05-22 16:34:41 -04:00
Ben12345rocks	25ba2f597e	Improve debug message	2020-05-22 16:25:49 -04:00
Ben12345rocks	321b3fbf3a	Add option	2020-05-21 21:20:29 -04:00
Ben12345rocks	df6a4e4a35	Bug fix	2020-05-17 21:34:23 -04:00
Ben12345rocks	7c0031b265	Bug fix	2020-05-16 16:14:12 -04:00
Ben12345rocks	e99ec75a0f	Update version number	2020-05-12 19:14:04 -04:00
Ben12345rocks	15f851e825	Bug fix	2020-05-12 17:36:46 -04:00
Ben12345rocks	0579e7a2fd	Bug fix	2020-05-12 17:33:26 -04:00
Ben12345rocks	1c0b7dc0b1	Bug fix	2020-05-12 17:29:38 -04:00
Ben12345rocks	40d002fbfa	Update version number	2020-05-10 12:27:37 -04:00
Ben	e665eb668f	Update stale.yml	2020-05-03 12:08:51 -04:00
Ben12345rocks	05239717a5	Bug fix	2020-05-01 16:22:07 -04:00
Ben12345rocks	b91f9bedfa	Bug fix	2020-04-26 13:19:46 -04:00
Ben12345rocks	12261ece0e	Change default value	2020-04-23 16:20:28 -04:00
Ben12345rocks	bef017c12d	Added ForceLinks	2020-04-22 19:35:25 -04:00
Ben12345rocks	a6544a399f	Little change	2020-04-18 09:24:33 -04:00
Ben12345rocks	60b61ae49d	Improvements	2020-04-14 18:09:11 -04:00
Ben12345rocks	93ccd5f392	Little change	2020-04-13 14:31:28 -04:00
Ben12345rocks	8169ed413c	Add ability for voteshop confirmation	2020-04-13 11:12:44 -04:00
Ben12345rocks	1a42dfadc0	Little change	2020-04-13 11:00:15 -04:00
Ben12345rocks	c5a5573652	Added voteshop limit resets	2020-04-13 10:58:58 -04:00
Ben12345rocks	f7c3093478	Update version number	2020-04-12 12:25:29 -04:00
Ben12345rocks	6000e1fab9	Add config option	2020-04-10 17:50:24 -04:00
Ben12345rocks	2ac42539aa	Bug fix	2020-04-10 15:32:14 -04:00
Ben12345rocks	6d25b02975	Little config improvement	2020-04-10 15:18:31 -04:00
Ben12345rocks	f3582627fb	Add broadcast blacklist	2020-04-10 15:17:13 -04:00
Ben12345rocks	9e98c2db78	Parse placeholderapi placeholders on broadcast	2020-04-10 13:44:02 -04:00
Ben12345rocks	d387b632dd	Bug fix	2020-04-04 15:06:47 -04:00
Ben12345rocks	69d4a49462	Bug fix	2020-04-04 08:30:31 -04:00
Ben12345rocks	5f648983c8	Attempted bug fix	2020-04-04 08:28:01 -04:00
Ben12345rocks	d98bfd45fc	Add another option	2020-04-03 16:49:32 -04:00
Ben12345rocks	a38931ca23	Add option for gui	2020-04-02 16:52:48 -04:00
Ben12345rocks	508fcb2f29	Add votedelaymin	2020-04-01 20:03:56 -04:00
Ben12345rocks	d280e4b131	Test change	2020-04-01 19:41:55 -04:00
Ben12345rocks	48c014227d	Improvements	2020-04-01 16:56:54 -04:00
Ben12345rocks	21c4be4148	Little bug fix	2020-03-29 12:26:46 -04:00
Ben12345rocks	d44290dcdc	Update version number	2020-03-29 12:24:04 -04:00
Ben12345rocks	702c739ec8	Bug fix	2020-03-24 16:44:54 -04:00
Ben12345rocks	c1122bd939	Bug fix	2020-03-23 20:40:53 -04:00
Ben12345rocks	bdaa896fc1	Bug fix	2020-03-23 20:23:56 -04:00
Ben12345rocks	3b1c051fd2	Bug fix	2020-03-23 20:23:16 -04:00
Ben12345rocks	11194f819e	Disable other background task when other one is enabled	2020-03-23 18:52:16 -04:00
Ben12345rocks	662eb16fdd	Add log	2020-03-23 18:35:28 -04:00
Ben12345rocks	d65070973c	Add extra feature	2020-03-23 17:14:21 -04:00
Ben12345rocks	cef41348cc	Added message	2020-03-22 21:16:04 -04:00
Ben12345rocks	bcba694308	Little change	2020-03-22 20:36:19 -04:00
Ben12345rocks	fbd7c6d3fc	Little improvements	2020-03-20 18:53:55 -04:00
Ben12345rocks	f842c08d62	Add voteshop command	2020-03-20 17:51:55 -04:00
Ben12345rocks	4e58a6915f	Update version number	2020-03-15 13:53:33 -04:00
Ben12345rocks	4336644fbc	Bug fix	2020-03-14 19:19:41 -04:00
Ben12345rocks	e32909ac58	Add softdepend	2020-03-14 18:31:06 -04:00
Ben12345rocks	bd16e2ccaf	Add command	2020-03-13 21:15:44 -04:00
Ben12345rocks	36fa55139e	Bug fix	2020-03-13 17:08:23 -04:00
Ben12345rocks	b128280d5f	Silence error	2020-03-13 17:05:50 -04:00
Ben12345rocks	51e3f05031	Minor improvement	2020-03-11 20:02:04 -04:00
Ben12345rocks	19b83070c6	Improvements to config	2020-03-11 19:49:59 -04:00
Ben12345rocks	5622956e75	Added points formatted placeholder	2020-03-06 16:48:45 -05:00
Ben12345rocks	1ac3ea4916	Minor improvement to force commands	2020-03-06 16:45:14 -05:00
Ben12345rocks	391cc0edf1	Add advancedcore info to /av version	2020-03-01 14:15:11 -05:00
Ben12345rocks	a59a98f8cb	Update version number	2020-02-23 12:15:45 -05:00
Ben12345rocks	e62213bfd5	Bug fix	2020-02-19 16:41:38 -05:00
Ben12345rocks	61b77c4754	Little improvement	2020-02-15 16:33:59 -05:00
Ben12345rocks	758aaa3dd7	Improvements	2020-02-15 16:24:22 -05:00
Ben12345rocks	51389a27fb	Bug fix	2020-02-12 17:01:18 -05:00
Ben12345rocks	37b94cc36c	Add console message on bungeecoord when vote received	2020-02-09 17:02:18 -05:00
Ben12345rocks	1e4796d418	Add option	2020-02-03 20:56:49 -05:00
Ben12345rocks	62b0d6012d	Fix spelling mistake	2020-02-03 16:43:50 -05:00
Ben12345rocks	52726c8bb3	Fix warning message	2020-02-02 13:58:26 -05:00
Ben12345rocks	ede06e0923	Fix warning message	2020-01-29 17:11:44 -05:00
Ben12345rocks	6eb2c95cc0	Change config comments	2020-01-26 12:16:32 -05:00
Ben12345rocks	835dff8620	Update version number	2020-01-21 17:03:12 -05:00
Ben12345rocks	1019b0b83b	Update to 1.15.2	2020-01-21 16:59:12 -05:00
Ben12345rocks	a44070b505	Bug fix	2020-01-19 12:39:14 -05:00
Ben12345rocks	58bd4e2d9d	Little change	2020-01-17 16:45:07 -05:00
Ben12345rocks	cff346e6a4	Add loadbefore	2020-01-13 16:54:18 -05:00
Ben	0331e34e91	Create stale.yml	2020-01-11 15:27:26 -05:00
Ben12345rocks	26ff8d8588	Add try/catch	2020-01-11 14:59:39 -05:00
Ben12345rocks	9a38826cf7	Improvement	2020-01-11 08:34:48 -05:00
Ben12345rocks	b854631990	Little warning message	2020-01-04 11:44:07 -05:00
Ben12345rocks	5d1cd97ebd	Update to 1.15.1	2019-12-17 19:42:34 -05:00
Ben12345rocks	c21feb74d1	Update to 1.15	2019-12-10 18:57:25 -05:00
Ben12345rocks	052e2f2541	Update version number	2019-12-07 19:11:34 -05:00
Ben12345rocks	1270b57afa	Add option to reset extra voteparty votes monthly and command to do so	2019-12-01 12:34:45 -05:00
Ben12345rocks	cf8b219b9d	Add ability to remove VotingPlugin.Player permission on a command	2019-11-27 20:27:14 -05:00
Ben12345rocks	689133aab8	Change default backbutton item to barrier	2019-11-23 19:45:57 -05:00
Ben12345rocks	019c0f01eb	Add bungee communication encryption	2019-11-17 15:38:56 -05:00
Ben12345rocks	743cac217b	Little improvement to bungee command	2019-11-03 17:07:59 -05:00
Ben12345rocks	5f19cb1ec8	Update version number	2019-11-02 21:08:21 -04:00
Ben12345rocks	ac5ffa0f7c	Bug fix	2019-10-31 17:20:40 -04:00
Ben12345rocks	114e07eb01	Improvements	2019-10-30 21:30:49 -04:00
Ben12345rocks	8ba1d75ab3	Bug fix	2019-10-30 20:30:59 -04:00
Ben12345rocks	b3555918ed	Improvements	2019-10-30 20:12:56 -04:00
Ben12345rocks	0759c05ed1	Bug fix	2019-10-29 21:35:26 -04:00
Ben12345rocks	278a8f70f2	Config improvements	2019-10-29 16:59:32 -04:00
Ben12345rocks	fb5dc9923f	Bug fix	2019-10-28 16:49:34 -04:00
Ben12345rocks	f942505e62	Redo bungee system	2019-10-27 14:14:41 -04:00
Ben12345rocks	2d2b2db0a7	Bug fix	2019-10-27 12:52:40 -04:00
Ben	18d5078842	Update issue templates	2019-10-24 17:08:57 -04:00
Ben12345rocks	074b2c51e2	Another bug fix	2019-10-24 16:53:45 -04:00
Ben12345rocks	539194720a	Possible bug fix	2019-10-24 16:50:06 -04:00
Ben	19fc5865fa	Update issue templates	2019-10-20 15:51:09 -04:00
Ben	f0d58e0c6a	Update issue templates	2019-10-20 12:45:12 -04:00
Ben	ddc2bea418	Update issue templates	2019-10-20 12:44:08 -04:00
Ben	24da6893ac	Update issue templates	2019-10-20 12:39:37 -04:00