Update version number

.github/stale.yml

@@ -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

VotingPlugin/Resources/Config.yml

@@ -142,6 +142,9 @@ Format:
       # Text will be sent before this
       Sites: '&4%num%: &c&l%SiteName% - &c%url%'
       
+      # If true, links will always be forced as urls
+      ForceLinks: true
+      
       # Format for /vote next
       Next: 
         # First line
@@ -446,6 +449,8 @@ GUI:
     BackButton: true
   VoteToday:
     Name: 'VoteToday'
+    Line: '&6%VoteSite% : %Time%'
+    IconTitle: '%player%'
     BackButton: true
   VoteTop:
     Name: 'VoteTop %topvoter%'
@@ -454,8 +459,8 @@ GUI:
       Name: '&3&l%position%: &3%player%'
       Lore: '&3&lVotes: &3%votes%'
     SwitchItem:
-      Name: 'Switch TopVoter'
-      Lore: 'Currently: %Top%'
+      Name: '&3Switch TopVoter'
+      Lore: '&bCurrently: %Top%'
       Material: 'SIGN'
       Amount: 1
       # 8 Slots over from the bottom left
@@ -561,7 +566,7 @@ GUI:
   VoteShopName: 'VoteShop'
   
 BackButton:
-  Material: 'PAPER'
+  Material: 'BARRIER'
   Data: 0
   Amount: 1
   Name: '&8Back to VoteGUI'
@@ -572,9 +577,11 @@ VoteShopEnabled: true
 VoteShopHideLimitedReached: true
 # Requires above to be false
 VoteShopLimitReached: '&aYou reached your limit'
+VoteShopRequireConfirmation: false
 Shop:
   # Identifier
   # Used in placeholders for formats
+  # Do not have spaces in the identifier
   Diamond:
     # Item
     Material: 'DIAMOND'
@@ -592,6 +599,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
@@ -608,13 +620,12 @@ Shop:
 # To disable reward set value to []
 # Eg:
 # FirstVote: [] (All in one line)
-# By default all rewards are disabled
+# Rewards will be given if there is a reward to give
 
 # 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
@@ -652,6 +663,8 @@ VoteParty:
   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
@@ -835,6 +848,14 @@ 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
 
@@ -886,6 +907,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,9 +968,27 @@ LoadSkulls: true
 # May not work on some plugins
 UseVaultPermissions: false
 
+# List of disabled commands from /vote
+# List the specific permission
+# E.g:
+# - PERMISSION
+DisabledCommands: []
+
+# Enable to true for extra player checks
+ExtraBackgroundUpdate: false
+
+# --------------------------
+# 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
 UseBungeecoord: false
 
+# Get the plugin to broadcast to all servers
+BungeeBroadcast: false
+
 # What server this is in bungee (must match)
 # Also can be applied to rewards
 Server: PleaseSet
@@ -958,16 +1001,7 @@ BungeeServer:
 # Bungee communication, add this to bungee server
 SpigotServer:
   Host: '127.0.0.1'
-  POrt: 1298
-
-# Get the plugin to broadcast to all servers
-BungeeBroadcast: false
-
-# List of disabled commands from /vote
-# List the specific permission
-# E.g:
-# - PERMISSION
-DisabledCommands: []
+  Port: 1298
 
 # ---------------------------------------------------------
 # Mysql cache options

VotingPlugin/Resources/VoteSites.yml

@@ -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

VotingPlugin/Resources/bungeeconfig.yml

@@ -1,6 +1,4 @@
-# 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

VotingPlugin/Resources/plugin.yml

@@ -4,7 +4,7 @@ main: com.Ben12345rocks.VotingPlugin.Main
 description: Highly Customizable Voting Listener!
 website: https://www.spigotmc.org/resources/votingplugin.15358/
 author: Ben12345rocks
-softdepend: [MVdWPlaceholders, Votifier]
+softdepend: [MVdWPlaceholders, Votifier, CMI, Vault, PlaceholderAPI, ProtocolLib]
 api-version: 1.13
 commands:
   vote:
@@ -225,4 +225,6 @@ permissions:
     default: false
   VotingPlugin.Sign.Create:
     description: Permission to create sign
+  VotingPlugin.Admin.GenerateServiceSite:
+    description: Permission for generating votesite message
   

VotingPlugin/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.20.4</version>
+	<version>5.21.2</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -259,7 +259,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.14.4-R0.1-SNAPSHOT</version>
+			<version>1.15.2-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/BungeeHandler.java

@@ -1,9 +1,11 @@
 package com.Ben12345rocks.VotingPlugin;
 
+import java.io.File;
 import java.util.UUID;
 
 import org.bukkit.Bukkit;
 
+import com.Ben12345rocks.AdvancedCore.Util.Encryption.EncryptionHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Sockets.ClientHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketReceiver;
@@ -27,18 +29,21 @@ public class BungeeHandler {
 	@Getter
 	private ClientHandler clientHandler;
 
+	private EncryptionHandler encryptionHandler;
+
 	public void close() {
 		socketHandler.closeConnection();
 		clientHandler.stopConnection();
 	}
 
 	public void load() {
+		encryptionHandler = new EncryptionHandler(new File(Main.plugin.getDataFolder(), "secretkey.key"));
 		Bukkit.getScheduler().runTask(Main.plugin, new Runnable() {
 
 			@Override
 			public void run() {
 				clientHandler = new ClientHandler(Config.getInstance().getBungeeServerHost(),
-						Config.getInstance().getBungeeServerPort());
+						Config.getInstance().getBungeeServerPort(), encryptionHandler);
 
 				socketHandler.add(new SocketReceiver() {
 
@@ -62,7 +67,7 @@ public class BungeeHandler {
 						}
 					}
 				});
-				
+
 				socketHandler.add(new SocketReceiver() {
 
 					@Override
@@ -110,7 +115,7 @@ public class BungeeHandler {
 		});
 
 		socketHandler = new SocketHandler(Main.plugin.getVersion(), Config.getInstance().getSpigotServerHost(),
-				Config.getInstance().getSpigotServerPort());
+				Config.getInstance().getSpigotServerPort(), encryptionHandler);
 
 	}
 

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Commands/CommandLoader.java

@@ -6,6 +6,7 @@ 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 +22,8 @@ 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.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
@@ -340,6 +343,19 @@ public class CommandLoader {
 			}
 		});
 
+		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 +525,8 @@ public class CommandLoader {
 					});
 
 				}
+				sendMessage(sender,
+						"Using AdvancedCore " + plugin.getVersion() + "' built on '" + plugin.getBuildTime());
 			}
 		});
 
@@ -1065,6 +1083,18 @@ 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)", "ForceMilestone", "(Number)" },
 						"VotingPlugin.Commands.AdminVote.ForceMilestone|" + adminPerm, "Force a milestone") {
@@ -1073,6 +1103,7 @@ 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");
 					}
 				});
 
@@ -1084,6 +1115,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 +1126,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,6 +1137,7 @@ 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");
 			}
 		});
 
@@ -1116,6 +1150,7 @@ public class CommandLoader {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 						SpecialRewards.getInstance().giveVoteStreakReward(user, user.isOnline(), args[3], args[4],
 								parseInt(args[4]));
+						sendMessage(sender, "&cVoteStreak " + args[3] + " " + args[4] + " forced");
 					}
 				});
 
@@ -1396,6 +1431,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 +1520,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", false) {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
@@ -2063,14 +2175,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");
 						}
 					}
 				}
@@ -2134,6 +2250,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());
+
+			}
+		}
 	}
 
 	/**

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Commands/Commands.java

@@ -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 "";
@@ -744,7 +747,8 @@ public class Commands {
 				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();
@@ -921,7 +925,7 @@ public class Commands {
 				MessageBuilder message = new MessageBuilder(config.getFormatCommandsVoteURLS());
 				message.replacePlaceholder("num", Integer.toString(counter)).replacePlaceholder("url", voteURL)
 						.replacePlaceholder("SiteName", voteSite.getDisplayName())
-						.replacePlaceholder("player", user.getPlayerName())
+						.replacePlaceholder("player", "" + user.getPlayerName())
 						.replacePlaceholder("Next", "" + voteCommandNextInfo(user, voteSite)).colorize();
 				sites.add(message.getText());
 			}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Commands/GUI/PlayerGUIs.java

@@ -59,7 +59,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) {
@@ -309,6 +309,7 @@ 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();
@@ -326,25 +327,29 @@ 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", 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,6 +381,49 @@ 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));
+				}
+				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()
@@ -455,17 +503,23 @@ 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);
+				inv.addButton(inv.getNextSlot(),
+						new BInventoryButton(StringParser.getInstance().replacePlaceHolder(
+								Config.getInstance().getGUIVoteTodayIconTitle(), "player", user.getPlayerName()),
+								new String[] { msg }, MiscUtils.getInstance().setSkullOwner(user.getOfflinePlayer())) {
 
-					@Override
-					public void onClick(ClickEvent clickEvent) {
-						User user = UserManager.getInstance()
-								.getVotingPluginUser(clickEvent.getClickedItem().getItemMeta().getDisplayName());
-						openVoteGUI(player, user);
-					}
-				});
+							@Override
+							public void onClick(ClickEvent clickEvent) {
+								User user = UserManager.getInstance().getVotingPluginUser(
+										clickEvent.getClickedItem().getItemMeta().getDisplayName());
+								openVoteGUI(player, user);
+							}
+						});
 			}
 		}
 
@@ -704,6 +758,10 @@ public class PlayerGUIs {
 	}
 
 	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()

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Config/Config.java

@@ -57,6 +57,10 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean commandsVoteRewardFromVoteURL = false;
 
+	@ConfigDataBoolean(path = "ExtraBackgroundUpdate")
+	@Getter
+	private boolean extraBackgroundUpdate = false;
+
 	@ConfigDataString(path = "Format.Commands.Vote.Last.TimeFormat", defaultValue = "%amount% %TimeType%")
 	@Getter
 	private String formatCommandsVoteLastTimeFormat;
@@ -69,9 +73,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,6 +129,10 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean addTotals = true;
 
+	@ConfigDataBoolean(path = "AlterColumns")
+	@Getter
+	private boolean alterColumns = true;
+
 	@Getter
 	private String allSitesRewardPath = "AllSites";
 
@@ -227,9 +235,25 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean disableNoServiceSiteMessage = false;
 
+	@ConfigDataListString(path = "DisabledDefaultPermissions")
+	@Getter
+	private ArrayList<String> disabledDefaultPermissions = new ArrayList<String>();
+
+	@ConfigDataBoolean(path = "VoteParty.ResetExtraVotesMonthly")
+	@Getter
+	private boolean votePartyResetExtraVotesMonthly = false;
+
 	@ConfigDataBoolean(path = "DisableAdvancedTab")
 	@Getter
 	private boolean disableAdvancedTab = false;
+	
+	@ConfigDataBoolean(path = "VoteShopRequireConfirmation")
+	@Getter
+	private boolean voteShopRequireConfirmation = false;
+	
+	@ConfigDataBoolean(path = "Format.Commands.Vote.ForceLinks")
+	@Getter
+	private boolean formatCommandsVoteForceLinks = true;
 
 	@Getter
 	private String firstVoteRewardsPath = "FirstVote";
@@ -304,6 +328,14 @@ 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%";
+
+	@ConfigDataString(path = "GUI.VoteToday.IconTitle")
+	@Getter
+	private String GUIVoteTodayIconTitle = "%player%";
+
 	@ConfigDataBoolean(path = "OverrideVersionDisable")
 	@Getter
 	private boolean overrideVersionDisable = false;
@@ -315,11 +347,19 @@ public class Config extends YMLFile {
 	@ConfigDataBoolean(path = "AllowUnJoinedCheckServer")
 	@Getter
 	private boolean allowUnJoinedCheckServer = true;
+	
+	@ConfigDataBoolean(path = "UseJavascriptPlaceholders")
+	@Getter
+	private boolean useJavascriptPlaceholders = true;
 
 	@ConfigDataListString(path = "DisabledCommands")
 	@Getter
 	private ArrayList<String> disabledCommands = new ArrayList<String>();
 
+	@ConfigDataListString(path = "VotingBroadcastBlacklist")
+	@Getter
+	private ArrayList<String> votingBroadcastBlacklist = new ArrayList<String>();
+
 	@ConfigDataString(path = "BungeeServer.Host")
 	@Getter
 	private String bungeeServerHost = "";
@@ -1315,6 +1355,18 @@ public class Config extends YMLFile {
 	public boolean getVoteShopNotBuyable(String shop) {
 		return getData().getBoolean("Shop." + shop + ".NotBuyable", false);
 	}
+	
+	public boolean getVoteShopResetDaily(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Daily", false);
+	}
+	
+	public boolean getVoteShopResetWeekly(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Weekly", false);
+	}
+	
+	public boolean getVoteShopResetMonthly(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Monthly", false);
+	}
 
 	public String getVoteShopPermission(String ident) {
 		return getData().getString("Shop." + ident + ".Permission", "");

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Config/ConfigVoteSites.java

@@ -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;
@@ -65,6 +68,13 @@ public class ConfigVoteSites extends YMLFile {
 			set(siteName, "Rewards.Messages.Player", "&aThanks for voting on %ServiceSite%!");
 
 			plugin.loadVoteSites();
+
+			for (Player p : Bukkit.getOnlinePlayers()) {
+				if (p.hasPermission("VotingPlugin.Admin.GenerateServiceSite")) {
+					p.sendMessage(StringParser.getInstance().colorize("&cGenerating votesite for service site "
+							+ siteName + ", please check console for details"));
+				}
+			}
 		}
 	}
 
@@ -134,6 +144,10 @@ public class ConfigVoteSites extends YMLFile {
 	public int getVoteDelay(String siteName) {
 		return getData(siteName).getInt("VoteDelay");
 	}
+	
+	public int getVoteDelayMin(String siteName) {
+		return getData(siteName).getInt("VoteDelayMin",0);
+	}
 
 	/**
 	 * Gets the vote site enabled.

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Listeners/VotiferEvent.java

@@ -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);

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Main.java

@@ -137,6 +137,8 @@ public class Main extends AdvancedCorePlugin {
 	@Getter
 	private boolean ymlError = false;
 
+	private boolean votifierLoaded = true;
+
 	/**
 	 * Check votifier.
 	 */
@@ -144,8 +146,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 (!Config.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;
 		}
 	}
 
@@ -284,6 +291,15 @@ public class Main extends AdvancedCorePlugin {
 		return VoteParty.getInstance();
 	}
 
+	public boolean isVoteSite(String voteSite) {
+		for (VoteSite site : getVoteSites()) {
+			if (site.getKey().equalsIgnoreCase(voteSite)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Gets the vote site.
 	 *
@@ -408,6 +424,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);
 
@@ -758,8 +786,8 @@ public class Main extends AdvancedCorePlugin {
 		}
 
 		registerCommands();
-		registerEvents();
 		checkVotifier();
+		registerEvents();
 		CheckUpdate.getInstance().startUp();
 		VoteReminding.getInstance().loadRemindChecking();
 		plugin.signs = new ArrayList<SignHandler>();
@@ -821,7 +849,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)");
@@ -997,7 +1025,11 @@ public class Main extends AdvancedCorePlugin {
 		}, 0);
 		HandlerList.unregisterAll(plugin);
 		if (Config.getInstance().isUseBungeeCoord()) {
-			BungeeHandler.getInstance().close();
+			try {
+				BungeeHandler.getInstance().close();
+			} catch (Exception e) {
+				debug(e);
+			}
 		}
 		plugin = null;
 	}
@@ -1042,7 +1074,9 @@ 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);
@@ -1141,9 +1175,11 @@ public class Main extends AdvancedCorePlugin {
 							ServerData.getInstance().updateValues();
 							Signs.getInstance().updateSigns();
 
-							for (Player player : Bukkit.getOnlinePlayers()) {
-								User user = UserManager.getInstance().getVotingPluginUser(player);
-								user.offVote();
+							if (!Config.getInstance().isExtraBackgroundUpdate()) {
+								for (Player player : Bukkit.getOnlinePlayers()) {
+									User user = UserManager.getInstance().getVotingPluginUser(player);
+									user.offVote();
+								}
 							}
 							time1 = ((System.currentTimeMillis() - time) / 1000);
 							plugin.debug("Background task finished in " + time1 + " seconds");
@@ -1159,6 +1195,15 @@ public class Main extends AdvancedCorePlugin {
 		}
 	}
 
+	public void basicBungeeUpdate() {
+		for (Player player : Bukkit.getOnlinePlayers()) {
+			User user = UserManager.getInstance().getVotingPluginUser(player);
+			user.clearCache();
+			user.offVote();
+			user.checkOfflineRewards();
+		}
+	}
+
 	public void updateAdvancedCoreHook() {
 		getJavascriptEngine().put("VotingPlugin", this);
 		allowDownloadingFromSpigot(15358);

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

@@ -1,8 +1,8 @@
 package com.Ben12345rocks.VotingPlugin.Objects;
 
 import java.time.Instant;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.YearMonth;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -24,7 +24,6 @@ import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
-import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerReceivePointsEvent;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteCoolDownEndEvent;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
@@ -218,31 +217,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;
 
 	}
 
@@ -920,7 +924,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				break;
 			case Monthly:
 				if (Config.getInstance().isLimitMonthlyVotes()) {
-					int days = LocalDate.now().lengthOfMonth();
+					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();
 					}

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

@@ -38,10 +38,17 @@ public class VoteSite {
 	/** The plugin. */
 	static Main plugin = Main.plugin;
 
-	@Getter
 	@Setter
 	private String voteURL;
 
+	public String getVoteURL() {
+		if (!Config.getInstance().isFormatCommandsVoteForceLinks()) {
+			return voteURL;
+		} else {
+			return "[Text=\"" + voteURL + "\",url=\"" + voteURL + "\"]";
+		}
+	}
+
 	@Getter
 	@Setter
 	private String serviceSite;
@@ -58,6 +65,10 @@ public class VoteSite {
 	@Setter
 	private double voteDelay;
 
+	@Getter
+	@Setter
+	private double voteDelayMin;
+
 	@Getter
 	@Setter
 	private boolean enabled;
@@ -120,6 +131,10 @@ public class VoteSite {
 				BungeeHandler.getInstance().sendData("Broadcast", getServiceSite(), user.getPlayerName());
 			} 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);
@@ -128,6 +143,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()) {
@@ -182,6 +198,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);

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/TopVoter/TopVoterHandler.java

@@ -125,106 +125,138 @@ 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 (Config.getInstance().isEnableDailyRewards()) {
+					HashMap<Integer, String> places = handlePlaces(Config.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 (!Config.getInstance().isVoteStreakRequirementUsePercentage() || user.hasPercentageTotal(
+							TopVoter.Monthly, Config.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 (Config.getInstance().isEnableMonthlyAwards()) {
+					HashMap<Integer, String> places = handlePlaces(
+							Config.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 (Config.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 +268,65 @@ 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 (!Config.getInstance().isVoteStreakRequirementUsePercentage() || user.hasPercentageTotal(
+							TopVoter.Weekly, Config.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 (Config.getInstance().isEnableWeeklyAwards()) {
+					HashMap<Integer, String> places = handlePlaces(
+							Config.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,6 +649,8 @@ 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)) {

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Util/PlaceHolders/PlaceHolders.java

@@ -1,6 +1,8 @@
 package com.Ben12345rocks.VotingPlugin.Util.PlaceHolders;
 
+import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.Locale;
 import java.util.Map.Entry;
 
 import org.bukkit.OfflinePlayer;
@@ -63,7 +65,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 +87,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 +242,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

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/VoteParty/VoteParty.java

@@ -231,6 +231,10 @@ public class VoteParty implements Listener {
 		if (Config.getInstance().getVotePartyResetMontly()) {
 			reset();
 		}
+
+		if (Config.getInstance().isVotePartyResetExtraVotesMonthly()) {
+			ServerData.getInstance().setVotePartyExtraRequired(0);
+		}
 	}
 
 	public void register() {

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/Bungee.java

@@ -1,8 +1,10 @@
 package com.Ben12345rocks.VotingPlugin.bungee;
 
+import java.io.File;
 import java.util.HashMap;
 import java.util.List;
 
+import com.Ben12345rocks.AdvancedCore.Util.Encryption.EncryptionHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Sockets.ClientHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketReceiver;
@@ -13,6 +15,7 @@ import lombok.Getter;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 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 {
 
@@ -26,6 +29,8 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 
 	private HashMap<String, ClientHandler> clientHandles;
 
+	private EncryptionHandler encryptionHandler;
+
 	@Override
 	public void onEnable() {
 		getProxy().getPluginManager().registerListener(this, this);
@@ -60,9 +65,10 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 		getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
 
 		getProxy().getPluginManager().registerCommand(this, new VotingPluginBungeeCommand(this));
+		encryptionHandler = new EncryptionHandler(new File(getDataFolder(), "secretkey.key"));
 
-		socketHandler = new SocketHandler(getDescription().getVersion(), config.getBungeeHost(),
-				config.getBungeePort());
+		socketHandler = new SocketHandler(getDescription().getVersion(), config.getBungeeHost(), config.getBungeePort(),
+				encryptionHandler);
 
 		socketHandler.add(new SocketReceiver() {
 
@@ -81,7 +87,8 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 		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)));
+				clientHandles.put(s,
+						new ClientHandler(d.getString("Host", ""), d.getInt("Port", 1298), encryptionHandler));
 			}
 		}
 	}
@@ -90,8 +97,10 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 		config.load();
 	}
 
+	@EventHandler
 	public void onVote(VotifierEvent event) {
 		Vote vote = event.getVote();
+		getLogger().info("Vote received " + vote.getUsername() + " from service site " + vote.getServiceName());
 		saveVote(vote.getUsername(), vote.getServiceName());
 	}
 
@@ -123,10 +132,10 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 				ProxiedPlayer p = getProxy().getPlayer(name);
 
 				String server = "";
-				if (p.isConnected()) {
+				if (p != null && p.isConnected()) {
 					server = p.getServer().getInfo().getName();
 				} else {
-					server = p.getReconnectServer().getName();
+					server = config.getFallBack();
 				}
 				if (config.getBlockedServers().contains(server)) {
 					server = config.getFallBack();
@@ -134,9 +143,7 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 				// mysql.update(uuid, "Proxy_Online", finalData, DataType.STRING);
 				sendServerMessageServer(server, "bungeevoteonline", uuid, name, service);
 				if (config.getBroadcast()) {
-					if (getProxy().getPlayer(name).isConnected()) {
-						sendServerMessage("BungeeBroadcast", service, uuid, name);
-					}
+					sendServerMessage("BungeeBroadcast", service, uuid, name);
 				}
 			}
 		}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/Config.java

@@ -56,7 +56,7 @@ public class Config {
 	}
 
 	public boolean getSendToOnlineServer() {
-		return getData().getBoolean("SendVotesToAllServers");
+		return getData().getBoolean("SendToOnlineServer");
 	}
 
 	public String getBungeeHost() {

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/VotingPluginBungeeCommand.java

@@ -8,24 +8,29 @@ public class VotingPluginBungeeCommand extends Command {
 	private Bungee bungee;
 
 	public VotingPluginBungeeCommand(Bungee bungee) {
-		super("votingpluginbungee", "VotingPlugin.Admin");
+		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.saveVote(user, site);
+						sender.sendMessage(new TextComponent("Sending vote"));
+					}
 				}
 			}
+		} else {
+			sender.sendMessage(new TextComponent("You do not have permission to do this!"));
 		}
 	}
 }