Update build path

Merge pull request #322 from Ben12345rocks/5.12
5.12
2017-12-21 19:40:50 -05:00 · 2017-12-21 19:39:41 -05:00 · 2017-12-21 19:31:51 -05:00 · 2017-12-18 20:13:52 -05:00 · 2017-12-18 16:46:30 -05:00 · 2017-12-17 16:35:13 -05:00
35 changed files with 1893 additions and 1487 deletions
@@ -2,8 +2,11 @@ eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -64,12 +67,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -81,7 +86,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=info
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
@@ -92,6 +97,9 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
@@ -99,6 +107,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
@@ -19,6 +19,12 @@ MySQL:
  Password: ''
  # Max number of connections
  MaxConnections: 1
+  # Maxium size of caching mysql
+  # -1 for no limit
+  # Affecting this value may affect performance
+  MaxSize: -1
+  # Table name prefix, for use with mutliple servers
+  Prefix: ''

 # Let players who never joined before vote
 # Recommend: False (Will prevent creating random user data files)
@@ -104,12 +110,6 @@ Commands:
 # Set Message to '' (2 ') to disable message

 Format:
-  # Message when player tries to run command without required permissions
-  NoPerms: '&cYou do not have enough permission!'
-  
-  # Message when player types a command but does not input a number where needed
-  NotNumber: '&cError on &6%arg%&c, number expected!'
-  
  # CommandHandler help message
  HelpLine: '&3&l%Command% - &3%HelpMessage%'

@@ -156,7 +156,7 @@ Format:
          # If there is an error finding out time until next vote
          Error: '&cCould not caculate time until next vote!'
          # For sites that have this, requires votedelaydaily to be set to true in the site
-          VoteDelayDaily: 'Tomorrow'
+          VoteDelayDaily: '%hours% Hours and %minutes% Minutes'
          
       # Format for /vote last
      Last:
@@ -262,7 +262,22 @@ Format:
  
  # Shop messages when using the /vote shop
  ShopPurchase: '&aYou bought the %Identifier% for %Points% Points!'
-  ShopFailed: '&cYou do not have %Points% points to purhcase this!'
+  ShopFailed: '&cYou do not have %Points% points to purchase this!'
+  
+  # User not exist message, from commands such as /vote next (player)
+  UserNotExist: '&cUser does not exist: %player%'
+  
+  # Text for page buttons in inventories
+  PrevPage: '&aPrevious Page'
+  NextPage: '&aNext Page'
+  
+  # Display text
+  # Used in /vote top (GUI)
+  TopVoter:
+    Daily: 'Daily'
+    Weekly: 'Weekly'
+    Monthly: 'Monthly'
+    AllTime: 'AllTime'

 # ------------------------------------------------
 # GUI Options
@@ -328,15 +343,6 @@ GUI:
        Amount: 1
        Name: '&4Vote Shop'
      Slot: 6
-    # /vote Reward gui item
-    # Uncomment to use, most likely will be unused
-    #Rewards:
-    #  Item:
-    #    Material: 'DIAMOND'
-    #    Data: 0
-    #    Amount: 1
-    #    Name: '&4Voting Rewards'
-    #  Slot: 7
      
  # GUI for /vote url
  # And /vote if enabled in Config.yml
@@ -353,10 +359,16 @@ GUI:
        Material: 'REDSTONE_BLOCK'
        Data: 0 
        Amount: 1
+        Name: '&4All Voting Sites'
+        Lore:
+        - '&cClick Me'
      CanVoteItem:
        Material: 'EMERALD_BLOCK'
        Data: 0
        Amount: 1
+        Name: '&4All Voting Sites'
+        Lore:
+        - '&cClick Me'
    AlreadyVotedItem:
      Material: 'REDSTONE_BLOCK'
      Data: 0 
@@ -365,6 +377,7 @@ GUI:
      Material: 'EMERALD_BLOCK'
      Data: 0
      Amount: 1
+    URLText: '%VoteUrl%'
  # Customize /vote reward
  # Show players what you get when you vote on each site
  VoteReward:
@@ -464,7 +477,7 @@ GUI:
        Lore: '&c&lBest: &c%Best%'
        Amount: 1
  VoteStreak:
-    Name: 'VoteBest: %player%'
+    Name: 'VoteStreak: %player%'
    BackButton: false
    CurrentDayStreak:
      Item:
@@ -507,7 +520,14 @@ GUI:
  VoteGUIName: '&cVoteGUI: &c&l%player%'
  VoteRewardName: 'VoteReward'
  VoteShopName: 'VoteShop'
+  
+BackButton:
+  Material: 'PAPER'
+  Data: 0
+  Amount: 1
+  Name: '&8Back to VoteGUI'

+VoteShopBackButton: true
 Shop:
  # Identifier
  # Used in placeholders for formats
@@ -580,10 +600,16 @@ VoteParty:
  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.
+  Commands: []
  # Reward files to give
  Rewards: []
  
@@ -606,6 +632,7 @@ VoteStreak:
  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':
      # Enabled or not
      Enabled: false
@@ -639,6 +666,7 @@ VoteStreak:
 # IT WILL ONLY RUN ONE TIME FOR ANY NUMBER OF OFFLINE VOTES
 # 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
 AnySiteRewards: []


@@ -678,7 +706,7 @@ EnableMonthlyAwards: true
 MonthlyAwards:
  # Position. 1 is first in top voter, 2 is second, etc...
  1:
-   Rewards:
+    Rewards:
      Messages:
        Player: '&aYou came in first place in %TopVoter%!'
  2:
@@ -722,9 +750,13 @@ DailyAwards:
 # Set to 0 to give no points
 PointsOnVote: 1

-# Wether or not to check on world change
-# Should only be used if you do per world rewards
-CheckOnWorldChange: false
+# Set this to false to disable the plugin adding totals
+# Not really recommended
+AddTotals: true
+
+# Disable checking on world change
+# May improve performance
+DisableCheckOnWorldChange: false

 # Debug
 Debug: false
@@ -762,6 +794,32 @@ LogVotesToFile: false
 # Longer times result in longer wait in stuff updating after a vote, like topvoter
 DelayBetweenUpdates: 3

+# Clear cache on update, setting to true reduces performance
+ClearCacheOnUpdate: false
+
 # Set to true to disable no service site message on voting
 # You should never have to touch this if everything is setup properly
+# Will also disable a few other warnings about vote sites
 DisableNoServiceSiteMessage: false
+
+# Used in special cases
+# Much slower, but may work better
+AlternateUUIDLookup: false
+
+# Shouldn't need to change this
+AutoKillInvs: true
+
+# Count fake votes
+# If true fake votes will give points and totals
+CountFakeVotes: true
+
+# Give VotingPlugin.Player by default
+# Requires restart to take affect
+GiveDefaultPermission: true
+
+# Remove old player files
+# Happens on startup or /av purge
+PurgeOldData: false
+
+# Minimum number of days offline in order to purge
+PurgeMin: 90
@@ -31,18 +31,26 @@ VoteSites:
    # Reset vote delay each day (for certain sites that do this)
    VoteDelayDaily: false
    
-    # If true, rewards can be executed offline (required ForceOffline to be true in the reward)
-    GiveOffline: false
+    # If true, rewards can be executed offline (requires ForceOffline to be true in the reward)
+    # Setting this to true will execute the reward offline, NOT WHEN THE PLAYER IS OFFLINE
+    # This basiclly disables offline voting if set to true, don't misinterpret this option
+    ForceOffline: false
    
    # VoteSite Material for GUI's
+    # Removing this may result in an error, required on each site
    Item:
      Material: 'DIAMOND'
      Amount: 1

-    # List of reward files to give to voter
+    # Rewards to give
+    # https://github.com/Ben12345rocks/AdvancedCore/wiki/Rewards
    Rewards:
-    - 'ExampleReward'
+      Commands:
+      - 'say hello'
+      Messages:
+        Player: 'You voted'
    
 # Reward for any site
 # Similar to AnySiteReward
+# This requires the site to be configured in order to get the reward.
 EverySiteReward: []
@@ -156,10 +156,36 @@ commands:
  adminvoteClearCache:
    description: Command Alias
    aliases: avClearCache
+  adminvoteConvertFrom:
+    description: Command Alias
+    aliases: avConvertFrom
+  adminvoteRemovePoints:
+    description: Command Alias
+    aliases: avRemovePoints
+  adminvoteServiceSites:
+    description: Command Alias
+    aliases: avServiceSites
+  adminvoteSetVotePartyCount:
+    description: Command Alias
+    aliases: avSetVotePartyCount
+  adminvoteClearOfflineVotes:
+    description: Command Alias
+    aliases: avClearOfflineVotes
+  adminvoteGiveAll:
+    description: Command Alias
+    aliases: avGiveAll
+  adminvoteGiveAllOnline:
+    description: Command Alias
+    aliases: avGiveAllOnline
+  adminvoteForceTimeChanged:
+    description: Command Alias
+    aliases: avForceTimeChanged
+  adminvoteplayername:
+    description: Command Alias
+    aliases: avplayername
 permissions:
  VotingPlugin.Player:
    description: Allows basic access player commands
-    default: true
  VotingPlugin.Mod:
    description: Allows mod access player commands
  VotingPlugin.Admin:
@@ -173,4 +199,7 @@ permissions:
    description: Allows access to create signs
  VotingPlugin.TopVoter.Ignore:
    description: Allows you to be exempt from top voter
+  VotingPlugin.NoRemind:
+    description: Ignore vote reminding
+    default: false
  
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.9.4</version>
+	<version>5.12</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -161,7 +161,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.12-R0.1-SNAPSHOT</version>
+			<version>1.12.2-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -25,7 +25,6 @@ import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Scoreboards.SimpleScoreboard;
 import com.Ben12345rocks.VotingPlugin.Main;
-import com.Ben12345rocks.VotingPlugin.Commands.Executers.CommandVote;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
@@ -188,32 +187,105 @@ public class Commands {
 		return ArrayUtils.getInstance().convert(msg);
 	}

-	/**
-	 * List perms.
-	 *
-	 * @return the string[]
-	 */
-	public String[] listPerms() {
+	public String[] listPerms(CommandSender sender) {
 		ArrayList<String> msg = new ArrayList<String>();
+		msg.add("&c&lCommand : Permissions (seperated by |)");

 		for (CommandHandler handle : plugin.voteCommand) {
-			msg.add(handle.getHelpLineCommand("/v") + " : " + handle.getPerm());
+			if (sender instanceof Player) {
+				if (handle.hasPerm(sender)) {
+					msg.add("&a" + handle.getHelpLineCommand("/vote") + " : " + handle.getPerm() + " : true");
+				} else {
+					msg.add("&c" + handle.getHelpLineCommand("/vote") + " : " + handle.getPerm() + " : false");
+				}
+			} else {
+				msg.add(handle.getHelpLineCommand("/vote") + " : " + handle.getPerm());
+			}
+
 		}

 		for (CommandHandler handle : plugin.adminVoteCommand) {
-			msg.add(handle.getHelpLineCommand("/av") + " : " + handle.getPerm());
+			if (sender instanceof Player) {
+				if (handle.hasPerm(sender)) {
+					msg.add("&a" + handle.getHelpLineCommand("/av") + " : " + handle.getPerm() + " : true");
+				} else {
+					msg.add("&c" + handle.getHelpLineCommand("/av") + " : " + handle.getPerm() + " : false");
+				}
+			} else {
+				msg.add(handle.getHelpLineCommand("/av") + " : " + handle.getPerm());
+			}
 		}

 		for (Permission perm : plugin.getDescription().getPermissions()) {
-			msg.add(perm.getName());
+			if (sender instanceof Player) {
+				if (sender.hasPermission(perm)) {
+					msg.add("&a" + perm.getName() + " : true");
+				} else {
+					msg.add("&c" + perm.getName() + " : false");
+				}
+			} else {
+				msg.add(perm.getName());
+			}
 		}

 		msg = ArrayUtils.getInstance().colorize(msg);
-		Collections.sort(msg, String.CASE_INSENSITIVE_ORDER);

 		return ArrayUtils.getInstance().convert(msg);
 	}

+	public void listPerms(CommandSender sender, String player, int page) {
+		Player p = Bukkit.getPlayer(player);
+		if (p != null) {
+
+			ArrayList<String> msg = new ArrayList<String>();
+			ArrayList<String> text = new ArrayList<String>();
+
+			for (CommandHandler handle : plugin.voteCommand) {
+				if (handle.hasPerm(p)) {
+					msg.add("&a" + handle.getHelpLineCommand("/vote") + " : " + handle.getPerm() + " : true");
+				} else {
+					msg.add("&c" + handle.getHelpLineCommand("/vote") + " : " + handle.getPerm() + " : false");
+				}
+
+			}
+
+			for (CommandHandler handle : plugin.adminVoteCommand) {
+				if (handle.hasPerm(p)) {
+					msg.add("&a" + handle.getHelpLineCommand("/av") + " : " + handle.getPerm() + " : true");
+				} else {
+					msg.add("&c" + handle.getHelpLineCommand("/av") + " : " + handle.getPerm() + " : false");
+				}
+			}
+
+			for (Permission perm : plugin.getDescription().getPermissions()) {
+				if (p.hasPermission(perm)) {
+					msg.add("&a" + perm.getName() + " : true");
+				} else {
+					msg.add("&c" + perm.getName() + " : false");
+				}
+			}
+
+			msg = ArrayUtils.getInstance().colorize(msg);
+
+			int pagesize = Config.getInstance().getFormatPageSize();
+
+			int maxPage = msg.size() / pagesize;
+			if ((msg.size() % pagesize) != 0) {
+				maxPage++;
+			}
+
+			text.add("&c&lCommand : Permissions (seperated by |) " + page + "/" + maxPage);
+
+			for (int i = pagesize * page - pagesize; i < msg.size() && i < pagesize * page; i++) {
+				text.add(msg.get(i));
+			}
+			sender.sendMessage(ArrayUtils.getInstance().convert(ArrayUtils.getInstance().colorize(text)));
+		} else {
+			sender.sendMessage(StringUtils.getInstance().colorize("&cPlayer not online: " + player));
+		}
+
+	}
+
 	/**
 	 * Player info.
 	 *
@@ -467,9 +539,6 @@ public class Commands {
 		return ArrayUtils.getInstance().convert(ArrayUtils.getInstance().colorize(msg));
 	}

-	/**
-	 * Update vote today.
-	 */
 	public void updateVoteToday(ArrayList<User> users) {
 		plugin.voteToday.clear();

@@ -527,9 +596,13 @@ public class Commands {
 	 * @return the string
 	 */
 	public String voteCommandLastDate(User user, VoteSite voteSite) {
-		Date date = new Date(user.getTime(voteSite));
-		String timeString = new SimpleDateFormat(config.getFormatTimeFormat()).format(date);
-		return timeString;
+		long time = user.getTime(voteSite);
+		if (time > 0) {
+			Date date = new Date(time);
+			String timeString = new SimpleDateFormat(config.getFormatTimeFormat()).format(date);
+			return timeString;
+		}
+		return "";
 	}

 	public String voteCommandLastLine(User user, VoteSite voteSite) {
@@ -585,13 +658,13 @@ public class Commands {
 		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault());

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

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

 				if (time == 0 || now.isAfter(nextvote)) {
 					info = config.getFormatCommandsVoteNextInfoCanVote();
@@ -611,7 +684,17 @@ public class Commands {
 			}
 		} else {
 			if (lastVote.getDayOfYear() == now.getDayOfYear() && lastVote.getYear() == now.getYear()) {
-				info = config.getFormatCommandsVoteNextInfoVoteDelayDaily();
+				LocalDateTime midnight = LocalDateTime.now().plusDays(1).withHour(0).withMinute(0);
+				Duration dur = Duration.between(now, midnight);
+
+				int diffHours = (int) (dur.getSeconds() / (60 * 60));
+				long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;
+
+				String timeMsg = config.getFormatCommandsVoteNextInfoVoteDelayDaily();
+				timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
+				timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%minutes%", Long.toString(diffMinutes));
+				info = timeMsg;
+
 			} else {
 				info = config.getFormatCommandsVoteNextInfoCanVote();
 			}
@@ -699,9 +782,9 @@ public class Commands {
 		boolean requirePerms = config.getFormatCommandsVoteHelpRequirePermission();

 		for (CommandHandler cmdHandle : plugin.voteCommand) {
-			if (sender.hasPermission(cmdHandle.getPerm()) && requirePerms) {
+			if (cmdHandle.hasPerm(sender)) {
 				unsorted.put(cmdHandle.getHelpLineCommand("/vote"), cmdHandle.getHelpLine("/vote"));
-			} else {
+			} else if (!requirePerms) {
 				unsorted.put(cmdHandle.getHelpLineCommand("/vote"), cmdHandle.getHelpLine("/vote"));
 			}
 		}
@@ -734,19 +817,6 @@ public class Commands {
 		return ArrayUtils.getInstance().convert(msg);
 	}

-	public void voteTop(CommandSender sender, int page) {
-		String str = Config.getInstance().getVoteTopDefault();
-		if (str.equalsIgnoreCase("monthly")) {
-			CommandVote.getInstance().topVoterMonthly(sender, page);
-		} else if (str.equalsIgnoreCase("weekly")) {
-			CommandVote.getInstance().topVoterWeekly(sender, page);
-		} else if (str.equalsIgnoreCase("daily")) {
-			CommandVote.getInstance().topVoterDaily(sender, page);
-		} else {
-
-		}
-	}
-
 	public String[] voteURLs(User user) {
 		ArrayList<String> sites = new ArrayList<String>();

@@ -764,6 +834,7 @@ public class Commands {
 				msg = StringUtils.getInstance().replaceIgnoreCase(msg, "%num%", Integer.toString(counter));
 				msg = StringUtils.getInstance().replaceIgnoreCase(msg, "%url%", voteURL);
 				msg = StringUtils.getInstance().replaceIgnoreCase(msg, "%SiteName%", voteSite.getDisplayName());
+				msg = StringUtils.getInstance().replaceIgnoreCase(msg, "%player%", user.getPlayerName());
 				sites.add(msg);
 			}
 		}
@@ -779,4 +850,5 @@ public class Commands {
 		sites = ArrayUtils.getInstance().colorize(sites);
 		return ArrayUtils.getInstance().convert(sites);
 	}
+
 }
@@ -1,24 +1,14 @@
 package com.Ben12345rocks.VotingPlugin.Commands.Executers;

-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;

 import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Updater.Updater;
 import com.Ben12345rocks.VotingPlugin.Main;
-import com.Ben12345rocks.VotingPlugin.Commands.Commands;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
-import com.Ben12345rocks.VotingPlugin.Objects.User;
-import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
-import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;

 // TODO: Auto-generated Javadoc
 /**
@@ -63,102 +53,6 @@ public class CommandAdminVote implements CommandExecutor {
 		this.plugin = plugin;
 	}

-	/**
-	 * Check update.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void checkUpdate(CommandSender sender) {
-		plugin.updater = new Updater(plugin, 15358, false);
-		final Updater.UpdateResult result = plugin.updater.getResult();
-		switch (result) {
-		case FAIL_SPIGOT: {
-			sender.sendMessage(StringUtils.getInstance()
-					.colorize("&cFailed to check for update for &c&l" + plugin.getName() + "&c!"));
-			break;
-		}
-		case NO_UPDATE: {
-			sender.sendMessage(StringUtils.getInstance().colorize(
-					"&c&l" + plugin.getName() + " &cis up to date! Version: &c&l" + plugin.updater.getVersion()));
-			break;
-		}
-		case UPDATE_AVAILABLE: {
-			sender.sendMessage(StringUtils.getInstance()
-					.colorize("&c&l" + plugin.getName() + " &chas an update available! Your Version: &c&l"
-							+ plugin.getDescription().getVersion() + " &cNew Version: &c&l"
-							+ plugin.updater.getVersion()));
-			break;
-		}
-		default: {
-			break;
-		}
-		}
-	}
-
-	/**
-	 * Check vote site.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param siteName
-	 *            the site name
-	 */
-	public void checkVoteSite(CommandSender sender, String siteName) {
-		if (!ConfigVoteSites.getInstance().isServiceSiteGood(siteName)) {
-			sender.sendMessage(
-					StringUtils.getInstance().colorize("&cServiceSite is invalid, votes may not work properly"));
-		} else {
-			sender.sendMessage(StringUtils.getInstance().colorize("&aServiceSite is properly setup"));
-		}
-		if (!ConfigVoteSites.getInstance().isVoteURLGood(siteName)) {
-			sender.sendMessage(StringUtils.getInstance().colorize("&cVoteURL is invalid"));
-		} else {
-			sender.sendMessage(StringUtils.getInstance().colorize("&aVoteURL is properly setup"));
-		}
-	}
-
-	/**
-	 * Creates the vote site.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param voteSite
-	 *            the vote site
-	 */
-	public void createVoteSite(CommandSender sender, String voteSite) {
-
-		sender.sendMessage(StringUtils.getInstance().colorize("&cCreating VoteSite..."));
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				ConfigVoteSites.getInstance().generateVoteSite(voteSite);
-				sender.sendMessage(StringUtils.getInstance().colorize("&cCreated VoteSite: &c&l" + voteSite));
-			}
-		});
-
-	}
-
-	/**
-	 * Help.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param page
-	 *            the page
-	 */
-	public void help(CommandSender sender, int page) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendJson(Commands.getInstance().adminHelp(sender, page - 1));
-		} else {
-			sender.sendMessage(ArrayUtils.getInstance().convert(
-					ArrayUtils.getInstance().comptoString(Commands.getInstance().adminHelp(sender, page - 1))));
-		}
-
-	}
-
 	/*
 	 * (non-Javadoc)
 	 *
@@ -180,278 +74,4 @@ public class CommandAdminVote implements CommandExecutor {
 		return true;
 	}

-	/**
-	 * Perm list.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void permList(CommandSender sender) {
-
-		sender.sendMessage(Commands.getInstance().listPerms());
-
-	}
-
-	/**
-	 * Reload.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void reload(CommandSender sender) {
-
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				sender.sendMessage(ChatColor.RED + "Reloading " + plugin.getName() + "...");
-				plugin.reload();
-				sender.sendMessage(
-						ChatColor.RED + plugin.getName() + " v" + plugin.getDescription().getVersion() + " reloaded!");
-			}
-		});
-
-	}
-
-	/**
-	 * Reset player totals.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param playerName
-	 *            the player name
-	 */
-	public void resetPlayerTotals(CommandSender sender, String playerName) {
-		sender.sendMessage(StringUtils.getInstance().colorize("&cResseting totals for player &c&l" + playerName));
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				User user = UserManager.getInstance().getVotingPluginUser(playerName);
-				user.resetDailyTotalVotes();
-				user.resetMonthlyTotalVotes();
-				user.resetWeeklyTotalVotes();
-				sender.sendMessage(StringUtils.getInstance().colorize("&cDone resseting totals for &c&l" + playerName));
-				plugin.update();
-			}
-		});
-	}
-
-	/**
-	 * Reset totals.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void resetTotals(CommandSender sender) {
-
-		sender.sendMessage(StringUtils.getInstance().colorize("&cResseting totals for all players..."));
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				TopVoterHandler.getInstance().resetDailyTotals();
-				TopVoterHandler.getInstance().resetMonthlyTotals();
-				TopVoterHandler.getInstance().resetWeeklyTotals();
-				sender.sendMessage(StringUtils.getInstance().colorize("&cDone resseting totals"));
-				plugin.update();
-			}
-		});
-
-	}
-
-	/**
-	 * Sets the config allow unjoined.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param value
-	 *            the value
-	 */
-	public void setConfigAllowUnjoined(CommandSender sender, boolean value) {
-
-		Config.getInstance().setAllowUnJoined(value);
-		sender.sendMessage(StringUtils.getInstance().colorize("&cSet AllowUnjoined to &c&l" + value));
-
-	}
-
-	/**
-	 * Sets the config broadcast vote.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param value
-	 *            the value
-	 */
-	public void setConfigBroadcastVote(CommandSender sender, boolean value) {
-
-		Config.getInstance().setDebugEnabled(value);
-		sender.sendMessage(StringUtils.getInstance().colorize("&cSet BroadcastVote to &c&l" + value));
-
-	}
-
-	/**
-	 * Sets the config debug.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param value
-	 *            the value
-	 */
-	public void setConfigDebug(CommandSender sender, boolean value) {
-
-		Config.getInstance().setDebugEnabled(value);
-		sender.sendMessage(StringUtils.getInstance().colorize("&cSet Debug to &c&l" + value));
-
-	}
-
-	/**
-	 * Sets the config enable top voter awards.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param value
-	 *            the value
-	 */
-	public void setConfigEnableTopVoterAwards(CommandSender sender, boolean value) {
-
-		Config.getInstance().setTopVoterAwardsEnabled(value);
-		sender.sendMessage(StringUtils.getInstance().colorize("&cSet DisableTopVoterAwards to &c&l" + value));
-
-	}
-
-	/**
-	 * Sets the total.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param playerName
-	 *            the player name
-	 * @param amount
-	 *            the amount
-	 */
-	public void setTotal(CommandSender sender, String playerName, int amount) {
-
-		UserManager.getInstance().getVotingPluginUser(playerName).setMonthTotal(amount);
-		sender.sendMessage(ChatColor.GREEN + playerName + " total votes has been set to " + amount);
-		plugin.update();
-
-	}
-
-	/**
-	 * Sets the vote site enabled.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param voteSite
-	 *            the vote site
-	 * @param value
-	 *            the value
-	 */
-	public void setVoteSiteEnabled(CommandSender sender, String voteSite, boolean value) {
-		ConfigVoteSites.getInstance().setEnabled(voteSite, value);
-		sender.sendMessage(StringUtils.getInstance().colorize("&cSet votesite " + voteSite + " enabled to " + value));
-	}
-
-	/**
-	 * Sets the vote site priority.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param voteSite
-	 *            the vote site
-	 * @param value
-	 *            the value
-	 */
-	public void setVoteSitePriority(CommandSender sender, String voteSite, int value) {
-
-		ConfigVoteSites.getInstance().setPriority(voteSite, value);
-		sender.sendMessage(
-				StringUtils.getInstance().colorize("&cSet priortiy to &c&l" + value + "&c on &c&l" + voteSite));
-
-	}
-
-	/**
-	 * Sets the vote site service site.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param voteSite
-	 *            the vote site
-	 * @param serviceSite
-	 *            the service site
-	 */
-	public void setVoteSiteServiceSite(CommandSender sender, String voteSite, String serviceSite) {
-
-		ConfigVoteSites.getInstance().setServiceSite(voteSite, serviceSite);
-		sender.sendMessage(StringUtils.getInstance()
-				.colorize("&cSet ServiceSite to &c&l" + serviceSite + "&c on &c&l" + voteSite));
-
-	}
-
-	/**
-	 * Sets the vote site vote delay.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param voteSite
-	 *            the vote site
-	 * @param delay
-	 *            the delay
-	 */
-	public void setVoteSiteVoteDelay(CommandSender sender, String voteSite, int delay) {
-
-		ConfigVoteSites.getInstance().setVoteDelay(voteSite, delay);
-		sender.sendMessage(
-				StringUtils.getInstance().colorize("&cSet VoteDelay to &c&l" + delay + "&c on &c&l" + voteSite));
-
-	}
-
-	/**
-	 * Sets the vote site vote URL.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param voteSite
-	 *            the vote site
-	 * @param url
-	 *            the url
-	 */
-	public void setVoteSiteVoteURL(CommandSender sender, String voteSite, String url) {
-
-		ConfigVoteSites.getInstance().setVoteURL(voteSite, url);
-		sender.sendMessage(StringUtils.getInstance().colorize("&cSet VoteURL to &c&l" + url + "&c on &c&l" + voteSite));
-
-	}
-
-	/**
-	 * Uuid.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param playerName
-	 *            the player name
-	 */
-	public void uuid(CommandSender sender, String playerName) {
-
-		sender.sendMessage(ChatColor.GREEN + "UUID of player " + ChatColor.DARK_GREEN + playerName + ChatColor.GREEN
-				+ " is: " + PlayerUtils.getInstance().getUUID(playerName));
-
-	}
-
-	/**
-	 * Version.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void version(CommandSender sender) {
-		if (sender instanceof Player) {
-			Player player = (Player) sender;
-			player.performCommand("bukkit:version " + plugin.getName());
-		} else {
-			Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), "bukkit:version " + plugin.getName());
-		}
-	}
-
 }
@@ -23,14 +23,11 @@ public class CommandAliases implements CommandExecutor {
 	/** The cmd handle. */
 	private CommandHandler cmdHandle;

-	/**
-	 * Instantiates a new command aliases.
-	 *
-	 * @param cmdHandle
-	 *            the cmd handle
-	 */
-	public CommandAliases(CommandHandler cmdHandle) {
+	private boolean adminCommand;
+
+	public CommandAliases(CommandHandler cmdHandle, boolean adminCommand) {
 		this.cmdHandle = cmdHandle;
+		this.adminCommand = adminCommand;
 	}

 	/*
@@ -51,10 +48,14 @@ public class CommandAliases implements CommandExecutor {
 		plugin.debug("Attempting cmd...");
 		plugin.debug("Inputed args: " + ArrayUtils.getInstance().makeStringList(argsNew));

-		ArrayList<CommandHandler> cmdHandlers = new ArrayList<CommandHandler>();
-		cmdHandlers.addAll(plugin.voteCommand);
-		cmdHandlers.addAll(plugin.adminVoteCommand);
-		for (CommandHandler cmdHandle : cmdHandlers) {
+		ArrayList<CommandHandler> handles = new ArrayList<CommandHandler>();
+		if (adminCommand) {
+			handles.addAll(plugin.adminVoteCommand);
+		} else {
+			handles.addAll(plugin.voteCommand);
+		}
+
+		for (CommandHandler cmdHandle : handles) {
 			if (cmdHandle.getArgs().length > args.length) {
 				for (String arg : cmdHandle.getArgs()[0].split("&")) {
 					if (cmd.getName().equalsIgnoreCase("vote" + arg)
@@ -81,7 +82,7 @@ public class CommandAliases implements CommandExecutor {
 				}
 			}
 		}
-
+		
 		/*
 		 * for (String arg : cmdHandle.getArgs()[0].split("&")) { argsNew.set(0, arg);
 		 * if (cmdHandle.runCommand(sender, Utils.getInstance().convertArray(argsNew)))
@@ -89,7 +90,11 @@ public class CommandAliases implements CommandExecutor {
 		 */

 		// invalid command
-		sender.sendMessage(ChatColor.RED + "No valid arguments, see /vote help!");
+		if (adminCommand) {
+			sender.sendMessage(ChatColor.RED + "No valid arguments, see /adminvote help!");
+		} else {
+			sender.sendMessage(ChatColor.RED + "No valid arguments, see /vote help!");
+		}
 		return true;
 	}
 }
@@ -1,21 +1,12 @@
 package com.Ben12345rocks.VotingPlugin.Commands.Executers;

-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;

 import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
-import com.Ben12345rocks.VotingPlugin.Commands.Commands;
-import com.Ben12345rocks.VotingPlugin.Config.Config;
-import com.Ben12345rocks.VotingPlugin.Objects.User;
-import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
-import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;

 // TODO: Auto-generated Javadoc
 /**
@@ -54,146 +45,6 @@ public class CommandVote implements CommandExecutor {
 		CommandVote.plugin = plugin;
 	}

-	/**
-	 * Help.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void help(CommandSender sender) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendJson(Commands.getInstance().voteHelpText(sender));
-		} else {
-			sender.sendMessage(ArrayUtils.getInstance()
-					.convert(ArrayUtils.getInstance().comptoString(Commands.getInstance().voteHelpText(sender))));
-		}
-
-	}
-
-	/**
-	 * Info other.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param playerName
-	 *            the player name
-	 */
-	public void infoOther(CommandSender sender, String playerName) {
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				if (sender instanceof Player) {
-					User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-					user.sendMessage(StringUtils.getInstance().colorize("&cGetting player info..."));
-					user.sendMessage(Commands.getInstance()
-							.playerInfo(UserManager.getInstance().getVotingPluginUser(playerName)));
-				} else {
-					sender.sendMessage(ArrayUtils.getInstance().colorize(Commands.getInstance()
-							.playerInfo(UserManager.getInstance().getVotingPluginUser(playerName))));
-				}
-			}
-		});
-
-	}
-
-	/**
-	 * Info self.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void infoSelf(CommandSender sender) {
-		if (sender instanceof Player) {
-			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-				@Override
-				public void run() {
-					User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-					user.sendMessage(StringUtils.getInstance().colorize("&cGetting info..."));
-					user.sendMessage(Commands.getInstance().playerInfo(user));
-				}
-			});
-
-		} else {
-			sender.sendMessage("You must be a player to do this!");
-		}
-	}
-
-	/**
-	 * Last other.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param playerName
-	 *            the player name
-	 */
-	public void lastOther(CommandSender sender, String playerName) {
-
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(
-					Commands.getInstance().voteCommandLast(UserManager.getInstance().getVotingPluginUser(playerName)));
-		} else {
-			sender.sendMessage(ArrayUtils.getInstance().colorize(
-					Commands.getInstance().voteCommandLast(UserManager.getInstance().getVotingPluginUser(playerName))));
-		}
-
-	}
-
-	/**
-	 * Last self.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void lastSelf(CommandSender sender) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(Commands.getInstance().voteCommandLast(user));
-		} else {
-			sender.sendMessage("You must be a player to do this!");
-		}
-	}
-
-	/**
-	 * Next other.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param playerName
-	 *            the player name
-	 */
-	public void nextOther(CommandSender sender, String playerName) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(
-					Commands.getInstance().voteCommandNext(UserManager.getInstance().getVotingPluginUser(playerName)));
-
-		} else {
-			sender.sendMessage(ArrayUtils.getInstance().colorize(
-					Commands.getInstance().voteCommandNext(UserManager.getInstance().getVotingPluginUser(playerName))));
-		}
-
-	}
-
-	/**
-	 * Next self.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void nextSelf(CommandSender sender) {
-		if (sender instanceof Player) {
-			String playerName = sender.getName();
-			User user = UserManager.getInstance().getVotingPluginUser(playerName);
-			user.sendMessage(Commands.getInstance().voteCommandNext(user));
-		} else {
-			sender.sendMessage("You must be a player to do this!");
-		}
-	}
-
 	/*
 	 * (non-Javadoc)
 	 *
@@ -215,220 +66,4 @@ public class CommandVote implements CommandExecutor {
 		return true;
 	}

-	/**
-	 * Points other.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param user
-	 *            the user
-	 */
-	public void pointsOther(CommandSender sender, User user) {
-		String msg = Config.getInstance().getFormatCommandVotePoints().replace("%Player%", user.getPlayerName())
-				.replace("%Points%", "" + user.getPoints());
-		if (sender instanceof Player) {
-			UserManager.getInstance().getVotingPluginUser((Player) sender).sendMessage(msg);
-		} else {
-			sender.sendMessage(StringUtils.getInstance().colorize(msg));
-		}
-
-	}
-
-	/**
-	 * Points self.
-	 *
-	 * @param user
-	 *            the user
-	 */
-	public void pointsSelf(User user) {
-		String msg = Config.getInstance().getFormatCommandVotePoints().replace("%Player%", user.getPlayerName())
-				.replace("%Points%", "" + user.getPoints());
-		user.sendMessage(msg);
-	}
-
-	/**
-	 * Today.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param page
-	 *            the page
-	 */
-	public void today(CommandSender sender, int page) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(Commands.getInstance().commandVoteToday(page));
-			Bukkit.getScheduler().runTask(plugin, new Runnable() {
-
-				@Override
-				public void run() {
-					Commands.getInstance().sendVoteTodayScoreBoard((Player) sender, page);
-				}
-			});
-		} else {
-			sender.sendMessage(Commands.getInstance().commandVoteToday(page));
-		}
-	}
-
-	public void topVoterAll(CommandSender sender, int page) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(TopVoterHandler.getInstance().topVoterAllTime(page));
-			Bukkit.getScheduler().runTask(plugin, new Runnable() {
-
-				@Override
-				public void run() {
-					Commands.getInstance().sendTopVoterAllTimeScoreBoard((Player) sender, page);
-				}
-			});
-		} else {
-			sender.sendMessage(TopVoterHandler.getInstance().topVoterAllTime(page));
-		}
-	}
-
-	/**
-	 * Top voter daily.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param page
-	 *            the page
-	 */
-	public void topVoterDaily(CommandSender sender, int page) {
-
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(TopVoterHandler.getInstance().topVoterDaily(page));
-			Bukkit.getScheduler().runTask(plugin, new Runnable() {
-
-				@Override
-				public void run() {
-					Commands.getInstance().sendTopVoterDailyScoreBoard((Player) sender, page);
-				}
-			});
-		} else {
-			sender.sendMessage(TopVoterHandler.getInstance().topVoterDaily(page));
-		}
-
-	}
-
-	/**
-	 * Top voter monthly.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param page
-	 *            the page
-	 */
-	public void topVoterMonthly(CommandSender sender, int page) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(TopVoterHandler.getInstance().topVoterMonthly(page));
-			Bukkit.getScheduler().runTask(plugin, new Runnable() {
-
-				@Override
-				public void run() {
-					Commands.getInstance().sendTopVoterMonthlyScoreBoard((Player) sender, page);
-				}
-			});
-		} else {
-			sender.sendMessage(TopVoterHandler.getInstance().topVoterMonthly(page));
-		}
-
-	}
-
-	/**
-	 * Top voter weekly.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param page
-	 *            the page
-	 */
-	public void topVoterWeekly(CommandSender sender, int page) {
-
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				if (sender instanceof Player) {
-					User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-					user.sendMessage(TopVoterHandler.getInstance().topVoterWeekly(page));
-					Bukkit.getScheduler().runTask(plugin, new Runnable() {
-
-						@Override
-						public void run() {
-							Commands.getInstance().sendTopVoterWeeklyScoreBoard((Player) sender, page);
-						}
-					});
-				} else {
-					sender.sendMessage(TopVoterHandler.getInstance().topVoterWeekly(page));
-				}
-
-			}
-		});
-
-	}
-
-	/**
-	 * Total all.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void totalAll(CommandSender sender) {
-
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				if (sender instanceof Player) {
-					User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-					user.sendMessage(Commands.getInstance().voteCommandTotalAll());
-
-				} else {
-					sender.sendMessage(Commands.getInstance().voteCommandTotalAll());
-				}
-
-			}
-		});
-
-	}
-
-	/**
-	 * Total other.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param playerName
-	 *            the player name
-	 */
-	public void totalOther(CommandSender sender, String playerName) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(
-					Commands.getInstance().voteCommandTotal(UserManager.getInstance().getVotingPluginUser(playerName)));
-		} else {
-			sender.sendMessage(ArrayUtils.getInstance().colorize(Commands.getInstance()
-					.voteCommandTotal(UserManager.getInstance().getVotingPluginUser(playerName))));
-		}
-
-	}
-
-	/**
-	 * Total self.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void totalSelf(CommandSender sender) {
-		if (sender instanceof Player) {
-			String playerName = sender.getName();
-			User user = UserManager.getInstance().getVotingPluginUser(playerName);
-			user.sendMessage(Commands.getInstance().voteCommandTotal(user));
-		} else {
-			sender.sendMessage("You must be a player to do this!");
-		}
-	}
-
 }
@@ -2,6 +2,7 @@ package com.Ben12345rocks.VotingPlugin.Commands.GUI;

 import java.util.ArrayList;

+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -11,12 +12,16 @@ import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory.ClickEvent;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventoryButton;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
+import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
+import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.InputMethod;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.ValueRequest;
+import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.ValueRequestBuilder;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.Listeners.BooleanListener;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.Listeners.NumberListener;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.Listeners.StringListener;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Events.VotiferEvent;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;

 public class AdminGUI {
@@ -140,53 +145,73 @@ public class AdminGUI {
 	public void openAdminGUIVoteSiteSite(Player player, VoteSite voteSite) {
 		BInventory inv = new BInventory("VoteSite: " + voteSite.getDisplayName());
 		inv.setMeta(player, "VoteSite", voteSite);
-		inv.addButton(inv.getNextSlot(),
-				new BInventoryButton("SetPriority", new String[0], new ItemStack(Material.STONE)) {
+
+		inv.addButton(new BInventoryButton(voteSite.getItem().setName("&cForce vote")) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				ArrayList<String> playerNames = new ArrayList<String>();
+				for (Player p : Bukkit.getOnlinePlayers()) {
+					playerNames.add(p.getName());
+				}
+				new ValueRequestBuilder(new StringListener() {

 					@Override
-					public void onClick(ClickEvent event) {
-						Player player = event.getWhoClicked();
-						new ValueRequest().requestNumber(player, "" + voteSite.getPriority(), null,
-								new NumberListener() {
-
-									@Override
-									public void onInput(Player player, Number value) {
-										VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
-										ConfigVoteSites.getInstance().setPriority(voteSite.getKey(), value.intValue());
-										player.sendMessage("Set Priority");
-										plugin.reload();
-
-									}
-								});
-					}
-				});
-
-		inv.addButton(inv.getNextSlot(),
-				new BInventoryButton("SetServiceSite", new String[0], new ItemStack(Material.STONE)) {
-
-					@Override
-					public void onClick(ClickEvent event) {
-						if (event.getWhoClicked() instanceof Player) {
-							Player player = event.getWhoClicked();
-
-							new ValueRequest().requestString(player, voteSite.getServiceSite(), null,
-									new StringListener() {
-
-										@Override
-										public void onInput(Player player, String value) {
-											VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
-											String siteName = voteSite.getKey();
-											ConfigVoteSites.getInstance().setServiceSite(siteName, value);
-											player.sendMessage("Set ServiceSite");
-											plugin.reload();
-										}
-									});
+					public void onInput(Player player, String value) {
+						Object ob = PlayerUtils.getInstance().getPlayerMeta(player, "VoteSite");
+						if (ob != null) {
+							VoteSite site = (VoteSite) ob;
+							VotiferEvent.playerVote(value, site.getServiceSite(), false);
 						}
+					}
+				}, ArrayUtils.getInstance().convert(playerNames)).usingMethod(InputMethod.INVENTORY)
+						.allowCustomOption(true).request(event.getWhoClicked());
+			}
+		});
+
+		inv.addButton(new BInventoryButton("SetPriority", new String[0], new ItemStack(Material.STONE)) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				Player player = event.getWhoClicked();
+				new ValueRequest().requestNumber(player, "" + voteSite.getPriority(), null, new NumberListener() {
+
+					@Override
+					public void onInput(Player player, Number value) {
+						VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
+						ConfigVoteSites.getInstance().setPriority(voteSite.getKey(), value.intValue());
+						player.sendMessage("Set Priority");
+						plugin.reload();

 					}
 				});
+			}
+		});

-		inv.addButton(inv.getNextSlot(), new BInventoryButton("SetName", new String[0], new ItemStack(Material.STONE)) {
+		inv.addButton(new BInventoryButton("SetServiceSite", new String[0], new ItemStack(Material.STONE)) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				if (event.getWhoClicked() instanceof Player) {
+					Player player = event.getWhoClicked();
+
+					new ValueRequest().requestString(player, voteSite.getServiceSite(), null, new StringListener() {
+
+						@Override
+						public void onInput(Player player, String value) {
+							VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
+							String siteName = voteSite.getKey();
+							ConfigVoteSites.getInstance().setServiceSite(siteName, value);
+							player.sendMessage("Set ServiceSite");
+							plugin.reload();
+						}
+					});
+				}
+
+			}
+		});
+
+		inv.addButton(new BInventoryButton("SetName", new String[0], new ItemStack(Material.STONE)) {

 			@Override
 			public void onClick(ClickEvent event) {
@@ -207,54 +232,51 @@ public class AdminGUI {
 			}
 		});

-		inv.addButton(inv.getNextSlot(),
-				new BInventoryButton("SetVoteURL", new String[0], new ItemStack(Material.STONE)) {
+		inv.addButton(new BInventoryButton("SetVoteURL", new String[0], new ItemStack(Material.STONE)) {

-					@Override
-					public void onClick(ClickEvent event) {
-						if (event.getWhoClicked() instanceof Player) {
-							Player player = event.getWhoClicked();
+			@Override
+			public void onClick(ClickEvent event) {
+				if (event.getWhoClicked() instanceof Player) {
+					Player player = event.getWhoClicked();

-							new ValueRequest().requestString(player, voteSite.getVoteURL(), null, new StringListener() {
+					new ValueRequest().requestString(player, voteSite.getVoteURL(), null, new StringListener() {

-								@Override
-								public void onInput(Player player, String value) {
-									VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
-									String siteName = voteSite.getKey();
-									ConfigVoteSites.getInstance().setVoteURL(siteName, value);
-									player.sendMessage("Set VoteURL");
-									plugin.reload();
-
-								}
-							});
+						@Override
+						public void onInput(Player player, String value) {
+							VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
+							String siteName = voteSite.getKey();
+							ConfigVoteSites.getInstance().setVoteURL(siteName, value);
+							player.sendMessage("Set VoteURL");
+							plugin.reload();

 						}
+					});

-					}
-				});
+				}

-		inv.addButton(inv.getNextSlot(),
-				new BInventoryButton("SetVoteDelay", new String[0], new ItemStack(Material.STONE)) {
+			}
+		});
+
+		inv.addButton(new BInventoryButton("SetVoteDelay", new String[0], new ItemStack(Material.STONE)) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				Player player = event.getWhoClicked();
+				new ValueRequest().requestNumber(player, "" + voteSite.getVoteDelay(), null, new NumberListener() {

 					@Override
-					public void onClick(ClickEvent event) {
-						Player player = event.getWhoClicked();
-						new ValueRequest().requestNumber(player, "" + voteSite.getVoteDelay(), null,
-								new NumberListener() {
-
-									@Override
-									public void onInput(Player player, Number value) {
-										VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
-										String siteName = voteSite.getKey();
-										ConfigVoteSites.getInstance().setVoteDelay(siteName, value.intValue());
-										player.sendMessage("Set VoteDelay");
-										plugin.reload();
-
-									}
-								});
+					public void onInput(Player player, Number value) {
+						VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
+						String siteName = voteSite.getKey();
+						ConfigVoteSites.getInstance().setVoteDelay(siteName, value.intValue());
+						player.sendMessage("Set VoteDelay");
+						plugin.reload();

 					}
 				});
+
+			}
+		});
 		inv.addButton(inv.getNextSlot(),
 				new BInventoryButton("SetEnabled", new String[0], new ItemStack(Material.STONE)) {

@@ -4,8 +4,11 @@ import java.time.format.DateTimeFormatter;
 import java.util.Map.Entry;
 import java.util.Set;

+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 com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
@@ -47,6 +50,14 @@ public class PlayerGUIs {
 	private PlayerGUIs() {
 	}

+	public ItemBuilder getBackButton() {
+		ConfigurationSection sec = Config.getInstance().getBackButton();
+		if (sec != null) {
+			return new ItemBuilder(sec);
+		}
+		return new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI");
+	}
+
 	public User getSelectedPlayer(Player player) {
 		User str = (User) PlayerUtils.getInstance().getPlayerMeta(player, "SelectedPlayerGUIs");
 		return str;
@@ -97,7 +108,7 @@ public class PlayerGUIs {
 				&& !player.hasPermission("VotingPlugin.Mod"))
 				|| (!player.hasPermission("VotingPlugin.Commands.Vote.GUI")
 						&& !player.hasPermission("VotingPlugin.Player"))) {
-			player.sendMessage(AdvancedCoreHook.getInstance().getFormatNoPerms());
+			player.sendMessage(StringUtils.getInstance().colorize(AdvancedCoreHook.getInstance().getFormatNoPerms()));
 			return;
 		}
 		setSelectedPlayer(player, user);
@@ -180,19 +191,18 @@ public class PlayerGUIs {
 		BInventory inv = new BInventory(StringUtils.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteLastName(), "player", user.getPlayerName()));
 		for (VoteSite site : plugin.getVoteSites()) {
-			inv.addButton(inv.getNextSlot(),
-					new BInventoryButton(new ItemBuilder(site.getItem()).setName(site.getDisplayName())
-							.setLore(Commands.getInstance().voteCommandLastLine(user, site)).setAmountNone(1)) {
+			inv.addButton(inv.getNextSlot(), new BInventoryButton(site.getItem().setName(site.getDisplayName())
+					.setLore(Commands.getInstance().voteCommandLastLine(user, site)).setAmountNone(1)) {

-						@Override
-						public void onClick(ClickEvent clickEvent) {
+				@Override
+				public void onClick(ClickEvent clickEvent) {

-						}
-					});
+				}
+			});
 		}

 		if (Config.getInstance().getGUIVoteLastBackButton()) {
-			inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+			inv.addButton(new BInventoryButton(getBackButton()) {

 				@Override
 				public void onClick(ClickEvent event) {
@@ -210,19 +220,18 @@ public class PlayerGUIs {
 		BInventory inv = new BInventory(StringUtils.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteNextName(), "player", user.getPlayerName()));
 		for (VoteSite site : plugin.getVoteSites()) {
-			inv.addButton(inv.getNextSlot(),
-					new BInventoryButton(new ItemBuilder(site.getItem()).setName(site.getDisplayName())
-							.setLore(Commands.getInstance().voteCommandNextInfo(user, site)).setAmountNone(1)) {
+			inv.addButton(inv.getNextSlot(), new BInventoryButton(site.getItem().setName(site.getDisplayName())
+					.setLore(Commands.getInstance().voteCommandNextInfo(user, site)).setAmountNone(1)) {

-						@Override
-						public void onClick(ClickEvent clickEvent) {
+				@Override
+				public void onClick(ClickEvent clickEvent) {

-						}
-					});
+				}
+			});
 		}

 		if (Config.getInstance().getGUIVoteNextBackButton()) {
-			inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+			inv.addButton(new BInventoryButton(getBackButton()) {

 				@Override
 				public void onClick(ClickEvent event) {
@@ -296,7 +305,7 @@ public class PlayerGUIs {
 				});

 		if (Config.getInstance().getGUIVoteStreakBackButton()) {
-			inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+			inv.addButton(new BInventoryButton(getBackButton()) {

 				@Override
 				public void onClick(ClickEvent event) {
@@ -309,6 +318,7 @@ public class PlayerGUIs {
 	}

 	public void openVoteToday(Player player) {
+		setSelectedPlayer(player, null);
 		BInventory inv = new BInventory(Config.getInstance().getGUIVoteTodayName());
 		for (User user : plugin.voteToday.keySet()) {

@@ -317,7 +327,7 @@ public class PlayerGUIs {
 				String timeString = plugin.voteToday.get(user).get(voteSite).format(formatter);
 				String msg = "&6" + user.getPlayerName() + " : " + voteSite.getDisplayName() + " : " + timeString;
 				inv.addButton(inv.getNextSlot(), new BInventoryButton(user.getPlayerName(), new String[] { msg },
-						MiscUtils.getInstance().setSkullOwner(user.getPlayerName())) {
+						MiscUtils.getInstance().setSkullOwner(user.getOfflinePlayer())) {

 					@Override
 					public void onClick(ClickEvent clickEvent) {
@@ -331,7 +341,7 @@ public class PlayerGUIs {
 		}

 		if (Config.getInstance().getGUIVoteTodayBackButton()) {
-			inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+			inv.addButton(new BInventoryButton(getBackButton()) {

 				@Override
 				public void onClick(ClickEvent event) {
@@ -351,16 +361,16 @@ public class PlayerGUIs {
 		Set<Entry<User, Integer>> users = null;
 		String topVoter = "";
 		if (top.equals(TopVoter.Monthly)) {
-			topVoter = "Monthly";
+			topVoter = Config.getInstance().getFormatTopVoterMonthly();
 			users = plugin.topVoterMonthly.entrySet();
 		} else if (top.equals(TopVoter.Weekly)) {
-			topVoter = "Weekly";
+			topVoter = Config.getInstance().getFormatTopVoterWeekly();
 			users = plugin.topVoterWeekly.entrySet();
 		} else if (top.equals(TopVoter.Daily)) {
-			topVoter = "Daily";
+			topVoter = Config.getInstance().getFormatTopVoterDaily();
 			users = plugin.topVoterDaily.entrySet();
 		} else {
-			topVoter = "AllTime";
+			topVoter = Config.getInstance().getFormatTopVoterAllTime();
 			users = plugin.topVoterAllTime.entrySet();
 		}
 		inv = new BInventory(StringUtils.getInstance().replacePlaceHolder(Config.getInstance().getGUIVoteTopName(),
@@ -368,7 +378,7 @@ public class PlayerGUIs {
 		int pos = 1;
 		for (Entry<User, Integer> entry : users) {
 			inv.addButton(new BInventoryButton(
-					new ItemBuilder(MiscUtils.getInstance().setSkullOwner(entry.getKey().getPlayerName()))
+					new ItemBuilder(MiscUtils.getInstance().setSkullOwner(entry.getKey().getOfflinePlayer()))
 							.setName(Config.getInstance().getGUIVoteTopItemName())
 							.addLoreLine(Config.getInstance().getGUIVoteTopItemLore())
 							.addPlaceholder("position", "" + pos)
@@ -377,8 +387,10 @@ public class PlayerGUIs {

 				@Override
 				public void onClick(ClickEvent clickEvent) {
-					User user = UserManager.getInstance()
-							.getVotingPluginUser(clickEvent.getClickedItem().getItemMeta().getDisplayName());
+					ItemBuilder item = new ItemBuilder(clickEvent.getClickedItem());
+					String name = ChatColor.stripColor(item.getName()).split(":")[1].trim();
+
+					User user = UserManager.getInstance().getVotingPluginUser(name);
 					openVoteGUI(player, user);
 				}
 			});
@@ -386,16 +398,20 @@ public class PlayerGUIs {
 		}
 		final TopVoter cur = top;
 		inv.getPageButtons().add(new BInventoryButton(
-				new ItemBuilder(Config.getInstance().getGUIVoteTopSwitchItem()).addPlaceholder("Top", cur.toString())) {
+				new ItemBuilder(Config.getInstance().getGUIVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {

 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				openVoteTop(player, cur.next());
+				if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
+					openVoteTop(player, cur.next());
+				} else {
+					openVoteTop(player, cur.prev());
+				}
 			}
 		});

 		if (Config.getInstance().getGUIVoteTopBackButton()) {
-			inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+			inv.getPageButtons().add(new BInventoryButton(getBackButton().setSlot(1)) {

 				@Override
 				public void onClick(ClickEvent event) {
@@ -446,7 +462,7 @@ public class PlayerGUIs {
 		});

 		if (Config.getInstance().getGUIVoteTotalBackButton()) {
-			inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+			inv.addButton(new BInventoryButton(getBackButton()) {

 				@Override
 				public void onClick(ClickEvent event) {
@@ -464,6 +480,7 @@ public class PlayerGUIs {
 	 *            the player
 	 */
 	public void openVoteURL(Player player) {
+		setSelectedPlayer(player, null);
 		BInventory inv = new BInventory(Config.getInstance().getGUIVoteURLName());

 		User user = UserManager.getInstance().getVotingPluginUser(player);
@@ -476,8 +493,12 @@ public class PlayerGUIs {
 				builderAll = new ItemBuilder(Config.getInstance().getVoteURLCanVoteAllUrlsButtonItemSection());
 			}

-			builderAll.setName("&4All Voting Sites");
-			builderAll.setLore("&cClick Me");
+			if (!builderAll.hasCustomDisplayName()) {
+				builderAll.setName("&4All Voting Sites");
+			}
+			if (!builderAll.hasCustomLore()) {
+				builderAll.setLore("&cClick Me");
+			}

 			inv.addButton(count, new BInventoryButton(builderAll) {

@@ -514,7 +535,12 @@ public class PlayerGUIs {
 					if (player != null) {
 						player.closeInventory();
 						User user = UserManager.getInstance().getVotingPluginUser(player);
-						user.sendMessage(voteSite.getVoteURL());
+						user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
+								StringUtils.getInstance()
+										.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+												Config.getInstance().getGUIVoteURLURLText(), "voteurl",
+												voteSite.getVoteURL()), "sitename", voteSite.getDisplayName()),
+								"player", player.getName()));

 					}

@@ -524,7 +550,7 @@ public class PlayerGUIs {
 		}

 		if (Config.getInstance().getGUIVoteURLBackButton()) {
-			inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+			inv.addButton(new BInventoryButton(getBackButton()) {

 				@Override
 				public void onClick(ClickEvent event) {
@@ -573,7 +599,7 @@ public class PlayerGUIs {
 		});

 		if (Config.getInstance().getGUIVoteURLBackButton()) {
-			inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+			inv.addButton(new BInventoryButton(getBackButton()) {

 				@Override
 				public void onClick(ClickEvent event) {
@@ -603,7 +629,7 @@ public class PlayerGUIs {
 			int count = 0;
 			for (VoteSite voteSite : plugin.getVoteSites()) {
 				try {
-					ItemBuilder builder = new ItemBuilder(voteSite.getItem());
+					ItemBuilder builder = voteSite.getItem();
 					final VoteSite site = voteSite;

 					inv.addButton(count, new BInventoryButton(builder) {
@@ -639,6 +665,7 @@ public class PlayerGUIs {
 								}

 							}
+
 						});
 			}
 		}
@@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;

-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.Objects.TabCompleteHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;

@@ -36,9 +36,8 @@ public class AdminVoteTabCompleter implements TabCompleter {

 		Set<String> cmds = new HashSet<String>();

-		for (CommandHandler cmdHandle : plugin.adminVoteCommand) {
-			cmds.addAll(cmdHandle.getTabCompleteOptions(sender, args, args.length - 1));
-		}
+		cmds.addAll(TabCompleteHandler.getInstance().getTabCompleteOptions(plugin.adminVoteCommand, sender, args,
+				args.length - 1));

 		for (String str : cmds) {
 			if (StringUtils.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
@@ -5,12 +5,14 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;

 import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.Objects.TabCompleteHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -48,8 +50,14 @@ public class AliasesTabCompleter implements TabCompleter {
 		Set<String> cmds = new HashSet<String>();

 		ArrayList<CommandHandler> cmdHandlers = new ArrayList<CommandHandler>();
-		cmdHandlers.addAll(plugin.voteCommand);
-		cmdHandlers.addAll(plugin.adminVoteCommand);
+
+		if (adminCommand) {
+			cmdHandlers.addAll(plugin.adminVoteCommand);
+		} else {
+			cmdHandlers.addAll(plugin.voteCommand);
+		}
+		ConcurrentHashMap<String, ArrayList<String>> tabCompletes = TabCompleteHandler.getInstance()
+				.getTabCompleteOptions();
 		for (CommandHandler cmdHandle : cmdHandlers) {
 			if (cmdHandle.getArgs().length >= argsIn.length) {
 				for (String arg : cmdHandle.getArgs()[0].split("&")) {
@@ -69,7 +77,7 @@ public class AliasesTabCompleter implements TabCompleter {

 						if (argsMatch) {

-							cmds.addAll(cmdHandle.getTabCompleteOptions(sender, args, argsIn.length));
+							cmds.addAll(cmdHandle.getTabCompleteOptions(sender, args, argsIn.length, tabCompletes));
 						}

 					}
@@ -88,16 +96,12 @@ public class AliasesTabCompleter implements TabCompleter {
 		return tab;
 	}

-	/**
-	 * Sets the CMD handle.
-	 *
-	 * @param cmd
-	 *            the cmd
-	 * @return the aliases tab completer
-	 */
-	public AliasesTabCompleter setCMDHandle(CommandHandler cmd) {
+	public AliasesTabCompleter setCMDHandle(CommandHandler cmd, boolean adminCommand) {
 		cmdHandle = cmd;
+		this.adminCommand = adminCommand;
 		return this;
 	}

+	private boolean adminCommand;
+
 }
@@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;

-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.Objects.TabCompleteHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;

@@ -33,29 +33,22 @@ public class VoteTabCompleter implements TabCompleter {
 	@Override
 	public List<String> onTabComplete(CommandSender sender, Command cmd, String alias, String[] args) {

-		if (cmd.getName().equalsIgnoreCase("vote") || cmd.getName().equalsIgnoreCase("v")) {
+		ArrayList<String> tab = new ArrayList<String>();

-			ArrayList<String> tab = new ArrayList<String>();
+		Set<String> cmds = new HashSet<String>();

-			Set<String> cmds = new HashSet<String>();
+		cmds.addAll(TabCompleteHandler.getInstance().getTabCompleteOptions(plugin.voteCommand, sender, args,
+				args.length - 1));

-			for (CommandHandler cmdHandle : plugin.voteCommand) {
-				cmds.addAll(cmdHandle.getTabCompleteOptions(sender, args, args.length - 1));
+		for (String str : cmds) {
+			if (StringUtils.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
+				tab.add(str);
 			}
-
-			for (String str : cmds) {
-				if (StringUtils.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
-					tab.add(str);
-				}
-			}
-
-			Collections.sort(tab, String.CASE_INSENSITIVE_ORDER);
-
-			return tab;
-
 		}
-		return null;

+		Collections.sort(tab, String.CASE_INSENSITIVE_ORDER);
+
+		return tab;
 	}

 }
@@ -46,10 +46,6 @@ public class Config extends YMLFile {
 	public boolean allowUnJoined() {
 		return getData().getBoolean("AllowUnjoined");
 	}
-	
-	public boolean getGUIVoteLastBackButton() {
-		return getData().getBoolean("GUI.VoteLast.BackButton");
-	}

 	/**
 	 * Gets the all sites reward.
@@ -60,6 +56,10 @@ public class Config extends YMLFile {
 		return "AllSites";
 	}

+	public boolean getAlternateUUIDLookup() {
+		return getData().getBoolean("AlternateUUIDLookup");
+	}
+
 	/**
 	 * Gets the rewards.
 	 *
@@ -83,6 +83,14 @@ public class Config extends YMLFile {
 		return getData().getBoolean("AutoDownload");
 	}

+	public boolean getAutoKillInvs() {
+		return getData().getBoolean("AutoKillInvs", true);
+	}
+
+	public ConfigurationSection getBackButton() {
+		return getData().getConfigurationSection("BackButton");
+	}
+
 	/**
 	 * Gets the black list.
 	 *
@@ -102,8 +110,12 @@ public class Config extends YMLFile {
 		return getData().getBoolean("BroadcastVote", true);
 	}

-	public boolean getCheckOnWorldChange() {
-		return getData().getBoolean("CheckOnWorldChange");
+	public boolean getDisableCheckOnWorldChange() {
+		return getData().getBoolean("DisableCheckOnWorldChange");
+	}
+
+	public boolean getClearCacheOnUpdate() {
+		return getData().getBoolean("ClearCacheOnUpdate");
 	}

 	public boolean getCommandsUseGUIBest() {
@@ -138,6 +150,10 @@ public class Config extends YMLFile {
 		return getData().getBoolean("Commands.UseGUI.Vote", true);
 	}

+	public boolean getCountFakeVotes() {
+		return getData().getBoolean("CountFakeVotes", true);
+	}
+
 	/**
 	 * Gets the cumulative reward enabled.
 	 *
@@ -383,7 +399,8 @@ public class Config extends YMLFile {
 	}

 	public String getFormatCommandsVoteNextInfoVoteDelayDaily() {
-		return getData().getString("Format.Commands.Vote.Next.Info.VoteDelayDaily", "Tomorrow");
+		return getData().getString("Format.Commands.Vote.Next.Info.VoteDelayDaily",
+				"%hours% Hours and %minutes% Minutes");
 	}

 	/**
@@ -515,6 +532,10 @@ public class Config extends YMLFile {
 		return getData().getString("Format.HelpLine", "&3&l%Command% - &3%HelpMessage%");
 	}

+	public String getFormatNextPage() {
+		return getData().getString("Format.NextPage", "&aNext Page");
+	}
+
 	/**
 	 * Gets the format no perms.
 	 *
@@ -537,6 +558,10 @@ public class Config extends YMLFile {
 		return 10;
 	}

+	public String getFormatPrevPage() {
+		return getData().getString("Format.PrevPage", "&aPrevious Page");
+	}
+
 	public String getFormatShopFailedMsg() {
 		String msg = getData().getString("Format.ShopFailed", "&cYou do not have %Points% points to purhcase this!");

@@ -609,6 +634,18 @@ public class Config extends YMLFile {

 	}

+	public String getFormatTopVoterAllTime() {
+		return getData().getString("Format.TopVoter.AllTime", "AllTime");
+	}
+
+	public String getFormatTopVoterDaily() {
+		return getData().getString("Format.TopVoter.Daily", "Daily");
+	}
+
+	public String getFormatTopVoterMonthly() {
+		return getData().getString("Format.TopVoter.Monthly", "Monthly");
+	}
+
 	/**
 	 * Gets the top voter reward msg.
 	 *
@@ -620,6 +657,10 @@ public class Config extends YMLFile {

 	}

+	public String getFormatTopVoterWeekly() {
+		return getData().getString("Format.TopVoter.Weekly", "Weekly");
+	}
+
 	/**
 	 * Gets the vote help.
 	 *
@@ -650,10 +691,18 @@ public class Config extends YMLFile {
 		return getData().getString("GUI.VoteGUIName", "&cVoteGUI: &c&l%player%");
 	}

+	public boolean getGUIVoteLastBackButton() {
+		return getData().getBoolean("GUI.VoteLast.BackButton");
+	}
+
 	public String getGUIVoteLastName() {
 		return getData().getString("GUI.VoteLast.Name", "VoteLast: %player%");
 	}

+	public boolean getGUIVoteNextBackButton() {
+		return getData().getBoolean("GUI.VoteNext.BackButton");
+	}
+
 	public String getGUIVoteNextName() {
 		return getData().getString("GUI.VoteNext.Name", "VoteNext: %player%");
 	}
@@ -662,6 +711,10 @@ public class Config extends YMLFile {
 		return getData().getString("GUI.VoteRewardName", "VoteReward");
 	}

+	public boolean getGUIVoteStreakBackButton() {
+		return getData().getBoolean("GUI.VoteStreak.BackButton");
+	}
+
 	public ConfigurationSection getGUIVoteStreakCurrentDayStreakItem() {
 		return getData().getConfigurationSection("GUI.VoteStreak.CurrentDayStreak.Item");
 	}
@@ -690,10 +743,18 @@ public class Config extends YMLFile {
 		return getData().getString("GUI.VoteStreak.Name", "VoteStreak");
 	}

+	public boolean getGUIVoteTodayBackButton() {
+		return getData().getBoolean("GUI.VoteToday.BackButton");
+	}
+
 	public String getGUIVoteTodayName() {
 		return getData().getString("GUI.VoteToday.Name", "VoteToday");
 	}

+	public boolean getGUIVoteTopBackButton() {
+		return getData().getBoolean("GUI.VoteToday.BackButton");
+	}
+
 	public String getGUIVoteTopItemLore() {
 		return getData().getString("GUI.VoteTop.Item.Lore", "&3&lVotes: &3%votes%");
 	}
@@ -718,6 +779,10 @@ public class Config extends YMLFile {
 		return getData().getConfigurationSection("GUI.VoteTotal.AllTimeTotal.Item");
 	}

+	public boolean getGUIVoteTotalBackButton() {
+		return getData().getBoolean("GUI.VoteTotal.BackButton");
+	}
+
 	public ConfigurationSection getGUIVoteTotalDayTotalItem() {
 		return getData().getConfigurationSection("GUI.VoteTotal.DayTotal.Item");
 	}
@@ -734,10 +799,18 @@ public class Config extends YMLFile {
 		return getData().getConfigurationSection("GUI.VoteTotal.WeekTotal.Item");
 	}

+	public boolean getGUIVoteURLBackButton() {
+		return getData().getBoolean("GUI.VoteURL.BackButton");
+	}
+
 	public String getGUIVoteURLName() {
 		return getData().getString("GUI.VoteURL.Name", "&cVoteURL");
 	}

+	public String getGUIVoteURLURLText() {
+		return getData().getString("GUI.VoteURL.URLText", "%VoteUrl%");
+	}
+
 	public String getGUIVoteURLSiteName() {
 		return getData().getString("GUI.VoteURLSite.Name", "VoteSite %site%");
 	}
@@ -882,32 +955,8 @@ public class Config extends YMLFile {
 		}
 	}

-	public String getMySqlDatabase() {
-		return getData().getString("MySQL.Database", "");
-	}
-
-	public String getMySqlHost() {
-		return getData().getString("MySQL.Host", "");
-	}
-
-	public int getMySqlMaxConnections() {
-		return getData().getInt("MySQL.MaxConnections", 1);
-	}
-
-	public String getMySqlPassword() {
-		return getData().getString("MySQL.Password", "");
-	}
-
-	public int getMySqlPort() {
-		return getData().getInt("MySQL.Port");
-	}
-
-	public boolean getMySqlPreloadTable() {
-		return getData().getBoolean("MySQL.PreLoadTable");
-	}
-
-	public String getMySqlUsername() {
-		return getData().getString("MySQL.Username", "");
+	public ConfigurationSection getMySql() {
+		return getData().getConfigurationSection("MySQL");
 	}

 	public int getPointsOnVote() {
@@ -1037,6 +1086,10 @@ public class Config extends YMLFile {
 		return getData().getString("VoteParty.Broadcast", "");
 	}

+	public boolean getVotePartyCountFakeVotes() {
+		return getData().getBoolean("VoteParty.CountFakeVotes", true);
+	}
+
 	/**
 	 * Gets the vote party enabled.
 	 *
@@ -1059,6 +1112,14 @@ public class Config extends YMLFile {
 		return getData().getBoolean("VoteParty.ResetEachDay");
 	}

+	public boolean getAddTotals() {
+		return getData().getBoolean("AddTotals", true);
+	}
+
+	public boolean getVotePartyResetMontly() {
+		return getData().getBoolean("VoteParty.ResetMonthly");
+	}
+
 	/**
 	 * Gets the vote party rewards.
 	 *
@@ -1068,6 +1129,11 @@ public class Config extends YMLFile {
 		return "VoteParty.Rewards";
 	}

+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getVotePartyCommands() {
+		return (ArrayList<String>) getData().getList("VoteParty.Commands", new ArrayList<String>());
+	}
+
 	/**
 	 * Gets the vote party votes required.
 	 *
@@ -1122,10 +1188,30 @@ public class Config extends YMLFile {
 		return "VoteReminding.Rewards";
 	}

+	public boolean getVoteShopBackButton() {
+		return getData().getBoolean("VoteShopBackButton", true);
+	}
+
+	public boolean getGiveDefaultPermission() {
+		return getData().getBoolean("GiveDefaultPermission", true);
+	}
+
 	public String getVoteShopName() {
 		return getData().getString("GUI.VoteShopName", "VoteShop");
 	}

+	public String getFormatUserNotExist() {
+		return getData().getString("Format.UserNotExist", "&cUser does not exist: %player%");
+	}
+
+	public boolean getPurgeOldData() {
+		return getData().getBoolean("PurgeOldData");
+	}
+
+	public int getPurgeMin() {
+		return getData().getInt("PurgeMin", 90);
+	}
+
 	/**
 	 * Gets the vote site items.
 	 *
@@ -1170,12 +1256,12 @@ public class Config extends YMLFile {
 		return getData().getInt("VotesRequired");
 	}

-	public boolean getVoteStreakRewardEnabled(String type, int votestreak) {
-		return getData().getBoolean("VoteStreak." + type + "." + votestreak + ".Enabled");
+	public boolean getVoteStreakRewardEnabled(String type, String s) {
+		return getData().getBoolean("VoteStreak." + type + "." + s + ".Enabled");
 	}

-	public String getVoteStreakRewardsPath(String type, int votestreak) {
-		return "VoteStreak." + type + "." + votestreak + ".Rewards";
+	public String getVoteStreakRewardsPath(String type, String string) {
+		return "VoteStreak." + type + "." + string + ".Rewards";
 	}

 	public Set<String> getVoteStreakVotes(String type) {
@@ -1384,28 +1470,4 @@ public class Config extends YMLFile {
 		saveData();
 	}

-	public boolean getGUIVoteStreakBackButton() {
-		return getData().getBoolean("GUI.VoteStreak.BackButton");
-	}
-	
-	public boolean getGUIVoteNextBackButton() {
-		return getData().getBoolean("GUI.VoteNext.BackButton");
-	}
-	
-	public boolean getGUIVoteTodayBackButton() {
-		return getData().getBoolean("GUI.VoteToday.BackButton");
-	}
-	
-	public boolean getGUIVoteTopBackButton() {
-		return getData().getBoolean("GUI.VoteToday.BackButton");
-	}
-	
-	public boolean getGUIVoteTotalBackButton() {
-		return getData().getBoolean("GUI.VoteTotal.BackButton");
-	}
-	
-	public boolean getGUIVoteURLBackButton() {
-		return getData().getBoolean("GUI.VoteURL.BackButton");
-	}
-
 }
@@ -60,6 +60,8 @@ 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, "Rewards.Messages.Player", "&aThanks for voting on %ServiceSite%!");

 			plugin.loadVoteSites();
@@ -167,7 +169,7 @@ public class ConfigVoteSites extends YMLFile {
 	}

 	public boolean getVoteSiteGiveOffline(String site) {
-		return getData(site).getBoolean("GiveOffline");
+		return getData(site).getBoolean("ForceOffline", getData(site).getBoolean("GiveOffline"));
 	}

 	public boolean getVoteSiteResetVoteDelayDaily(String siteName) {
@@ -1,5 +1,6 @@
 package com.Ben12345rocks.VotingPlugin.Data;

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

@@ -7,6 +8,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.configuration.ConfigurationSection;

+import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Objects.SignHandler;

@@ -47,6 +49,14 @@ public class ServerData {
 		ServerData.plugin = plugin;
 	}

+	public void addServiceSite(String site) {
+		ArrayList<String> l = getServiceSites();
+		if (!getServiceSites().contains(site)) {
+			l.add(site);
+		}
+		setServiceSites(ArrayUtils.getInstance().removeDuplicates(l));
+	}
+
 	/**
 	 * Adds the sign.
 	 *
@@ -88,6 +98,11 @@ public class ServerData {
 		return data;
 	}

+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getServiceSites() {
+		return (ArrayList<String>) getData().getList("ServiceSites", new ArrayList<String>());
+	}
+
 	/**
 	 * Gets the sign data.
 	 *
@@ -185,6 +200,11 @@ public class ServerData {
 		com.Ben12345rocks.AdvancedCore.Data.ServerData.getInstance().saveData();
 	}

+	public void setServiceSites(ArrayList<String> list) {
+		getData().set("ServiceSites", list);
+		saveData();
+	}
+
 	/**
 	 * Sets the sign.
 	 *
@@ -53,14 +53,18 @@ public class PlayerJoinEvent implements Listener {

 				if (player != null) {
 					User user = UserManager.getInstance().getVotingPluginUser(player);
-					if (UserManager.getInstance().getAllUUIDs().contains(player.getUniqueId().toString())) {
-						// give offline vote (if they voted
-						// offline)
-						user.offVote();
-					}

 					// run remind
 					user.loginMessage();
+
+					if (UserManager.getInstance().getAllUUIDs().contains(player.getUniqueId().toString())) {
+						// give offline vote (if they voted
+						// offline)
+
+						user.offVote();
+
+					}
+
 				}

 			}
@@ -0,0 +1,80 @@
+package com.Ben12345rocks.VotingPlugin.Events;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.Ben12345rocks.VotingPlugin.Objects.User;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class PlayerVoteEvent.
+ */
+public class PlayerVoteAllSitesEvent extends Event {
+
+	/** The Constant handlers. */
+	private static final HandlerList handlers = new HandlerList();
+
+	/**
+	 * Gets the handler list.
+	 *
+	 * @return the handler list
+	 */
+	public static HandlerList getHandlerList() {
+		return handlers;
+	}
+
+	private User user;
+
+	/** The cancelled. */
+	private boolean cancelled;
+
+	public PlayerVoteAllSitesEvent(User user) {
+		super();
+		setUser(user);
+	}
+
+	/**
+	 * @return the user
+	 */
+	public User getUser() {
+		return user;
+	}
+
+	/**
+	 * @param user
+	 *            the user to set
+	 */
+	public void setUser(User user) {
+		this.user = user;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.bukkit.event.Event#getHandlers()
+	 */
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+	/**
+	 * Checks if is cancelled.
+	 *
+	 * @return true, if is cancelled
+	 */
+	public boolean isCancelled() {
+		return cancelled;
+	}
+
+	/**
+	 * Sets the cancelled.
+	 *
+	 * @param bln
+	 *            the new cancelled
+	 */
+	public void setCancelled(boolean bln) {
+		cancelled = bln;
+	}
+
+}
@@ -3,7 +3,6 @@ package com.Ben12345rocks.VotingPlugin.Events;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;

-import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;

 // TODO: Auto-generated Javadoc
@@ -25,7 +24,7 @@ public class PlayerVoteEvent extends Event {
 	}

 	/** The player. */
-	private User player;
+	private String player;

 	/** The vote site. */
 	private VoteSite voteSite;
@@ -33,17 +32,9 @@ public class PlayerVoteEvent extends Event {
 	/** The cancelled. */
 	private boolean cancelled;

-	/**
-	 * Instantiates a new player vote event.
-	 *
-	 * @param voteSite
-	 *            the vote site
-	 * @param player
-	 *            the player
-	 */
-	public PlayerVoteEvent(VoteSite voteSite, User player) {
+	public PlayerVoteEvent(VoteSite voteSite, String voteUsername) {
 		super();
-		setPlayer(player);
+		setPlayer(voteUsername);
 		setVoteSite(voteSite);
 	}

@@ -62,7 +53,7 @@ public class PlayerVoteEvent extends Event {
 	 *
 	 * @return the player
 	 */
-	public User getPlayer() {
+	public String getPlayer() {
 		return player;
 	}

@@ -94,14 +85,8 @@ public class PlayerVoteEvent extends Event {
 		cancelled = bln;
 	}

-	/**
-	 * Sets the player.
-	 *
-	 * @param player
-	 *            the new player
-	 */
-	public void setPlayer(User player) {
-		this.player = player;
+	public void setPlayer(String voteUsername) {
+		this.player = voteUsername;
 	}

 	/**
@@ -0,0 +1,60 @@
+package com.Ben12345rocks.VotingPlugin.Events;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class PlayerVoteEvent.
+ */
+public class VotePartyEvent extends Event {
+
+	/** The Constant handlers. */
+	private static final HandlerList handlers = new HandlerList();
+
+	/**
+	 * Gets the handler list.
+	 *
+	 * @return the handler list
+	 */
+	public static HandlerList getHandlerList() {
+		return handlers;
+	}
+
+	/** The cancelled. */
+	private boolean cancelled;
+
+	public VotePartyEvent() {
+		super();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.bukkit.event.Event#getHandlers()
+	 */
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+	/**
+	 * Checks if is cancelled.
+	 *
+	 * @return true, if is cancelled
+	 */
+	public boolean isCancelled() {
+		return cancelled;
+	}
+
+	/**
+	 * Sets the cancelled.
+	 *
+	 * @param bln
+	 *            the new cancelled
+	 */
+	public void setCancelled(boolean bln) {
+		cancelled = bln;
+	}
+
+}
@@ -7,9 +7,12 @@ 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.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Data.ServerData;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
 import com.Ben12345rocks.VotingPlugin.OtherRewards.OtherVoteReward;
@@ -33,78 +36,88 @@ public class VotiferEvent implements Listener {
 	/** The plugin. */
 	static Main plugin = Main.plugin;

-	/**
-	 * Player vote.
-	 *
-	 * @param playerName
-	 *            the player name
-	 * @param voteSiteURL
-	 *            the vote site URL
-	 */
+	private static Object object = new Object();
+
 	public static void playerVote(final String playerName, final String voteSiteURL) {
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-			@Override
-			public void run() {
-				synchronized (configVoteSites) {
-					User user = UserManager.getInstance().getVotingPluginUser(playerName);
-					if (!user.hasLoggedOnBefore() && !config.allowUnJoined()) {
-						plugin.getLogger().warning("Player " + playerName
-								+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
-						return;
-					}
+		playerVote(playerName, voteSiteURL, true);
+	}

-					VoteSite voteSite = plugin.getVoteSite(voteSiteURL);
-					if (voteSite == null) {
-						if (!Config.getInstance().getDisableNoServiceSiteMessage()) {
-							plugin.getLogger().warning("No voting site with the service site: '" + voteSiteURL + "'");
-						}
-						return;
-					}
+	public static void playerVote(final String playerName, final String voteSiteURL, final boolean realVote) {

-					// vote party
-					if (Config.getInstance().getVotePartyEnabled()) {
-						VoteParty.getInstance().addTotal(user);
-						VoteParty.getInstance().addVotePlayer(user);
-						VoteParty.getInstance().check();
-					}
+		if (!PlayerUtils.getInstance().isValidUser(playerName) && !config.allowUnJoined()) {
+			plugin.getLogger().warning("Player " + playerName
+					+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
+			return;
+		}

-					// broadcast vote if enabled in config
-					if (config.getBroadCastVotesEnabled()) {
-						if (!Config.getInstance().getFormatBroadcastWhenOnline() || user.isOnline()) {
-							voteSite.broadcastVote(user);
-						}
-					}
+		User user = UserManager.getInstance().getVotingPluginUser(playerName);

-					// update last vote time
-					user.setTime(voteSite);
+		VoteSite voteSite = plugin.getVoteSite(voteSiteURL);
+		if (voteSite == null) {
+			if (!Config.getInstance().getDisableNoServiceSiteMessage()) {
+				plugin.getLogger().warning("No voting site with the service site: '" + voteSiteURL + "'");
+				plugin.getLogger().warning(
+						"Please read here on how to fix it: https://github.com/Ben12345rocks/VotingPlugin/wiki/Common-Problems");

-					OtherVoteReward.getInstance().checkFirstVote(user);
+				ArrayList<String> services = new ArrayList<String>();
+				for (VoteSite site : plugin.getVoteSites()) {
+					services.add(site.getServiceSite());
+				}
+				plugin.getLogger()
+						.warning("Current service sites: " + ArrayUtils.getInstance().makeStringList(services));
+			}
+			return;
+		}

-					// add to total votes
+		synchronized (object) {
+
+			// vote party
+			VoteParty.getInstance().vote(user, realVote);
+
+			// broadcast vote if enabled in config
+			if (config.getBroadCastVotesEnabled()) {
+				if (!Config.getInstance().getFormatBroadcastWhenOnline() || user.isOnline()) {
+					voteSite.broadcastVote(user);
+				}
+			}
+
+			// update last vote time
+			user.setTime(voteSite);
+
+			OtherVoteReward.getInstance().checkFirstVote(user);
+
+			if (user.isReminded()) {
+				user.setReminded(false);
+			}
+
+			// check if player has voted on all sites in one day
+
+			if (user.isOnline() || voteSite.isGiveOffline()) {
+				user.playerVote(voteSite, true, false);
+				user.closeInv();
+			} else {
+				user.addOfflineVote(voteSite.getKey());
+				// plugin.debug(ArrayUtils.getInstance().makeStringList(user.getOfflineVotes()));
+				plugin.debug(
+						"Offline vote set for " + playerName + " (" + user.getUUID() + ") on " + voteSite.getKey());
+			}
+
+			// add to total votes
+			if (Config.getInstance().getCountFakeVotes() || realVote) {
+				if (Config.getInstance().getAddTotals()) {
 					user.addTotal();
 					user.addTotalDaily();
 					user.addTotalWeekly();
-					user.addPoints();
-
-					user.setReminded(false);
-
-					// check if player has voted on all sites in one day
-
-					OtherVoteReward.getInstance().checkAllSites(user);
-					OtherVoteReward.getInstance().checkCumualativeVotes(user);
-					OtherVoteReward.getInstance().checkMilestone(user);
-
-					if (user.isOnline() || voteSite.isGiveOffline()) {
-						user.playerVote(voteSite, true, false);
-					} else {
-						user.addOfflineVote(voteSite.getKey());
-						plugin.debug("Offline vote set for " + playerName + " on " + voteSite.getKey());
-					}
-
-					plugin.setUpdate(true);
 				}
+				user.addPoints();
 			}
-		});
+
+			OtherVoteReward.getInstance().checkAllSites(user);
+			OtherVoteReward.getInstance().checkCumualativeVotes(user);
+			OtherVoteReward.getInstance().checkMilestone(user);
+		}
+
+		plugin.setUpdate(true);

 	}

@@ -129,7 +142,8 @@ public class VotiferEvent implements Listener {

 		Vote vote = event.getVote();
 		final String voteSite = vote.getServiceName();
-		final String voteUsername = vote.getUsername();
+		final String voteUsername = vote.getUsername().trim();
+		ServerData.getInstance().addServiceSite(voteSite);

 		if (voteUsername.length() == 0) {
 			plugin.getLogger().warning("No name from vote on " + voteSite);
@@ -147,14 +161,6 @@ public class VotiferEvent implements Listener {
 			public void run() {
 				String voteSiteName = plugin.getVoteSiteName(voteSite);

-				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName),
-						UserManager.getInstance().getVotingPluginUser(voteUsername));
-				plugin.getServer().getPluginManager().callEvent(voteEvent);
-
-				if (voteEvent.isCancelled()) {
-					return;
-				}
-
 				ArrayList<String> sites = configVoteSites.getVoteSitesNames();
 				if (sites != null) {
 					if (!sites.contains(voteSiteName) && Config.getInstance().getAutoCreateVoteSites()) {
@@ -167,7 +173,14 @@ public class VotiferEvent implements Listener {
 					ConfigVoteSites.getInstance().generateVoteSite(voteSiteName);
 				}

-				playerVote(voteUsername, voteSite);
+				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName), voteUsername);
+				plugin.getServer().getPluginManager().callEvent(voteEvent);
+
+				if (voteEvent.isCancelled()) {
+					return;
+				}
+
+				playerVote(voteUsername, voteSite, true);

 			}
 		});
@@ -36,7 +36,8 @@ public class VotingPluginUpdateEvent implements Listener {
 	public void onPluginUpdate(PluginUpdateVersionEvent event) {
 		if (event.getPlugin().getName().equals(plugin.getDescription().getName())) {
 			if (!event.getOldVersion().equals("")) {
-				plugin.getLogger().info("Updated VotingPlugin");
+				plugin.getLogger().info("VotingPlugin Updated to " + plugin.getDescription().getVersion() + " from "
+						+ event.getOldVersion());
 			}
 		}
 	}
@@ -8,6 +8,7 @@ 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;
@@ -16,7 +17,10 @@ import java.util.TimerTask;

 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;

@@ -30,7 +34,6 @@ import com.Ben12345rocks.AdvancedCore.Util.Javascript.JavascriptPlaceholderReque
 import com.Ben12345rocks.AdvancedCore.Util.Logger.Logger;
 import com.Ben12345rocks.AdvancedCore.Util.Metrics.BStatsMetrics;
 import com.Ben12345rocks.AdvancedCore.Util.Metrics.MCStatsMetrics;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Updater.Updater;
 import com.Ben12345rocks.AdvancedCore.mysql.MySQL;
 import com.Ben12345rocks.VotingPlugin.Commands.CommandLoader;
@@ -74,16 +77,16 @@ public class Main extends JavaPlugin {
 	public static Main plugin;

 	/** The top voter monthly. */
-	public HashMap<User, Integer> topVoterAllTime;
+	public LinkedHashMap<User, Integer> topVoterAllTime;

 	/** The top voter monthly. */
-	public HashMap<User, Integer> topVoterMonthly;
+	public LinkedHashMap<User, Integer> topVoterMonthly;

 	/** The top voter weekly. */
-	public HashMap<User, Integer> topVoterWeekly;
+	public LinkedHashMap<User, Integer> topVoterWeekly;

 	/** The top voter daily. */
-	public HashMap<User, Integer> topVoterDaily;
+	public LinkedHashMap<User, Integer> topVoterDaily;

 	/** The updater. */
 	public Updater updater;
@@ -98,7 +101,7 @@ public class Main extends JavaPlugin {
 	private List<VoteSite> voteSites;

 	/** The vote today. */
-	public HashMap<User, HashMap<VoteSite, LocalDateTime>> voteToday;
+	public LinkedHashMap<User, HashMap<VoteSite, LocalDateTime>> voteToday;

 	/** The signs. */
 	public ArrayList<SignHandler> signs;
@@ -108,6 +111,8 @@ public class Main extends JavaPlugin {

 	private boolean update = true;

+	private boolean updateStarted = false;
+
 	/**
 	 * Check votifier.
 	 */
@@ -190,6 +195,10 @@ public class Main extends JavaPlugin {
 		return UserManager.getInstance();
 	}

+	public VoteParty getVoteParty() {
+		return VoteParty.getInstance();
+	}
+
 	/**
 	 * Gets the vote site.
 	 *
@@ -228,11 +237,16 @@ public class Main extends JavaPlugin {
 			for (String siteName : sites) {
 				String URL = ConfigVoteSites.getInstance().getServiceSite(siteName);
 				if (URL != null) {
-					if (URL.equals(url)) {
+					if (URL.equalsIgnoreCase(url)) {
 						return siteName;
 					}
 				}
 			}
+			for (String siteName : sites) {
+				if (siteName.equalsIgnoreCase(url)) {
+					return siteName;
+				}
+			}
 		}
 		return url;

@@ -259,10 +273,7 @@ public class Main extends JavaPlugin {
 				@Override
 				public void run() {
 					AdvancedCoreHook.getInstance()
-							.setMysql(new MySQL("VotingPlugin_Users", Config.getInstance().getMySqlHost(),
-									Config.getInstance().getMySqlPort(), Config.getInstance().getMySqlDatabase(),
-									Config.getInstance().getMySqlUsername(), Config.getInstance().getMySqlPassword(),
-									Config.getInstance().getMySqlMaxConnections()));
+							.setMysql(new MySQL("VotingPlugin_Users", Config.getInstance().getMySql()));
 				}
 			});

@@ -422,14 +433,13 @@ public class Main extends JavaPlugin {
 			@Override
 			public String getValue() {
 				for (String s : Config.getInstance().getVoteStreakVotes("Day")) {
-					if (StringUtils.getInstance().isInt(s)) {
-						int streak = Integer.parseInt(s);
-						if (Config.getInstance().getVoteStreakRewardEnabled("Day", streak)
-								&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-										Config.getInstance().getVoteStreakRewardsPath("Day", streak))) {
-							return "True";
-						}
+
+					if (Config.getInstance().getVoteStreakRewardEnabled("Day", s)
+							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
+									Config.getInstance().getVoteStreakRewardsPath("Day", s))) {
+						return "True";
 					}
+
 				}
 				return "False";
 			}
@@ -440,15 +450,14 @@ public class Main extends JavaPlugin {
 			@Override
 			public String getValue() {
 				for (String s : Config.getInstance().getVoteStreakVotes("Week")) {
-					if (StringUtils.getInstance().isInt(s)) {
-						int streak = Integer.parseInt(s);
-						if (Config.getInstance().getVoteStreakRewardEnabled("Week", streak)
-								&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-										Config.getInstance().getVoteStreakRewardsPath("Week", streak))) {
-							return "True";
-						}
+
+					if (Config.getInstance().getVoteStreakRewardEnabled("Week", s)
+							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
+									Config.getInstance().getVoteStreakRewardsPath("Week", s))) {
+						return "True";
 					}
 				}
+
 				return "False";
 			}
 		});
@@ -458,15 +467,14 @@ public class Main extends JavaPlugin {
 			@Override
 			public String getValue() {
 				for (String s : Config.getInstance().getVoteStreakVotes("Month")) {
-					if (StringUtils.getInstance().isInt(s)) {
-						int streak = Integer.parseInt(s);
-						if (Config.getInstance().getVoteStreakRewardEnabled("Month", streak)
-								&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-										Config.getInstance().getVoteStreakRewardsPath("Month", streak))) {
-							return "True";
-						}
+
+					if (Config.getInstance().getVoteStreakRewardEnabled("Month", s)
+							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
+									Config.getInstance().getVoteStreakRewardsPath("Month", s))) {
+						return "True";
 					}
 				}
+
 				return "False";
 			}
 		});
@@ -517,11 +525,11 @@ public class Main extends JavaPlugin {
 				return Config.getInstance().getDataStorage();
 			}
 		});
-		metrics.addCustomChart(new BStatsMetrics.SimplePie("CheckOnWorldChange") {
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("DisableCheckOnWorldChange") {

 			@Override
 			public String getValue() {
-				return "" + Config.getInstance().getCheckOnWorldChange();
+				return "" + Config.getInstance().getDisableCheckOnWorldChange();
 			}
 		});
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("votereminding_enabled") {
@@ -641,6 +649,9 @@ public class Main extends JavaPlugin {
 		loadVoteSites();
 		updateAdvancedCoreHook();
 		AdvancedCoreHook.getInstance().loadHook(this);
+		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
+			debug("UseBatchUpdates: " + AdvancedCoreHook.getInstance().getMysql().isUseBatchUpdates());
+		}
 		registerCommands();
 		registerEvents();
 		checkVotifier();
@@ -659,11 +670,11 @@ public class Main extends JavaPlugin {
 			}
 		});

-		topVoterMonthly = new HashMap<User, Integer>();
-		topVoterWeekly = new HashMap<User, Integer>();
-		topVoterDaily = new HashMap<User, Integer>();
-		voteToday = new HashMap<User, HashMap<VoteSite, LocalDateTime>>();
-		topVoterAllTime = new HashMap<User, Integer>();
+		topVoterMonthly = new LinkedHashMap<User, Integer>();
+		topVoterWeekly = new LinkedHashMap<User, Integer>();
+		topVoterDaily = new LinkedHashMap<User, Integer>();
+		voteToday = new LinkedHashMap<User, HashMap<VoteSite, LocalDateTime>>();
+		topVoterAllTime = new LinkedHashMap<User, Integer>();

 		voteLog = new Logger(plugin, new File(plugin.getDataFolder() + File.separator + "Log", "votelog.txt"));

@@ -686,10 +697,64 @@ public class Main extends JavaPlugin {
 			}
 		});

-		plugin.getLogger().info("Enabled VotingPlgin " + plugin.getDescription().getVersion());
-
 		loadTimer();

+		plugin.getLogger().info("Enabled VotingPlgin " + plugin.getDescription().getVersion());
+
+		for (VoteSite site : getVoteSites()) {
+			if (!site.hasRewards() && !Config.getInstance().getDisableNoServiceSiteMessage()) {
+				plugin.getLogger().warning("No rewards detected for the site: " + site.getKey());
+			}
+		}
+
+	}
+
+	public LinkedHashMap<User, Integer> getTopVoterAllTime() {
+		return topVoterAllTime;
+	}
+
+	public LinkedHashMap<User, Integer> getTopVoterMonthly() {
+		return topVoterMonthly;
+	}
+
+	public LinkedHashMap<User, Integer> getTopVoterWeekly() {
+		return topVoterWeekly;
+	}
+
+	public LinkedHashMap<User, Integer> getTopVoterDaily() {
+		return topVoterDaily;
+	}
+
+	public Updater getUpdater() {
+		return updater;
+	}
+
+	public ArrayList<CommandHandler> getVoteCommand() {
+		return voteCommand;
+	}
+
+	public ArrayList<CommandHandler> getAdminVoteCommand() {
+		return adminVoteCommand;
+	}
+
+	public LinkedHashMap<User, HashMap<VoteSite, LocalDateTime>> getVoteToday() {
+		return voteToday;
+	}
+
+	public ArrayList<SignHandler> getSigns() {
+		return signs;
+	}
+
+	public Logger getVoteLog() {
+		return voteLog;
+	}
+
+	public boolean isUpdate() {
+		return update;
+	}
+
+	public boolean isUpdateStarted() {
+		return updateStarted;
 	}

 	/**
@@ -711,6 +776,15 @@ public class Main extends JavaPlugin {
 		getCommand("av").setExecutor(new CommandAdminVote(this));
 		getCommand("av").setTabCompleter(new AdminVoteTabCompleter());

+		Permission perm = Bukkit.getPluginManager().getPermission("VotingPlugin.Player");
+		if (perm != null) {
+			if (Config.getInstance().getGiveDefaultPermission()) {
+				perm.setDefault(PermissionDefault.TRUE);
+			} else {
+				perm.setDefault(PermissionDefault.OP);
+			}
+		}
+
 		plugin.debug("Loaded Commands");

 	}
@@ -745,20 +819,7 @@ public class Main extends JavaPlugin {
 		configVoteSites.reloadData();
 		updateAdvancedCoreHook();
 		plugin.loadVoteSites();
-		CommandLoader.getInstance().loadTabComplete();
 		AdvancedCoreHook.getInstance().reload();
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				for (CommandHandler cmd : voteCommand) {
-					cmd.reloadTabComplete();
-				}
-				for (CommandHandler cmd : adminVoteCommand) {
-					cmd.reloadTabComplete();
-				}
-			}
-		});
 		loadTimer();

 	}
@@ -771,10 +832,35 @@ public class Main extends JavaPlugin {
 	 * Setup files.
 	 */
 	public void setupFiles() {
-		config = Config.getInstance();
-		configVoteSites = ConfigVoteSites.getInstance();
-		config.setup();
-		configVoteSites.setup();
+		try {
+			config = Config.getInstance();
+			config.setup();
+		} catch (Exception e) {
+			e.printStackTrace();
+			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getLogger().severe("Failed to load Config.yml");
+					e.printStackTrace();
+				}
+			}, 10);
+		}
+		try {
+			configVoteSites = ConfigVoteSites.getInstance();
+			configVoteSites.setup();
+		} catch (Exception e) {
+			e.printStackTrace();
+			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getLogger().severe("Failed to load VoteSites.yml");
+					e.printStackTrace();
+				}
+
+			}, 10);
+		}

 		plugin.debug("Loaded Files");

@@ -784,43 +870,51 @@ public class Main extends JavaPlugin {
 	 * Update.
 	 */
 	public void update() {
-		if (update && plugin != null) {
-			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+		if (update && plugin != null && !updateStarted) {
+			updateStarted = true;
+			update = false;

-				@Override
-				public void run() {
-					synchronized (plugin) {
-						if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
-							if (AdvancedCoreHook.getInstance().getMysql() == null) {
-								plugin.debug("MySQL not loaded yet");
-								return;
-							} else {
-								AdvancedCoreHook.getInstance().getMysql().clearCache();
-							}
-						}
-						update = false;
-						plugin.debug("Starting background task");
-						try {
-							ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
-							ArrayList<User> users = new ArrayList<User>();
-							for (String uuid : uuids) {
-								User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-								users.add(user);
-							}
-							plugin.debug("Finished loading player data");
-							TopVoterHandler.getInstance().updateTopVoters(users);
-							Commands.getInstance().updateVoteToday(users);
-							ServerData.getInstance().updateValues();
-							Signs.getInstance().updateSigns();
-							plugin.debug("Background task ran");
-						} catch (Exception ex) {
-							ex.printStackTrace();
-							plugin.getLogger().info("Looks like something went wrong.");
-						}
+			synchronized (plugin) {
+				if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
+					if (AdvancedCoreHook.getInstance().getMysql() == null) {
+						plugin.debug("MySQL not loaded yet");
+						return;
+					} else if (Config.getInstance().getClearCacheOnUpdate()) {
+						AdvancedCoreHook.getInstance().getMysql().clearCache();
+					} else {
+						AdvancedCoreHook.getInstance().getMysql().clearCacheBasic();
 					}
 				}

-			});
+				plugin.debug("Starting background task");
+				long time = System.currentTimeMillis();
+				try {
+					ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
+					ArrayList<User> users = new ArrayList<User>();
+					for (String uuid : uuids) {
+						User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+						users.add(user);
+					}
+					update = false;
+					long time1 = ((System.currentTimeMillis() - time) / 1000);
+					plugin.debug("Finished loading player data in " + time1 + " seconds, " + users.size() + " users");
+					TopVoterHandler.getInstance().updateTopVoters(users);
+					Commands.getInstance().updateVoteToday(users);
+					ServerData.getInstance().updateValues();
+					Signs.getInstance().updateSigns();
+
+					for (Player player : Bukkit.getOnlinePlayers()) {
+						UserManager.getInstance().getVotingPluginUser(player).offVote();
+					}
+					time1 = ((System.currentTimeMillis() - time) / 1000);
+					plugin.debug("Background task finished in " + time1 + " seconds");
+				} catch (Exception ex) {
+					ex.printStackTrace();
+					plugin.getLogger().info("Looks like something went wrong.");
+				}
+			}
+
+			updateStarted = false;
 		}
 	}

@@ -829,10 +923,11 @@ public class Main extends JavaPlugin {
 		AdvancedCoreHook.getInstance().getJavascriptEngine().put("VotingPlugin", this);
 		AdvancedCoreHook.getInstance().allowDownloadingFromSpigot(15358);
 		AdvancedCoreHook.getInstance().setExtraDebug(Config.getInstance().getExtraDebug());
-		AdvancedCoreHook.getInstance().setStorageType(UserStorage.valueOf(Config.getInstance().getDataStorage()));
+		AdvancedCoreHook.getInstance().setStorageType(UserStorage.value(Config.getInstance().getDataStorage()));
 		loadMySQL();

-		AdvancedCoreHook.getInstance().setCheckOnWorldChange(Config.getInstance().getCheckOnWorldChange());
+		AdvancedCoreHook.getInstance()
+				.setDisableCheckOnWorldChange(Config.getInstance().getDisableCheckOnWorldChange());
 		AdvancedCoreHook.getInstance().setDebug(Config.getInstance().getDebugEnabled());
 		AdvancedCoreHook.getInstance().setDebugIngame(Config.getInstance().getDebugInfoIngame());
 		AdvancedCoreHook.getInstance().setDefaultRequestMethod(Config.getInstance().getRequestAPIDefaultMethod());
@@ -842,6 +937,13 @@ public class Main extends JavaPlugin {
 		AdvancedCoreHook.getInstance().setHelpLine(Config.getInstance().getFormatHelpLine());
 		AdvancedCoreHook.getInstance().setLogDebugToFile(Config.getInstance().getLogDebugToFile());
 		AdvancedCoreHook.getInstance().setSendScoreboards(Config.getInstance().getSendScoreboards());
+		AdvancedCoreHook.getInstance().setAlternateUUIDLookUp(Config.getInstance().getAlternateUUIDLookup());
+		AdvancedCoreHook.getInstance().setAutoKillInvs(Config.getInstance().getAutoKillInvs());
+		AdvancedCoreHook.getInstance().setPrevPageTxt(Config.getInstance().getFormatPrevPage());
+		AdvancedCoreHook.getInstance().setNextPageTxt(Config.getInstance().getFormatNextPage());
+
+		AdvancedCoreHook.getInstance().setPurgeOldData(Config.getInstance().getPurgeOldData());
+		AdvancedCoreHook.getInstance().setPurgeMinimumDays(Config.getInstance().getPurgeMin());
 	}

 }
@@ -21,7 +21,7 @@ public enum TopVoter {
 				return value;
 			}
 		}
-		return null;
+		return AllTime;
 	}

 	public TopVoter next() {
@@ -49,4 +49,21 @@ public enum TopVoter {
 		}
 		return TopVoter.AllTime;
 	}
+
+	public TopVoter prev() {
+		switch (this) {
+		case AllTime:
+			return Daily;
+		case Daily:
+			return Weekly;
+		case Monthly:
+			return AllTime;
+		case Weekly:
+			return Monthly;
+		default:
+			return AllTime;
+
+		}
+
+	}
 }
@@ -11,13 +11,13 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;

-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

+import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
 import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Objects.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
@@ -113,7 +113,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 * Adds the points.
 	 */
 	public void addPoints() {
-		addPoints(Config.getInstance().getPointsOnVote());
+		int points = Config.getInstance().getPointsOnVote();
+		if (points != 0) {
+			addPoints(points);
+		}
 	}

 	/**
@@ -131,6 +134,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 *
 	 */
 	public void addTotal() {
+		setMilestoneCount(getMilestoneCount() + 1);
 		addMonthTotal();
 		addAllTimeTotal();
 	}
@@ -253,21 +257,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		setWeeklyTotal(0);
 	}

-	/**
-	 * Daily top voter award.
-	 *
-	 * @param place
-	 *            the place
-	 */
-	public void dailyTopVoterAward(int place) {
-		if (PlayerUtils.getInstance().isPlayerOnline(getPlayerName())) {
-			// online
-			giveDailyTopVoterAward(place);
-		} else {
-			addOfflineOtherReward("DailyTopVoter" + place);
-		}
-	}
-
 	public int getAllTimeTotal() {
 		return getUserData().getInt("AllTimeTotal");
 	}
@@ -345,12 +334,12 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 * @return the last vote times sorted
 	 */
 	public HashMap<VoteSite, Long> getLastVoteTimesSorted() {
-		HashMap<VoteSite, Long> times = new LinkedHashMap<VoteSite, Long>();
+		LinkedHashMap<VoteSite, Long> times = new LinkedHashMap<VoteSite, Long>();

 		for (VoteSite voteSite : plugin.getVoteSites()) {
 			times.put(voteSite, getTime(voteSite));
 		}
-		HashMap<VoteSite, Long> sorted = (HashMap<VoteSite, Long>) times.entrySet().stream()
+		LinkedHashMap<VoteSite, Long> sorted = (LinkedHashMap<VoteSite, Long>) times.entrySet().stream()
 				.sorted(Collections.reverseOrder(Map.Entry.comparingByValue()))
 				.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 		return sorted;
@@ -364,6 +353,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return getData().getInt("MonthTotal");
 	}

+	public int getLastMonthTotal() {
+		return getData().getInt("LastMonthTotal");
+	}
+
 	public int getMonthVoteStreak() {
 		return getData().getInt("MonthVoteStreak");
 	}
@@ -419,13 +412,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 *            the place
 	 */
 	public void giveDailyTopVoterAward(int place) {
-		RewardHandler.getInstance().giveReward(this, Config.getInstance().getData(),
-				Config.getInstance().getDailyAwardRewardsPath(place));
-		Player player = Bukkit.getPlayer(java.util.UUID.fromString(getUUID()));
-		if (player != null) {
-			player.sendMessage(StringUtils.getInstance()
-					.colorize(Config.getInstance().getFormatTopVoterRewardMsg().replace("%place%", "" + place)));
-		}
+		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getDailyAwardRewardsPath(place))
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Daily").send(this);
 	}

 	/**
@@ -435,17 +423,13 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 *            the place
 	 */
 	public void giveMonthlyTopVoterAward(int place) {
-		RewardHandler.getInstance().giveReward(this, Config.getInstance().getData(),
-				Config.getInstance().getMonthlyAwardRewardsPath(place));
-		Player player = Bukkit.getPlayer(java.util.UUID.fromString(getUUID()));
-		if (player != null) {
-			player.sendMessage(StringUtils.getInstance()
-					.colorize(Config.getInstance().getFormatTopVoterRewardMsg().replace("%place%", "" + place)));
-		}
+		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMonthlyAwardRewardsPath(place))
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly").send(this);
 	}

 	public void giveOfflineOtherRewards() {
-		for (String str : getOfflineOtherRewards()) {
+		ArrayList<String> offlineRewards = getOfflineOtherRewards();
+		for (String str : offlineRewards) {
 			if (str.equalsIgnoreCase("FirstVote")) {
 				OtherVoteReward.getInstance().giveFirstVoteRewards(this, false);
 			} else if (str.equalsIgnoreCase("AllSites")) {
@@ -507,21 +491,20 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 				if (args.length > 2) {
 					String type = args[1];
 					String st = args[2];
-					if (StringUtils.getInstance().isInt(st)) {
-						int streakRequired = Integer.parseInt(st);
-						if (streakRequired != 0) {
-							if (Config.getInstance().getVoteStreakRewardEnabled(type, streakRequired)) {
-								OtherVoteReward.getInstance().giveVoteStreakReward(this, false, type, streakRequired);
-							}
-						}
+
+					if (Config.getInstance().getVoteStreakRewardEnabled(type, st)) {
+						OtherVoteReward.getInstance().giveVoteStreakReward(this, false, type, "" + st, -1);
 					}
+
 				}
 			} else {
 				plugin.debug("Reward handle for " + str + " does not exist!");
 			}

 		}
-		setOfflineOtherRewards(new ArrayList<String>());
+		if (!offlineRewards.isEmpty()) {
+			setOfflineOtherRewards(new ArrayList<String>());
+		}
 	}

 	/**
@@ -531,13 +514,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 *            the place
 	 */
 	public void giveWeeklyTopVoterAward(int place) {
-		RewardHandler.getInstance().giveReward(this, Config.getInstance().getData(),
-				Config.getInstance().getWeeklyAwardRewardsPath(place));
-		Player player = Bukkit.getPlayer(java.util.UUID.fromString(getUUID()));
-		if (player != null) {
-			player.sendMessage(StringUtils.getInstance()
-					.colorize(Config.getInstance().getFormatTopVoterRewardMsg().replace("%place%", "" + place)));
-		}
+		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getWeeklyAwardRewardsPath(place))
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Weekly").send(this);
 	}

 	/**
@@ -581,38 +559,32 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		}
 	}

-	/**
-	 * Monthly top voter award.
-	 *
-	 * @param place
-	 *            the place
-	 */
-	public void monthlyTopVoterAward(int place) {
-		if (PlayerUtils.getInstance().isPlayerOnline(getPlayerName())) {
-			// online
-			giveMonthlyTopVoterAward(place);
-		} else {
-			addOfflineOtherReward("MonthlyTopVoter" + place);
-		}
-	}
-
 	/**
 	 * Off vote.
 	 */
 	public void offVote() {
+		AdvancedCoreHook.getInstance().extraDebug("Checking offline vote site votes");
 		Player player = getPlayer();
 		if (player != null) {
-			setTopVoterIgnore(player.hasPermission("VotingPlugin.TopVoter.Ignore"));
+			boolean topVoterIngorePerm = player.hasPermission("VotingPlugin.TopVoter.Ignore");
+			if (isTopVoterIgnore() != topVoterIngorePerm) {
+				setTopVoterIgnore(topVoterIngorePerm);
+			}
 			ArrayList<String> offlineVotes = getOfflineVotes();
+			// plugin.debug(ArrayUtils.getInstance().makeStringList(offlineVotes));
 			if (offlineVotes.size() > 0) {
 				sendVoteEffects(true);
 			}

 			for (int i = 0; i < offlineVotes.size(); i++) {
 				if (plugin.hasVoteSite(offlineVotes.get(i))) {
+					plugin.debug("Giving offline site reward: " + offlineVotes.get(i));
 					playerVote(plugin.getVoteSite(offlineVotes.get(i)), false, true);
+				} else {
+					plugin.debug("Site doesn't exist: " + offlineVotes.get(i));
 				}
 			}
+
 			setOfflineVotes(new ArrayList<String>());

 			giveOfflineOtherRewards();
@@ -630,7 +602,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 *            the broadcast
 	 */
 	public void playerVote(VoteSite voteSite, boolean online, boolean broadcast) {
-		if (Config.getInstance().getBroadCastVotesEnabled() && Config.getInstance().getFormatBroadcastWhenOnline()
+		if (Config.getInstance().getFormatBroadcastWhenOnline() && Config.getInstance().getBroadCastVotesEnabled()
 				&& broadcast) {
 			voteSite.broadcastVote(this);
 		}
@@ -657,6 +629,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	}

 	public void resetMonthlyTotalVotes() {
+		setLastMonthTotal(getMonthTotal());
 		setMonthTotal(0);
 	}

@@ -746,6 +719,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		getData().setInt("MonthTotal", total);
 	}

+	public void setLastMonthTotal(int total) {
+		getData().setInt("LastMonthTotal", total);
+	}
+
 	public void setMonthVoteStreak(int streak) {
 		getData().setInt("MonthVoteStreak", streak);
 		if (getBestMonthVoteStreak() < streak) {
@@ -804,19 +781,20 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		}
 	}

-	/**
-	 * Weekly top voter award.
-	 *
-	 * @param place
-	 *            the place
-	 */
-	public void weeklyTopVoterAward(int place) {
-		if (PlayerUtils.getInstance().isPlayerOnline(getPlayerName())) {
-			// online
-			giveWeeklyTopVoterAward(place);
-		} else {
-			addOfflineOtherReward("WeeklyTopVoter" + place);
+	public boolean shouldBeReminded() {
+		Player player = getPlayer();
+		if (player != null) {
+			if (player.hasPermission("VotingPlugin.NoRemind")) {
+				return false;
+			}
 		}
+		return true;
+	}
+
+	public void clearOfflineRewards() {
+		setOfflineVotes(new ArrayList<String>());
+		setOfflineRewards(new ArrayList<String>());
+		setOfflineOtherRewards(new ArrayList<String>());
 	}

 }
@@ -1,8 +1,11 @@
 package com.Ben12345rocks.VotingPlugin.Objects;

+import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;

 import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
+import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -36,7 +39,7 @@ public class VoteSite {
 	private String displayName;

 	/** The vote delay. */
-	private int voteDelay;
+	private double voteDelay;

 	/** The enabled. */
 	private boolean enabled;
@@ -78,10 +81,12 @@ public class VoteSite {
 	 *            the user
 	 */
 	public void broadcastVote(User user) {
-		String playerName = user.getPlayerName();
-		String bc = StringUtils.getInstance().colorize(config.getFormatBroadCastMsg());
-		bc = bc.replace("%player%", playerName).replace("%SiteName%", getDisplayName());
-		MiscUtils.getInstance().broadcast(bc);
+		if (!user.isVanished()) {
+			String playerName = user.getPlayerName();
+			String bc = StringUtils.getInstance().colorize(config.getFormatBroadCastMsg());
+			bc = bc.replace("%player%", playerName).replace("%SiteName%", getDisplayName());
+			MiscUtils.getInstance().broadcast(bc);
+		}
 	}

 	/**
@@ -94,8 +99,14 @@ public class VoteSite {
 	/**
 	 * @return the item
 	 */
-	public ConfigurationSection getItem() {
-		return item;
+	public ItemBuilder getItem() {
+		if (item == null) {
+			plugin.getLogger().warning("Invalid item section in site: " + key);
+			return new ItemBuilder(Material.STONE, 1).setName("&cInvalid item for site: " + key)
+					.setLore("&cInvalid item for site: " + key);
+		} else {
+			return new ItemBuilder(item);
+		}
 	}

 	/**
@@ -128,7 +139,7 @@ public class VoteSite {
 	 *
 	 * @return the vote delay
 	 */
-	public int getVoteDelay() {
+	public double getVoteDelay() {
 		return voteDelay;
 	}

@@ -159,6 +170,10 @@ public class VoteSite {
 				.withPlaceHolder("VoteDelay", "" + getVoteDelay()).withPlaceHolder("VoteURL", getVoteURL()).send(user);
 	}

+	public boolean hasRewards() {
+		return RewardHandler.getInstance().hasRewards(configVoteSites.getData(), configVoteSites.getRewardsPath(key));
+	}
+
 	/**
 	 * Give site reward.
 	 *
@@ -280,7 +295,7 @@ public class VoteSite {
 	 * @param voteDelay
 	 *            the new vote delay
 	 */
-	public void setVoteDelay(int voteDelay) {
+	public void setVoteDelay(double voteDelay) {
 		this.voteDelay = voteDelay;
 	}

@@ -2,12 +2,15 @@ package com.Ben12345rocks.VotingPlugin.OtherRewards;

 import java.util.Set;

+import org.bukkit.Bukkit;
+
 import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
 import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteAllSitesEvent;
 import com.Ben12345rocks.VotingPlugin.Objects.User;

 // TODO: Auto-generated Javadoc
@@ -66,7 +69,6 @@ public class OtherVoteReward {
 			giveAllSitesRewards(user, user.isOnline());
 		}
 		return checkAllVotes;
-
 	}

 	/**
@@ -170,12 +172,18 @@ public class OtherVoteReward {

 		Set<String> streaks = Config.getInstance().getVoteStreakVotes(type);
 		for (String streak : streaks) {
-			if (StringUtils.getInstance().isInt(streak)) {
-				int streakRequired = Integer.parseInt(streak);
+			String s = streak.replaceAll("-", "");
+			boolean multiple = false;
+			if (streak.contains("-")) {
+				// multiple
+				multiple = true;
+			}
+			if (StringUtils.getInstance().isInt(s)) {
+				int streakRequired = Integer.parseInt(s);
 				if (streakRequired != 0) {
-					if (Config.getInstance().getVoteStreakRewardEnabled(type, streakRequired)
+					if (Config.getInstance().getVoteStreakRewardEnabled(type, streak)
 							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-									Config.getInstance().getVoteStreakRewardsPath(type, streakRequired))) {
+									Config.getInstance().getVoteStreakRewardsPath(type, "" + streak))) {
 						int curStreak = 0;
 						if (type.equalsIgnoreCase("day")) {
 							curStreak = user.getDayVoteStreak();
@@ -184,12 +192,20 @@ public class OtherVoteReward {
 						} else if (type.equalsIgnoreCase("month")) {
 							curStreak = user.getMonthVoteStreak();
 						}
-						if (curStreak == streakRequired) {
-							giveVoteStreakReward(user, user.isOnline(), type, streakRequired);
-							gotReward = true;
-						}
-						if (gotReward) {
-							plugin.debug(user.getPlayerName() + " got VoteStreak " + streakRequired + " for " + type);
+						if (!multiple) {
+							if (curStreak == streakRequired) {
+								giveVoteStreakReward(user, user.isOnline(), type, "" + streakRequired, curStreak);
+								gotReward = true;
+								plugin.debug(
+										user.getPlayerName() + " got VoteStreak " + streakRequired + " for " + type);
+							}
+						} else {
+							if (curStreak != 0 && curStreak % streakRequired == 0) {
+								giveVoteStreakReward(user, user.isOnline(), type, streakRequired + "-", curStreak);
+								gotReward = true;
+								plugin.debug(
+										user.getPlayerName() + " got VoteStreak " + streakRequired + "* for " + type);
+							}
 						}
 					}
 				}
@@ -210,6 +226,12 @@ public class OtherVoteReward {
 	 *            the online
 	 */
 	public void giveAllSitesRewards(User user, boolean online) {
+		PlayerVoteAllSitesEvent event = new PlayerVoteAllSitesEvent(user);
+		Bukkit.getPluginManager().callEvent(event);
+
+		if (event.isCancelled()) {
+			return;
+		}
 		RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
 				Config.getInstance().getAllSitesRewardPath(), online);
 	}
@@ -257,8 +279,10 @@ public class OtherVoteReward {
 				.setOnline(online).withPlaceHolder("Milestone", "" + milestone).send(user);
 	}

-	public void giveVoteStreakReward(User user, boolean online, String type, int streak) {
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getVoteStreakRewardsPath(type, streak))
-				.setOnline(online).withPlaceHolder("Type", type).withPlaceHolder("Streak", "" + streak).send(user);
+	public void giveVoteStreakReward(User user, boolean online, String type, String string, int votes) {
+		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getVoteStreakRewardsPath(type, string))
+				.setOnline(online).withPlaceHolder("Type", type).withPlaceHolder("Streak", "" + votes).send(user);
 	}
+
+	
 }
@@ -13,12 +13,14 @@ import java.util.Map.Entry;
 import java.util.Set;

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

 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.Listeners.DateChangedEvent;
 import com.Ben12345rocks.AdvancedCore.Listeners.DayChangeEvent;
 import com.Ben12345rocks.AdvancedCore.Listeners.MonthChangeEvent;
+import com.Ben12345rocks.AdvancedCore.Listeners.PreDateChangedEvent;
 import com.Ben12345rocks.AdvancedCore.Listeners.WeekChangeEvent;
 import com.Ben12345rocks.AdvancedCore.Objects.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
@@ -75,18 +77,18 @@ public class TopVoterHandler implements Listener {
 		return ArrayUtils.getInstance().convert(msg);
 	}

-	@EventHandler
+	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
 	public void onDateChanged(DateChangedEvent event) {
-		ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
-		ArrayList<User> users = new ArrayList<User>();
-		for (String uuid : uuids) {
-			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			users.add(user);
-		}
-		updateTopVoters(users);
+		plugin.setUpdate(true);
 	}

-	@EventHandler
+	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+	public void onPreDateChanged(PreDateChangedEvent event) {
+		plugin.setUpdate(true);
+		plugin.update();
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onDayChange(DayChangeEvent event) {

 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
@@ -111,20 +113,24 @@ public class TopVoterHandler implements Listener {
 		if (Config.getInstance().getDailyAwardsEnabled()) {
 			Set<String> places = Config.getInstance().getDailyPossibleRewardPlaces();
 			int i = 0;
+			int lastTotal = -1;
 			for (User user : plugin.topVoterDaily.keySet()) {
 				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					i++;
+					if (user.getDailyTotal() != lastTotal) {
+						i++;
+					}
 					if (places.contains(Integer.toString(i))) {
-						user.dailyTopVoterAward(i);
+						user.giveDailyTopVoterAward(i);
 					}
 				}
+				lastTotal = user.getDailyTotal();
 			}
 		}
 		resetDailyTotals();

 	}

-	@EventHandler
+	@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));
@@ -148,13 +154,18 @@ public class TopVoterHandler implements Listener {
 		if (Config.getInstance().getMonthlyAwardsEnabled()) {
 			Set<String> places = Config.getInstance().getMonthlyPossibleRewardPlaces();
 			int i = 0;
+			int lastTotal = -1;
 			for (User user : plugin.topVoterMonthly.keySet()) {
+
 				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					i++;
+					if (user.getMonthTotal() != lastTotal) {
+						i++;
+					}
 					if (places.contains(Integer.toString(i))) {
-						user.monthlyTopVoterAward(i);
+						user.giveMonthlyTopVoterAward(i);
 					}
 				}
+				lastTotal = user.getMonthTotal();
 			}
 		}
 		resetMonthlyTotals();
@@ -170,7 +181,7 @@ public class TopVoterHandler implements Listener {

 	}

-	@EventHandler
+	@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));
@@ -194,13 +205,17 @@ public class TopVoterHandler implements Listener {
 		if (Config.getInstance().getWeeklyAwardsEnabled()) {
 			Set<String> places = Config.getInstance().getWeeklyPossibleRewardPlaces();
 			int i = 0;
+			int lastTotal = -1;
 			for (User user : plugin.topVoterWeekly.keySet()) {
 				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					i++;
+					if (user.getWeeklyTotal() != lastTotal) {
+						i++;
+					}
 					if (places.contains(Integer.toString(i))) {
-						user.weeklyTopVoterAward(i);
+						user.giveWeeklyTopVoterAward(i);
 					}
 				}
+				lastTotal = user.getWeeklyTotal();
 			}
 		}
 		resetWeeklyTotals();
@@ -238,18 +253,10 @@ public class TopVoterHandler implements Listener {
 		}
 	}

-	/**
-	 * Sort by values.
-	 *
-	 * @param unsortMap
-	 *            the unsort map
-	 * @param order
-	 *            the order, false for high to low
-	 * @return the hash map
-	 */
-	public HashMap<User, Integer> sortByValues(HashMap<User, Integer> unsortMap, final boolean order) {
+	public LinkedHashMap<User, Integer> sortByValues(LinkedHashMap<User, Integer> topVoterAllTime,
+			final boolean order) {

-		List<Entry<User, Integer>> list = new LinkedList<Entry<User, Integer>>(unsortMap.entrySet());
+		List<Entry<User, Integer>> list = new LinkedList<Entry<User, Integer>>(topVoterAllTime.entrySet());

 		// Sorting the list based on values
 		Collections.sort(list, new Comparator<Entry<User, Integer>>() {
@@ -265,7 +272,7 @@ public class TopVoterHandler implements Listener {
 		});

 		// Maintaining insertion order with the help of LinkedList
-		HashMap<User, Integer> sortedMap = new LinkedHashMap<User, Integer>();
+		LinkedHashMap<User, Integer> sortedMap = new LinkedHashMap<User, Integer>();
 		for (Entry<User, Integer> entry : list) {
 			sortedMap.put(entry.getKey(), entry.getValue());
 		}
@@ -274,9 +281,10 @@ public class TopVoterHandler implements Listener {
 	}

 	public void storeDailyTopVoters() {
-		String month = LocalDateTime.now().getMonth().toString();
-		int year = LocalDateTime.now().getYear();
-		int day = LocalDateTime.now().getDayOfMonth();
+		LocalDateTime time = LocalDateTime.now().minusHours(5);
+		String month = time.getMonth().toString();
+		int year = time.getYear();
+		int day = time.getDayOfMonth();
 		YMLFileHandler file = new YMLFileHandler(new File(plugin.getDataFolder(),
 				"TopVoter" + File.separator + "Daily" + File.separator + year + "_" + month + "_" + day + ".yml"));
 		file.setup();
@@ -291,10 +299,11 @@ public class TopVoterHandler implements Listener {
 	}

 	public void storeMonthlyTopVoters() {
-		String month = LocalDateTime.now().getMonth().toString();
-		int year = LocalDateTime.now().getYear();
+		LocalDateTime time = LocalDateTime.now().minusHours(10);
+		String month = time.getMonth().toString();
+		int year = time.getYear();
 		YMLFileHandler file = new YMLFileHandler(new File(plugin.getDataFolder(),
-				"TopVoter" + File.separator + "Monthly" + File.separator + year + "_" + month + ".yml"));
+				"TopVoter" + File.separator + "Monthly" + File.separator + month + "_" + year + ".yml"));
 		file.setup();
 		ArrayList<String> topVoters = new ArrayList<String>();
 		int count = 1;
@@ -307,9 +316,10 @@ public class TopVoterHandler implements Listener {
 	}

 	public void storeWeeklyTopVoters() {
-		String month = LocalDateTime.now().getMonth().toString();
-		int year = LocalDateTime.now().getYear();
-		int week = LocalDateTime.now().getDayOfMonth();
+		LocalDateTime time = LocalDateTime.now().minusHours(10);
+		String month = time.getMonth().toString();
+		int year = time.getYear();
+		int week = time.getDayOfYear();
 		YMLFileHandler file = new YMLFileHandler(new File(plugin.getDataFolder(),
 				"TopVoter" + File.separator + "Weekly" + File.separator + year + "_" + month + "_" + week + ".yml"));
 		file.setup();
@@ -42,11 +42,15 @@ public class UserManager {

 	@SuppressWarnings("deprecation")
 	public User getVotingPluginUser(String playerName) {
-		return new User(playerName);
+		return new User(com.Ben12345rocks.AdvancedCore.UserManager.UserManager.getInstance().getProperName(playerName));
 	}

 	@SuppressWarnings("deprecation")
 	public User getVotingPluginUser(UUID uuid) {
 		return new User(uuid);
 	}
+
+	public User getVotingPluginUser(java.util.UUID uuid) {
+		return getVotingPluginUser(new UUID(uuid.toString()));
+	}
 }
@@ -61,6 +61,8 @@ public class PlaceHolders {
 			return Integer.toString(user.getMonthTotal());
 		} else if (identifier.equalsIgnoreCase("alltimetotal")) {
 			return Integer.toString(user.getAllTimeTotal());
+		} else if (identifier.equalsIgnoreCase("lastmonthtotal")) {
+			return Integer.toString(user.getLastMonthTotal());
 		}

 		String[] args = identifier.split("_");
@@ -3,18 +3,22 @@ package com.Ben12345rocks.VotingPlugin.VoteParty;
 import java.util.ArrayList;
 import java.util.HashMap;

+import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

 import com.Ben12345rocks.AdvancedCore.Listeners.DayChangeEvent;
+import com.Ben12345rocks.AdvancedCore.Listeners.MonthChangeEvent;
 import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
 import com.Ben12345rocks.AdvancedCore.Objects.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
+import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
+import com.Ben12345rocks.VotingPlugin.Events.VotePartyEvent;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;

@@ -84,6 +88,12 @@ public class VoteParty implements Listener {
 	public void check() {
 		if (getTotalVotes() >= Config.getInstance().getVotePartyVotesRequired()) {
 			setTotalVotes(getTotalVotes() - Config.getInstance().getVotePartyVotesRequired());
+
+			VotePartyEvent event = new VotePartyEvent();
+			Bukkit.getPluginManager().callEvent(event);
+			if (event.isCancelled()) {
+				return;
+			}
 			giveRewards();
 			MiscUtils.getInstance().broadcast(Config.getInstance().getVotePartyBroadcast());
 		}
@@ -97,16 +107,20 @@ public class VoteParty implements Listener {
 	 *            the sender
 	 */
 	public void commandVoteParty(CommandSender sender) {
-		ArrayList<String> msg = Config.getInstance().getFormatCommandsVoteParty();
-		int votesRequired = Config.getInstance().getVotePartyVotesRequired();
-		int votes = getTotalVotes();
-		int neededVotes = votesRequired - votes;
-		HashMap<String, String> placeholders = new HashMap<String, String>();
-		placeholders.put("votesrequired", "" + votesRequired);
-		placeholders.put("neededvotes", "" + neededVotes);
-		placeholders.put("votes", "" + votes);
-		msg = ArrayUtils.getInstance().colorize(ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders));
-		sender.sendMessage(ArrayUtils.getInstance().convert(msg));
+		if (Config.getInstance().getVotePartyEnabled()) {
+			ArrayList<String> msg = Config.getInstance().getFormatCommandsVoteParty();
+			int votesRequired = Config.getInstance().getVotePartyVotesRequired();
+			int votes = getTotalVotes();
+			int neededVotes = votesRequired - votes;
+			HashMap<String, String> placeholders = new HashMap<String, String>();
+			placeholders.put("votesrequired", "" + votesRequired);
+			placeholders.put("neededvotes", "" + neededVotes);
+			placeholders.put("votes", "" + votes);
+			msg = ArrayUtils.getInstance().colorize(ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders));
+			sender.sendMessage(ArrayUtils.getInstance().convert(msg));
+		} else {
+			sender.sendMessage(StringUtils.getInstance().colorize("&cVoteParty not enabled"));
+		}
 	}

 	/**
@@ -167,6 +181,17 @@ public class VoteParty implements Listener {
 	 * Give rewards.
 	 */
 	public void giveRewards() {
+		for (final String cmd : Config.getInstance().getVotePartyCommands()) {
+			Bukkit.getScheduler().runTask(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), cmd);
+				}
+
+			});
+		}
+
 		if (Config.getInstance().getVotePartyGiveAllPlayers()) {
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
@@ -184,8 +209,14 @@ public class VoteParty implements Listener {
 	@EventHandler
 	public void onDayChange(DayChangeEvent event) {
 		if (Config.getInstance().getVotePartyResetEachDay()) {
-			setTotalVotes(0);
-			setVotedUsers(new ArrayList<String>());
+			reset();
+		}
+	}
+
+	@EventHandler
+	public void onMonthChange(MonthChangeEvent event) {
+		if (Config.getInstance().getVotePartyResetMontly()) {
+			reset();
 		}
 	}

@@ -201,6 +232,7 @@ public class VoteParty implements Listener {
 				user.setVotePartyVotes(0);
 			}
 		}
+
 	}

 	/**
@@ -225,4 +257,14 @@ public class VoteParty implements Listener {
 		ServerData.getInstance().saveData();
 	}

+	public synchronized void vote(User user, boolean realVote) {
+		if (Config.getInstance().getVotePartyEnabled()) {
+			if (Config.getInstance().getVotePartyCountFakeVotes() || realVote) {
+				addTotal(user);
+				addVotePlayer(user);
+				check();
+			}
+		}
+	}
+
 }
@@ -103,7 +103,7 @@ public class VoteReminding {
 	 *            the user
 	 */
 	public void runRemind(User user) {
-		if (Config.getInstance().getVoteRemindingEnabled() && user.canVoteAll()) {
+		if (Config.getInstance().getVoteRemindingEnabled() && user.canVoteAll() && user.shouldBeReminded()) {
 			user.setReminded(true);
 			giveReward(user);

@@ -114,11 +114,14 @@ public class VoteReminding {

 	public void runRemindLogin(User user) {
 		if (Config.getInstance().getVoteRemindingEnabled()
-				&& (!UserManager.getInstance().getAllUUIDs().contains(user.getUUID()) || user.canVoteAll())) {
+				&& (!UserManager.getInstance().getAllUUIDs().contains(user.getUUID()) || user.canVoteAll())
+				&& user.shouldBeReminded()) {
 			giveReward(user);
+			if (user.getData().hasData()) {
+				user.setReminded(true);
+			}
 			plugin.debug(user.getPlayerName() + " was reminded!");

 		}
 	}
-
 }
@@ -8,6 +8,7 @@ import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory.ClickEvent;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventoryButton;
 import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
 import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Commands.GUI.PlayerGUIs;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
@@ -60,6 +61,18 @@ public class VoteShop {
 			});
 		}

+		if (Config.getInstance().getVoteShopBackButton()) {
+			inv.addButton(new BInventoryButton(PlayerGUIs.getInstance().getBackButton()) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					PlayerGUIs.getInstance().openVoteGUI(event.getPlayer(),
+							UserManager.getInstance().getVotingPluginUser(player));
+				}
+			});
+
+		}
+
 		inv.openInventory(player);
 	}
 }
Author	SHA1	Message	Date
Ben12345rocks	241746fdf0	Update build path	2017-12-21 19:40:50 -05:00
Ben	37932f570e	Merge pull request #322 from Ben12345rocks/5.12 5.12	2017-12-21 19:39:41 -05:00
Ben12345rocks	1c834a480f	Other changes	2017-12-21 19:31:51 -05:00
Ben12345rocks	6a0d74f400	Update version number	2017-12-18 20:13:52 -05:00
Ben12345rocks	feed85d9bb	Add support for player name in vote url	2017-12-18 16:46:30 -05:00
Ben12345rocks	f9b4adf342	Back to beta version	2017-12-17 16:35:13 -05:00
Ben12345rocks	a04b9b996d	Update version number	2017-12-17 15:45:51 -05:00
Ben12345rocks	4992c547ed	Add an option to add totals	2017-12-17 15:27:54 -05:00
Ben12345rocks	d5c1f3bf11	Some improvements to top voter files	2017-12-17 15:17:10 -05:00
Ben12345rocks	b82736e933	More performance boosts	2017-12-17 13:59:00 -05:00
Ben12345rocks	d0d1e262c2	Performance changes	2017-12-17 13:55:03 -05:00
Ben12345rocks	0b0dea8f51	Bug fixes	2017-12-16 14:40:05 -05:00
Ben12345rocks	48e1298b73	Allow top voter ties	2017-12-16 12:54:44 -05:00
Ben12345rocks	8d850dde7e	Add command to reset offline rewards/votes	2017-12-14 20:00:30 -05:00
Ben12345rocks	963ff8b5f2	Add an option to reset vote party monthly	2017-12-11 19:33:56 -05:00
Ben12345rocks	5a871656c5	Add beta build version	2017-12-10 17:13:22 -05:00
Ben12345rocks	011e18ff9d	Remove debug	2017-12-10 17:11:58 -05:00
Ben12345rocks	53f9b2c9f8	Major improvements	2017-12-10 17:07:11 -05:00
Ben12345rocks	fe488158df	Bug fix	2017-12-10 15:15:08 -05:00
Ben12345rocks	699bb1bdf6	Rename a config option to avoid confusion	2017-12-10 14:58:56 -05:00
Ben12345rocks	f9c8b8a719	Generate item section for a vote site	2017-12-10 14:40:12 -05:00
Ben12345rocks	242eceda2c	Fix typo	2017-12-10 14:17:46 -05:00
Ben12345rocks	98cd79684e	Minor improvements	2017-12-10 14:16:13 -05:00
Ben12345rocks	5b4f73dadf	Small api improvement	2017-12-09 20:12:40 -05:00
Ben12345rocks	a8113aa941	Add new events	2017-12-09 20:09:29 -05:00
Ben12345rocks	f741dbf6a7	Add last month total, closes #317	2017-12-05 18:59:25 -05:00
Ben12345rocks	f589817301	Add ability to execute console commands once for vote party, closes #316	2017-12-03 13:21:36 -05:00
Ben12345rocks	27874ecb70	Fixed wrong month showing in top voter monthly files	2017-12-03 13:12:00 -05:00
Ben12345rocks	73726123ae	Update build path	2017-11-19 15:56:33 -05:00
Ben	0a7637f04b	Merge pull request #312 from Ben12345rocks/5.11 5.11	2017-11-19 15:36:35 -05:00
Ben12345rocks	c4d3068895	Update version number	2017-11-19 15:25:05 -05:00
Ben12345rocks	c497d338f9	Minor improvement	2017-11-19 15:23:29 -05:00
Ben12345rocks	9140466e02	Lots of improvements, closes #306	2017-11-19 14:28:42 -05:00
Ben12345rocks	2d6b1ebd33	Add ability to edit url text from vote url gui	2017-11-13 21:04:22 -05:00
Ben12345rocks	d0ff76e9c4	Add permission to ignore vote reminding	2017-11-13 20:58:57 -05:00
Ben12345rocks	6ff6b14c2d	Bug fixes, closes #303	2017-10-29 12:45:12 -04:00
Ben12345rocks	198dffe5df	Javadoc fixes	2017-10-22 15:51:27 -04:00
Ben12345rocks	868a755d86	Bug fixes	2017-10-22 15:48:30 -04:00
Ben12345rocks	9f4c6bf250	Update build path	2017-10-22 15:28:15 -04:00
Ben	655cec2bac	Merge pull request #299 from Ben12345rocks/5.10.5 5.10.5	2017-10-22 15:24:41 -04:00
Ben12345rocks	9fc0b2c9a3	Bug fix	2017-10-22 14:58:02 -04:00
Ben12345rocks	5aa396cc67	Lots of bug fixes, added purging	2017-10-22 14:51:54 -04:00
Ben12345rocks	d11b90fabd	Update version number	2017-10-22 12:27:05 -04:00
Ben12345rocks	bc85b88c27	Improve update message.	2017-10-22 12:26:18 -04:00
Ben12345rocks	a9e110f21f	Made /vote party say its disabled when disabled	2017-10-20 21:05:50 -04:00
Ben12345rocks	aa4622437f	Bug fix	2017-10-20 21:01:55 -04:00
Ben12345rocks	46eb548962	Bug fixes	2017-10-20 14:49:29 -04:00
Ben12345rocks	25b3494dc5	Bug fixes	2017-10-19 21:55:59 -04:00
Ben12345rocks	33602b3ed2	Bug fixes	2017-10-19 20:34:21 -04:00
Ben12345rocks	36662ab18d	Bug fixes	2017-10-19 15:48:05 -04:00
Ben12345rocks	40473b14a2	Bug fixes	2017-10-19 15:07:38 -04:00
Ben12345rocks	6ca6529f2c	Improvements	2017-10-19 13:42:04 -04:00
Ben12345rocks	a6b2945b14	More improvements	2017-10-19 11:51:11 -04:00
Ben12345rocks	b5fc7da7c9	Lots of command improvements	2017-10-19 11:48:23 -04:00
Ben12345rocks	41104be50f	Minor bug fix	2017-10-16 21:56:10 -04:00
Ben12345rocks	e2dabbb8c1	Update build path	2017-10-16 21:38:50 -04:00
Ben12345rocks	5f37262a48	Update build path	2017-10-16 21:37:59 -04:00
Ben12345rocks	efd48a1005	Add download completion message, closes #296	2017-10-16 21:36:54 -04:00
Ben12345rocks	a813172c43	Bug fix	2017-10-14 08:17:54 -04:00
Ben12345rocks	0f8f190a21	Javadoc fixes	2017-10-13 20:47:32 -04:00
Ben12345rocks	0f87222709	Update build path and new config option	2017-10-13 20:42:15 -04:00
Ben	518ecfc42b	Merge pull request #294 from Ben12345rocks/5.10.3 5.10.3	2017-10-13 20:18:15 -04:00
Ben12345rocks	d02c4a4b70	Update version number	2017-10-13 19:57:05 -04:00
Ben12345rocks	9359b4fb05	Bug fixes	2017-10-13 11:06:16 -04:00
Ben12345rocks	4f3ba5b1c4	Make storage type case insensitive	2017-10-13 10:34:39 -04:00
Ben12345rocks	600287e9c5	Add a warning if no rewards are detected for vote sites on startup	2017-10-13 10:21:14 -04:00
Ben12345rocks	a05114e277	Added vote option in votesite admin gui	2017-10-13 10:11:43 -04:00
Ben12345rocks	5449038cfd	Changes to permissions	2017-10-11 20:25:52 -04:00
Ben12345rocks	853cdd0a13	Code cleanup	2017-10-11 20:13:16 -04:00
Ben12345rocks	3cd36d3fd7	Add options for fake votes, closes #269	2017-10-11 20:11:00 -04:00
Ben12345rocks	bd3abaae76	Use better skull system, closes #293	2017-10-03 16:54:37 -04:00
Ben12345rocks	a9a70a20ee	Bug fix	2017-10-01 19:22:37 -04:00
Ben12345rocks	2fc2067bc5	Bug fixes, closes #288	2017-10-01 13:49:44 -04:00
Ben12345rocks	2e6e3617a3	Fix issues with permissions	2017-10-01 13:43:35 -04:00
Ben12345rocks	c590ca5a93	Bug fix, closes #286	2017-09-29 16:03:38 -04:00
Ben12345rocks	2772db23b8	Improvements	2017-09-29 15:31:47 -04:00
Ben12345rocks	ee3217b942	Bug fix	2017-09-28 15:13:22 -04:00
Ben12345rocks	b1dfe6a14b	Bug fix	2017-09-28 14:52:01 -04:00
Ben12345rocks	222a3824af	Bug fix	2017-09-28 14:49:44 -04:00
Ben12345rocks	5f5d3dd2c5	Bug fixes	2017-09-28 14:45:07 -04:00
Ben12345rocks	84ba523233	Bug fix	2017-09-28 14:35:07 -04:00
Ben12345rocks	1da224ff6b	closes #281	2017-09-28 14:16:56 -04:00
Ben12345rocks	e2efe2b289	Added more config options, closes #283	2017-09-28 14:02:58 -04:00
Ben12345rocks	9cf044aa64	Bug fixes, closes #280	2017-09-26 16:30:55 -04:00
Ben12345rocks	eac8078a65	Improvements	2017-09-26 14:20:35 -04:00
Ben12345rocks	2cf97ba408	Javadoc fix	2017-09-26 14:15:30 -04:00
Ben	23ffc18289	Merge pull request #279 from Ben12345rocks/5.10.2 5.10.2	2017-09-26 14:12:57 -04:00
Ben12345rocks	2152a6688f	Update version number	2017-09-26 14:12:03 -04:00
Ben12345rocks	c3220392eb	Improve message	2017-09-26 14:10:45 -04:00
Ben12345rocks	fec401485b	Improve the service sites message	2017-09-26 14:03:27 -04:00
Ben12345rocks	2b2a6385b4	Bug fixes	2017-09-26 11:23:16 -04:00
Ben12345rocks	9937f3d9c0	Bug fixes	2017-09-26 10:50:54 -04:00
Ben12345rocks	b276d516a6	Improve message for offline vote debug	2017-09-26 10:30:47 -04:00
Ben12345rocks	d6a336e9b9	Bug fixes	2017-09-26 10:29:52 -04:00
Ben12345rocks	b356cb1794	Bug fixes, closes #276	2017-09-26 08:46:29 -04:00
Ben12345rocks	4b0a2ee384	Add backbutton to vote shop	2017-09-25 21:31:44 -04:00
Ben12345rocks	8dab62124e	Add a warning to help track down missing item sections	2017-09-25 21:23:18 -04:00
Ben12345rocks	a7df1a0150	Bug fix	2017-09-25 21:00:00 -04:00
Ben12345rocks	f2d7e24400	Make names case insensitive, closes #267	2017-09-25 20:52:21 -04:00
Ben12345rocks	fa74bdcb3c	Bug fix	2017-09-25 20:30:25 -04:00
Ben12345rocks	80a4cb8f78	Improve vote delay daily, closes #272	2017-09-25 20:29:46 -04:00
Ben12345rocks	f16aef16d4	Add a method of getting service sites, closes #271	2017-09-25 20:23:19 -04:00
Ben12345rocks	e7a1a1241b	Bug fixes, closes #273 , closes #274	2017-09-25 20:09:56 -04:00
Ben12345rocks	0ee002e3fb	Bug fix, closes #278	2017-09-25 20:01:42 -04:00
Ben12345rocks	69ab9df8b3	Minor config fix	2017-09-25 19:53:59 -04:00
Ben12345rocks	54ff1dd66b	Update build path	2017-09-22 09:46:28 -04:00
Ben12345rocks	75732910e2	Update build path	2017-09-22 09:44:36 -04:00
Ben	9c6614836a	Merge pull request #266 from Ben12345rocks/5.10.1 5.10.1	2017-09-22 09:42:47 -04:00
Ben12345rocks	72148816e5	Update version number	2017-09-22 08:56:35 -04:00
Ben12345rocks	f969c91170	Don't set points if no points are added	2017-09-21 08:46:10 -04:00
Ben12345rocks	904d660919	Trim leading and trailing whitespace from votes	2017-09-20 11:45:46 -04:00
Ben12345rocks	fb5449effe	Bug fixes	2017-09-17 20:05:31 -04:00
Ben12345rocks	46db998e17	Make yml errors much more visible	2017-09-17 15:23:33 -04:00
Ben12345rocks	2bcf096584	Bug fix	2017-09-03 15:34:59 -04:00
Ben12345rocks	c2b7e2388e	javadoc fix	2017-09-03 15:27:44 -04:00
Ben	180ae04b24	Merge pull request #256 from Ben12345rocks/5.10 5.10	2017-09-03 15:23:27 -04:00
Ben12345rocks	73efcfb87f	Update build path	2017-09-03 15:23:03 -04:00
Ben12345rocks	6ba2ff582a	Remove debug	2017-09-03 15:16:28 -04:00
Ben12345rocks	d622b5b684	Improvements	2017-09-03 15:10:55 -04:00
Ben12345rocks	2247134daa	Update version number	2017-09-03 13:06:49 -04:00
Ben12345rocks	7de7150e41	Update build path	2017-09-03 13:01:14 -04:00
Ben12345rocks	be23989a20	Add ability to not clear cache on update, improving speeds	2017-09-03 12:44:37 -04:00
Ben12345rocks	8c4bdc8e20	Add option to disregard fake votes for voteparty	2017-09-03 12:24:46 -04:00
Ben12345rocks	f4d507d821	Add command for voteparty	2017-09-03 12:16:44 -04:00
Ben12345rocks	43fd338efd	New option	2017-08-30 10:28:12 -04:00
Ben12345rocks	c51873e7b2	Improvements	2017-08-30 10:23:06 -04:00
Ben	5e1d5b534b	Merge pull request #251 from Ben12345rocks/5.9.7 5.9.7	2017-08-27 13:02:22 -04:00
Ben12345rocks	c762ef5be1	Update version number	2017-08-27 12:59:45 -04:00
Ben12345rocks	1d0f8d5c06	Prevent exploits	2017-08-26 19:46:44 -04:00
Ben12345rocks	6129480077	More config options, closes #248	2017-08-24 11:35:44 -04:00
Ben12345rocks	f8d7c837f9	Add command to clear offline votes, closes #249	2017-08-24 11:23:29 -04:00
Ben12345rocks	d7aba7b390	Add an option for max mysql size	2017-08-20 12:29:56 -04:00
Ben12345rocks	5833a1c5cc	Update build path	2017-08-11 20:52:36 -04:00
Ben12345rocks	6833247a8c	Update build path	2017-08-11 20:49:57 -04:00
Ben	46087ccad5	Merge pull request #244 from Ben12345rocks/5.9.6 5.9.6	2017-08-11 20:49:16 -04:00
Ben12345rocks	4634d6bdc2	More improvements	2017-08-11 20:38:38 -04:00
Ben12345rocks	3f451c888a	Improvements to service sites	2017-08-11 20:36:49 -04:00
Ben12345rocks	ea448e3920	Bug fix	2017-08-11 20:25:33 -04:00
Ben12345rocks	169aaf026e	Update version number	2017-08-11 14:11:01 -04:00
Ben12345rocks	0af3f7f2bc	Update build path	2017-08-08 10:38:50 -04:00
Ben	b3baa33c39	Merge pull request #240 from Ben12345rocks/5.9.5 5.9.5	2017-08-08 10:34:31 -04:00
Ben12345rocks	e7f8aac88d	Bug fix	2017-08-08 10:30:12 -04:00
Ben12345rocks	6ce4040bae	Update build path	2017-08-07 17:37:44 -04:00
Ben12345rocks	f5e38b2b1b	Update version number	2017-08-07 17:22:19 -04:00
Ben12345rocks	9fdb9b4efb	Minor change to user api	2017-08-06 12:44:57 -04:00
Ben12345rocks	29f020bdc0	Bug fix	2017-08-03 18:22:34 -04:00
Ben12345rocks	cce5bb0672	Bug fix, closes #238	2017-08-03 17:47:43 -04:00
Ben12345rocks	8a0cd0426c	Fix offline top voter messaging	2017-08-02 21:02:38 -04:00
Ben12345rocks	397c4392a0	Update perms list	2017-08-02 19:33:27 -04:00
Ben12345rocks	4784b372c9	Make site names non case sensitive, closes #235	2017-07-31 20:09:35 -04:00
Ben12345rocks	1521d0787c	Add vanish support for broadcasting, closes #232	2017-07-31 20:05:30 -04:00
Ben12345rocks	9cbcb74822	Improve last vote time showing when never voted, closes #237	2017-07-31 19:57:07 -04:00