Merge pull request #279 from Ben12345rocks/5.10.2

5.10.2

README.md

@@ -17,6 +17,7 @@ https://github.com/Ben12345rocks/VotingPlugin/blob/master/VotingPlugin/LICENSE.t
 	    <groupId>com.github.Ben12345rocks</groupId>
 	    <artifactId>VotingPlugin</artifactId>
 	    <version>LATEST</version>
+	    <scope>provided</scope>
 	</dependency>
   
   Versions:  

VotingPlugin/.classpath

@@ -11,7 +11,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

VotingPlugin/.settings/org.eclipse.jdt.core.prefs

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

VotingPlugin/.settings/org.jboss.ide.eclipse.as.core.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.jboss.ide.eclipse.as.core.singledeployable.deployableList=\n

VotingPlugin/Resources/Config.yml

@@ -19,6 +19,10 @@ 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
 
 # Let players who never joined before vote
 # Recommend: False (Will prevent creating random user data files)
@@ -70,7 +74,7 @@ VoteReminding:
   # Can add titles and more in the reward file
   Rewards:
     Messages:
-      Player: '&aRemeber to vote!'
+      Player: '&aRemember to vote!'
     Title:
       Enabled: false
       Title: '&cRemember to vote!'
@@ -104,12 +108,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%'
 
@@ -155,6 +153,8 @@ Format:
           TimeUntilVote: '%hours% Hours and %minutes% Minutes'
           # 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: '%hours% Hours and %minutes% Minutes'
           
        # Format for /vote last
       Last:
@@ -319,19 +319,29 @@ GUI:
         Amount: 1
         Name: '&4Today'
       Slot: 5
-    Rewards:
+    Shop:
       Item:
         Material: 'DIAMOND'
         Data: 0
         Amount: 1
-        Name: '&4Voting Rewards'
+        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
   VoteURL:
     # GUI Name
     Name: '&cVoteURL'
+    BackButton: true
     SiteName: '&c%Name%'
     SeeURL: '&cClick to see URL'
     NextVote: '&cCan Vote In: %Info%'
@@ -341,10 +351,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 
@@ -381,12 +397,16 @@ GUI:
           Slot: 0
   VoteLast:
     Name: 'VoteLast: %player%'
+    BackButton: true
   VoteNext:
     Name: 'VoteNext: %player%'
+    BackButton: true
   VoteToday:
     Name: 'VoteToday'
+    BackButton: true
   VoteTop:
     Name: 'VoteTop %topvoter%'
+    BackButton: false
     Item:
       Name: '&3&l%position%: &3%player%'
       Lore: '&3&lVotes: &3%votes%'
@@ -402,6 +422,7 @@ GUI:
     Size: 27
   VoteTotal:
     Name: 'VoteTotal: %player%'
+    BackButton: true
     DayTotal:
       Item:
         Material: 'WATCH'
@@ -448,6 +469,7 @@ GUI:
         Amount: 1
   VoteStreak:
     Name: 'VoteBest: %player%'
+    BackButton: false
     CurrentDayStreak:
       Item:
         Material: 'WATCH'
@@ -489,7 +511,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
@@ -562,11 +591,18 @@ VoteParty:
   GiveAllPlayers: false
   # If true, the vote count will reset each day
   ResetEachDay: 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!'
   # Reward files to give
   Rewards: []
   
+# Reset milestons at end of the month
+ResetMilestonesMonthly: false
+  
 MileStones:
   # Number of votes required
   # Allows multiple milestones
@@ -577,12 +613,12 @@ MileStones:
     Rewards: 
       Messages:
         Player: '&aYou got %milestone% milestone votes!'
-    ResetMonthly: false
     
 VoteStreak:
   # Valid options: Day, Week, Month
   Day:
     # Number of days in a row
+    # Each day requires one vote
     '2':
       # Enabled or not
       Enabled: false
@@ -591,7 +627,8 @@ VoteStreak:
         Messages:
           Player: "&aYou voted for %Streak% %Type%'s in a row!"
   Week:
-    # Number of days in a row
+    # Number of weeks in a row
+    # Requires atleast one vote per week
     '2':
       # Enabled or not
       Enabled: false
@@ -600,7 +637,8 @@ VoteStreak:
         Messages:
           Player: "&aYou voted for %Streak% %Type%'s in a row!"
   Month:
-    # Number of days in a row
+    # Number of months in a row
+    # Requires atleast 1 vote per month
     '2':
       # Enabled or not
       Enabled: false
@@ -653,7 +691,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:
@@ -693,6 +731,10 @@ DailyAwards:
 # Most of these values can be left untouched
 # ------------------------------------------------
 
+# Number of points to give on vote
+# 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
@@ -733,6 +775,16 @@ 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
 DisableNoServiceSiteMessage: false
+
+# Used in special cases
+# Much slower, but may work better
+AlternateUUIDLookup: false
+
+# Shouldn't need to change this
+AutoKillInvs: true

VotingPlugin/Resources/VoteSites.yml

@@ -28,6 +28,12 @@ VoteSites:
     # Most sites are 24 hours
     VoteDelay: 24
     
+    # 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
+    
     # VoteSite Material for GUI's
     Item:
       Material: 'DIAMOND'
@@ -35,4 +41,8 @@ VoteSites:
 
     # List of reward files to give to voter
     Rewards:
-    - 'ExampleReward'
+    - 'ExampleReward'
+    
+# Reward for any site
+# Similar to AnySiteReward
+EverySiteReward: []

VotingPlugin/Resources/plugin.yml

@@ -8,8 +8,6 @@ softdepend: [AdvancedCore]
 commands:
   vote:
     description: Vote command
-  v:
-    description: Vote command
   adminvote:
     description: Admin commands for VotingPlugin
   av:
@@ -158,6 +156,30 @@ 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
 permissions:
   VotingPlugin.Player:
     description: Allows basic access player commands

VotingPlugin/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.8.2</version>
+	<version>5.10.2</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -55,25 +55,25 @@
 							other plugins -->
 						<relocation>
 							<pattern>com.Ben12345rocks.AdvancedCore</pattern>
-							<shadedPattern>${groupId}.${artifactId}.AdvancedCore</shadedPattern>
+							<shadedPattern>${project.groupId}.${project.artifactId}.AdvancedCore</shadedPattern>
 						</relocation>
 						<!-- Lets relocate the shaded API so we dont cause any conflicts with 
 							other plugins -->
 						<relocation>
 							<pattern>net.pl3x.bukkit.chatapi</pattern>
-							<shadedPattern>${groupId}.${artifactId}</shadedPattern>
+							<shadedPattern>${project.groupId}.${project.artifactId}</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>me.mrten.mysqlapi</pattern>
-							<shadedPattern>${groupId}.${artifactId}.mysqlapi</shadedPattern>
+							<shadedPattern>${project.groupId}.${project.artifactId}.mysqlapi</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>com.zaxxer.HikariCP</pattern>
-							<shadedPattern>${groupId}.${artifactId}.HikariCP</shadedPattern>
+							<shadedPattern>${project.groupId}.${project.artifactId}.HikariCP</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>org.slf4j.slf4j-simple</pattern>
-							<shadedPattern>${groupId}.${artifactId}.slf4j-simple</shadedPattern>
+							<shadedPattern>${project.groupId}.${project.artifactId}.slf4j-simple</shadedPattern>
 						</relocation>
 					</relocations>
 				</configuration>
@@ -156,13 +156,12 @@
 			<artifactId>AdvancedCore</artifactId>
 			<version>master-SNAPSHOT</version>
 		</dependency>
-
 		<!-- <dependency> <groupId>com.Ben12345rocks</groupId> <artifactId>AdvancedCore</artifactId> 
 			<version>LATEST</version> <scope>compile</scope> </dependency> -->
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.11.2-R0.1-SNAPSHOT</version>
+			<version>1.12.2-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -179,5 +178,12 @@
 			<scope>system</scope>
 			<systemPath>${project.basedir}/Jars/GAListener.jar</systemPath>
 		</dependency>
+		<dependency>
+			<groupId>com.mythicacraft</groupId>
+			<artifactId>voteroulette</artifactId>
+			<version>3.2.2</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/Jars/VoteRoulette.jar</systemPath>
+		</dependency>
 	</dependencies>
 </project>

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

@@ -2,10 +2,14 @@ package com.Ben12345rocks.VotingPlugin.Commands;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map.Entry;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
@@ -34,12 +38,22 @@ import com.Ben12345rocks.VotingPlugin.Commands.GUI.PlayerGUIs;
 import com.Ben12345rocks.VotingPlugin.Commands.TabCompleter.AliasesTabCompleter;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Data.ServerData;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
+import com.Ben12345rocks.VotingPlugin.Events.VotiferEvent;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
 import com.Ben12345rocks.VotingPlugin.VoteShop.VoteShop;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Table;
+import com.google.common.collect.Table.Cell;
+import com.mythicacraft.voteroulette.VoteRoulette;
+import com.mythicacraft.voteroulette.Voter;
+import com.swifteh.GAL.GAL;
+import com.swifteh.GAL.GALVote;
+import com.swifteh.GAL.VoteType;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -93,6 +107,13 @@ public class CommandLoader {
 		CommandLoader.plugin = plugin;
 	}
 
+	/**
+	 * @return the adminPerm
+	 */
+	public String getAdminPerm() {
+		return adminPerm;
+	}
+
 	/**
 	 * Gets the commands.
 	 *
@@ -102,25 +123,91 @@ public class CommandLoader {
 		return commands;
 	}
 
+	/**
+	 * @return the modPerm
+	 */
+	public String getModPerm() {
+		return modPerm;
+	}
+
+	/**
+	 * @return the playerPerm
+	 */
+	public String getPlayerPerm() {
+		return playerPerm;
+	}
+
 	/**
 	 * Load admin vote command.
 	 */
 	private void loadAdminVoteCommand() {
 		plugin.adminVoteCommand = new ArrayList<CommandHandler>();
 
-		plugin.adminVoteCommand
-				.add(new CommandHandler(new String[] { "TriggerPlayerVoteEvent", "(player)", "(Sitename)" },
-						"VotingPlugin.Commands.AdminVote.TriggerPlayerVoteEvent|" + adminPerm,
-						"Trigger vote event, used for testing") {
-
-					@Override
-					public void execute(CommandSender sender, String[] args) {
-						PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[2]),
-								UserManager.getInstance().getVotingPluginUser(args[1]));
-						plugin.getServer().getPluginManager().callEvent(voteEvent);
+		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "ConvertFrom", "GAL" },
+				"VotingPlugin.Commands.AdminVote.ConvertFrom.GAL|" + adminPerm, "Convert from GAL") {
 
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				if (Bukkit.getServer().getPluginManager().getPlugin("GAListener") != null) {
+					Table<String, Integer, Long> totals = GAL.p.db.getTotals();
+					for (Cell<String, Integer, Long> entry : totals.cellSet()) {
+						String name = entry.getRowKey();
+						int total = entry.getColumnKey();
+						User user = UserManager.getInstance().getVotingPluginUser(name);
+						user.setAllTimeTotal(user.getAllTimeTotal() + total);
 					}
-				});
+					sender.sendMessage("Totals added");
+
+					ListMultimap<VoteType, GALVote> votes = GAL.p.galVote;
+					for (Entry<VoteType, GALVote> entry : votes.entries()) {
+						if (entry.getKey().equals(VoteType.NORMAL)) {
+							String msg = entry.getValue().message;
+							List<String> cmds = entry.getValue().commands;
+							String service = entry.getValue().key;
+							if (service.equalsIgnoreCase("default")) {
+
+							} else {
+								VoteSite site = plugin.getVoteSite(service);
+								if (site == null) {
+									sender.sendMessage("Failed to create vote site, autogeneratesites false?");
+									return;
+								}
+								ConfigurationSection data = configVoteSites.getData()
+										.getConfigurationSection(configVoteSites.getRewardsPath(site.getKey()));
+								data.set("Commands.Console", cmds);
+								data.set("Messages.Player", msg);
+								configVoteSites.saveData();
+								sender.sendMessage("created vote site: " + site.getKey());
+							}
+
+						}
+					}
+				} else {
+					sender.sendMessage("GAL not loaded");
+				}
+			}
+		});
+
+		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "ConvertFrom", "VoteRoulette" },
+				"VotingPlugin.Commands.AdminVote.ConvertFrom.GAL|" + adminPerm, "Convert from VoteRoulette") {
+
+			@SuppressWarnings("static-access")
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				if (Bukkit.getServer().getPluginManager().getPlugin("VoteRoulette") != null) {
+					for (OfflinePlayer offPlayer : Bukkit.getOfflinePlayers()) {
+						VoteRoulette.getInstance();
+						Voter voter = VoteRoulette.getVoterManager().getVoter(offPlayer.getUniqueId(),
+								offPlayer.getName());
+						User user = UserManager.getInstance().getVotingPluginUser(offPlayer);
+						user.setAllTimeTotal(user.getAllTimeTotal() + voter.getStatSheet().getLifetimeVotes());
+						user.setMonthTotal(user.getMonthTotal() + voter.getStatSheet().getCurrentMonthVotes());
+					}
+				} else {
+					sender.sendMessage("VoteRoulette not loaded");
+				}
+			}
+		});
 
 		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "SetPoints", "(player)", "(number)" },
 				"VotingPlugin.Commands.AdminVote.SetPoints|" + adminPerm, "Set players voting points") {
@@ -140,7 +227,20 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 				user.addPoints(Integer.parseInt(args[2]));
-				sender.sendMessage(StringUtils.getInstance().colorize("&cGave " + args[1] + " " + args[2] + " points"));
+				sender.sendMessage(StringUtils.getInstance().colorize("&cGave " + args[1] + " " + args[2] + " points"
+						+ ", " + args[1] + " now has " + user.getPoints() + " points"));
+			}
+		});
+
+		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "RemovePoints", "(player)", "(number)" },
+				"VotingPlugin.Commands.AdminVote.RemovePoints|" + adminPerm, "Remove voting points") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				user.removePoints(Integer.parseInt(args[2]));
+				sender.sendMessage(StringUtils.getInstance().colorize("&cRemoved " + args[2] + " points from " + args[1]
+						+ ", " + args[1] + " now has " + user.getPoints() + " points"));
 			}
 		});
 
@@ -154,6 +254,27 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "ServiceSites" },
+				"VotingPlugin.Commands.AdminVote.ServiceSites|" + adminPerm,
+				"See a list of all service sites the server got") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				sendMessage(sender, "&cEvery service site the server has gotten:");
+
+				for (String serviceSites : ServerData.getInstance().getServiceSites()) {
+					boolean hasSite = plugin.hasVoteSite(serviceSites);
+					if (hasSite) {
+						String siteName = plugin.getVoteSiteName(serviceSites);
+						sendMessage(sender, serviceSites + " : Current site = " + siteName);
+					} else {
+						sendMessage(sender, serviceSites + " : No site with this service site, did you do something wrong?");
+					}
+				}
+
+			}
+		});
+
 		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "Help&?", "(number)" },
 				"VotingPlugin.Commands.AdminVote.Help|" + adminPerm, "See this page") {
 
@@ -279,8 +400,10 @@ public class CommandLoader {
 					return;
 				}
 				try {
+					sender.sendMessage("Starting to convert");
 					UserStorage prevStorage = UserStorage.valueOf(args[1].toUpperCase());
 					plugin.convertDataStorage(prevStorage, AdvancedCoreHook.getInstance().getStorageType());
+					sender.sendMessage("Finished converting!");
 				} catch (Exception ex) {
 					ex.printStackTrace();
 				}
@@ -347,8 +470,10 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				CommandAdminVote.getInstance().Vote(sender, args[1], args[2]);
-
+				VotiferEvent.playerVote(args[1], args[2], false);
+				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[2]),
+						UserManager.getInstance().getVotingPluginUser(args[1]));
+				plugin.getServer().getPluginManager().callEvent(voteEvent);
 			}
 		});
 
@@ -378,7 +503,8 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						CommandAdminVote.getInstance().setVoteSiteServiceSite(sender, args[1], args[3]);
+						CommandAdminVote.getInstance().setVoteSiteServiceSite(sender, plugin.getVoteSiteName(args[1]),
+								args[3]);
 					}
 				});
 
@@ -388,7 +514,8 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						CommandAdminVote.getInstance().setVoteSiteVoteURL(sender, args[1], args[3]);
+						CommandAdminVote.getInstance().setVoteSiteVoteURL(sender, plugin.getVoteSiteName(args[1]),
+								args[3]);
 					}
 				});
 
@@ -399,7 +526,8 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 
-						CommandAdminVote.getInstance().setVoteSitePriority(sender, args[1], Integer.parseInt(args[3]));
+						CommandAdminVote.getInstance().setVoteSitePriority(sender, plugin.getVoteSiteName(args[1]),
+								Integer.parseInt(args[3]));
 
 					}
 				});
@@ -411,7 +539,8 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 
-						CommandAdminVote.getInstance().setVoteSiteVoteDelay(sender, args[1], Integer.parseInt(args[3]));
+						CommandAdminVote.getInstance().setVoteSiteVoteDelay(sender, plugin.getVoteSiteName(args[1]),
+								Integer.parseInt(args[3]));
 
 					}
 				});
@@ -441,7 +570,7 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 
-						CommandAdminVote.getInstance().setVoteSiteEnabled(sender, args[1],
+						CommandAdminVote.getInstance().setVoteSiteEnabled(sender, plugin.getVoteSiteName(args[1]),
 								Boolean.parseBoolean(args[3]));
 
 					}
@@ -453,7 +582,7 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 
-				CommandAdminVote.getInstance().checkVoteSite(sender, args[1]);
+				CommandAdminVote.getInstance().checkVoteSite(sender, plugin.getVoteSiteName(args[1]));
 
 			}
 		});
@@ -469,6 +598,29 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "SetVotePartyCount", "(number)" },
+				"VotingPlugin.Commands.AdminVote.SetVotePartyCount|" + adminPerm, "Set voteparty count") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				plugin.getVoteParty().setTotalVotes(Integer.parseInt(args[1]));
+				sendMessage(sender, "&cSet vote party count to " + args[1]);
+			}
+		});
+
+		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "ClearOfflineVotes" },
+				"VotingPlugin.Commands.AdminVote.ClearOfflineVotes|" + adminPerm, "Clear all offline votes") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+					User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+					user.setOfflineVotes(new ArrayList<String>());
+				}
+				sender.sendMessage(StringUtils.getInstance().colorize("&cCleared"));
+			}
+		});
+
 		ArrayList<CommandHandler> avCommands = com.Ben12345rocks.AdvancedCore.Commands.CommandLoader.getInstance()
 				.getBasicAdminCommands("VotingPlugin");
 		for (CommandHandler cmd : avCommands) {
@@ -552,9 +704,9 @@ public class CommandLoader {
 
 													@Override
 													public void onInput(Player player, String value) {
-
-														CommandAdminVote.getInstance().Vote(player,
-																UserGUI.getInstance().getCurrentPlayer(player), value);
+														VotiferEvent.playerVote(
+																UserGUI.getInstance().getCurrentPlayer(player), value,
+																false);
 
 														player.sendMessage("Forced vote for "
 																+ UserGUI.getInstance().getCurrentPlayer(player)
@@ -628,11 +780,10 @@ public class CommandLoader {
 												int mileStone = Integer.parseInt(mileStoneName);
 
 												inv.addButton(inv.getNextSlot(),
-														new BInventoryButton("" + mileStone,
-																new String[] {
-																		"Enabled: " + Config.getInstance()
-																				.getMilestoneRewardEnabled(mileStone),
-																		"&cClick to set wether this has been completed or not" },
+														new BInventoryButton("" + mileStone, new String[] {
+																"Enabled: " + Config.getInstance()
+																		.getMilestoneRewardEnabled(mileStone),
+																"&cClick to set wether this has been completed or not" },
 																new ItemStack(Material.STONE)) {
 
 															@Override
@@ -870,7 +1021,12 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				Player player = (Player) sender;
-				PlayerGUIs.getInstance().openVoteGUI(player, UserManager.getInstance().getVotingPluginUser(args[1]));
+				if (com.Ben12345rocks.AdvancedCore.UserManager.UserManager.getInstance().userExist(args[1])) {
+					PlayerGUIs.getInstance().openVoteGUI(player,
+							UserManager.getInstance().getVotingPluginUser(args[1]));
+				} else {
+					sendMessage(sender, "&cUser does not exist: " + args[1]);
+				}
 
 			}
 		});
@@ -1090,7 +1246,12 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				if (!Config.getInstance().getCommandsUseGUIVote()) {
-					CommandVote.getInstance().voteURLs(sender);
+					if (isPlayer(sender)) {
+						User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
+						user.sendMessage(Commands.getInstance().voteURLs(user));
+					} else {
+						sender.sendMessage(Commands.getInstance().voteURLs(null));
+					}
 				} else {
 					if (sender instanceof Player) {
 						PlayerGUIs.getInstance().openVoteURL((Player) sender);

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

@@ -122,9 +122,9 @@ public class Commands {
 
 		for (CommandHandler cmdHandle : plugin.adminVoteCommand) {
 			if (sender.hasPermission(cmdHandle.getPerm()) && requirePerms) {
-				unsorted.put(cmdHandle.getHelpLineCommand("/av"), cmdHandle.getHelpLine("/av"));
+				unsorted.put(cmdHandle.getHelpLineCommand("/adminvote"), cmdHandle.getHelpLine("/adminvote"));
 			} else {
-				unsorted.put(cmdHandle.getHelpLineCommand("/av"), cmdHandle.getHelpLine("/av"));
+				unsorted.put(cmdHandle.getHelpLineCommand("/adminvote"), cmdHandle.getHelpLine("/adminvote"));
 			}
 		}
 		ArrayList<String> unsortedList = new ArrayList<String>();
@@ -197,7 +197,7 @@ public class Commands {
 		ArrayList<String> msg = new ArrayList<String>();
 
 		for (CommandHandler handle : plugin.voteCommand) {
-			msg.add(handle.getHelpLineCommand("/v") + " : " + handle.getPerm());
+			msg.add(handle.getHelpLineCommand("/vote") + " : " + handle.getPerm());
 		}
 
 		for (CommandHandler handle : plugin.adminVoteCommand) {
@@ -467,16 +467,10 @@ public class Commands {
 		return ArrayUtils.getInstance().convert(ArrayUtils.getInstance().colorize(msg));
 	}
 
-	/**
-	 * Update vote today.
-	 */
-	public void updateVoteToday() {
-		ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
-
+	public void updateVoteToday(ArrayList<User> users) {
 		plugin.voteToday.clear();
 
-		for (String uuid : uuids) {
-			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+		for (User user : users) {
 			HashMap<VoteSite, LocalDateTime> times = new HashMap<VoteSite, LocalDateTime>();
 			for (VoteSite voteSite : plugin.getVoteSites()) {
 				long time = user.getTime(voteSite);
@@ -530,9 +524,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) {
@@ -587,29 +585,49 @@ public class Commands {
 		LocalDateTime now = LocalDateTime.now();
 		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault());
 
-		int votedelay = voteSite.getVoteDelay();
-		if (votedelay == 0) {
-			String errorMsg = config.getFormatCommandsVoteNextInfoError();
-			info = errorMsg;
-		} else {
-
-			LocalDateTime nextvote = lastVote.plusHours(votedelay);
-
-			if (time == 0 || now.isAfter(nextvote)) {
-				String canVoteMsg = config.getFormatCommandsVoteNextInfoCanVote();
-				info = canVoteMsg;
+		if (!voteSite.isVoteDelayDaily()) {
+			int votedelay = voteSite.getVoteDelay();
+			if (votedelay == 0) {
+				String errorMsg = config.getFormatCommandsVoteNextInfoError();
+				info = errorMsg;
 			} else {
-				Duration dur = Duration.between(now, nextvote);
 
-				long diffHours = dur.getSeconds() / (60 * 60);
-				long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;
+				LocalDateTime nextvote = lastVote.plusHours(votedelay);
 
-				String timeMsg = config.getFormatCommandsVoteNextInfoTime();
-				timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Long.toString(diffHours));
-				timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%minutes%", Long.toString(diffMinutes));
+				if (time == 0 || now.isAfter(nextvote)) {
+					info = config.getFormatCommandsVoteNextInfoCanVote();
+				} else {
+					Duration dur = Duration.between(now, nextvote);
+
+					long diffHours = dur.getSeconds() / (60 * 60);
+					long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;
+
+					String timeMsg = config.getFormatCommandsVoteNextInfoTime();
+					timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Long.toString(diffHours));
+					timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
+							Long.toString(diffMinutes));
+					info = timeMsg;
+
+				}
+			}
+		} else {
+			if (lastVote.getDayOfYear() == now.getDayOfYear() && lastVote.getYear() == now.getYear()) {
+				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();
 			}
+
 		}
 		return info;
 	}
@@ -694,9 +712,9 @@ public class Commands {
 
 		for (CommandHandler cmdHandle : plugin.voteCommand) {
 			if (sender.hasPermission(cmdHandle.getPerm()) && requirePerms) {
-				unsorted.put(cmdHandle.getHelpLineCommand("/v"), cmdHandle.getHelpLine("/v"));
+				unsorted.put(cmdHandle.getHelpLineCommand("/vote"), cmdHandle.getHelpLine("/vote"));
 			} else {
-				unsorted.put(cmdHandle.getHelpLineCommand("/v"), cmdHandle.getHelpLine("/v"));
+				unsorted.put(cmdHandle.getHelpLineCommand("/vote"), cmdHandle.getHelpLine("/vote"));
 			}
 		}
 
@@ -741,12 +759,7 @@ public class Commands {
 		}
 	}
 
-	/**
-	 * Vote UR ls.
-	 *
-	 * @return the string[]
-	 */
-	public String[] voteURLs() {
+	public String[] voteURLs(User user) {
 		ArrayList<String> sites = new ArrayList<String>();
 
 		List<String> title = config.getFormatCommandsVoteText();
@@ -766,6 +779,15 @@ public class Commands {
 				sites.add(msg);
 			}
 		}
+		if (user != null) {
+			HashMap<String, String> phs = new HashMap<String, String>();
+			phs.put("DailyTotal", "" + user.getDailyTotal());
+			phs.put("WeekTotal", "" + user.getWeeklyTotal());
+			phs.put("MonthTotal", "" + user.getMonthTotal());
+			phs.put("Total", "" + user.getAllTimeTotal());
+
+			sites = ArrayUtils.getInstance().replacePlaceHolder(sites, phs);
+		}
 		sites = ArrayUtils.getInstance().colorize(sites);
 		return ArrayUtils.getInstance().convert(sites);
 	}

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

@@ -16,7 +16,6 @@ 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.Events.VotiferEvent;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
@@ -455,18 +454,4 @@ public class CommandAdminVote implements CommandExecutor {
 		}
 	}
 
-	/**
-	 * Vote.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param playerName
-	 *            the player name
-	 * @param voteSite
-	 *            the vote site
-	 */
-	public void Vote(CommandSender sender, String playerName, String voteSite) {
-		VotiferEvent.playerVote(playerName, voteSite);
-	}
-
 }

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

@@ -83,10 +83,9 @@ public class CommandAliases implements CommandExecutor {
 		}
 
 		/*
-		 * for (String arg : cmdHandle.getArgs()[0].split("&")) { argsNew.set(0,
-		 * arg); if (cmdHandle.runCommand(sender,
-		 * Utils.getInstance().convertArray(argsNew))) { plugin.debug(
-		 * "cmd found, ran cmd"); return true; } }
+		 * for (String arg : cmdHandle.getArgs()[0].split("&")) { argsNew.set(0, arg);
+		 * if (cmdHandle.runCommand(sender, Utils.getInstance().convertArray(argsNew)))
+		 * { plugin.debug( "cmd found, ran cmd"); return true; } }
 		 */
 
 		// invalid command

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

@@ -431,19 +431,4 @@ public class CommandVote implements CommandExecutor {
 		}
 	}
 
-	/**
-	 * Vote UR ls.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void voteURLs(CommandSender sender) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(Commands.getInstance().voteURLs());
-		} else {
-			sender.sendMessage(Commands.getInstance().voteURLs());
-		}
-	}
-
 }

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

@@ -16,7 +16,6 @@ import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.Listeners.BooleanListene
 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.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
 
@@ -59,7 +58,7 @@ public class AdminGUI {
 				if (event.getWhoClicked() instanceof Player) {
 					Player player = event.getWhoClicked();
 					if (event.getClick().equals(ClickType.MIDDLE)) {
-						player.closeInventory();
+
 						new ValueRequest().requestString(player, new StringListener() {
 
 							@Override
@@ -76,19 +75,6 @@ public class AdminGUI {
 			}
 		});
 
-		lore = new ArrayList<String>();
-		buttons.add(new BInventoryButton("&cConfig", ArrayUtils.getInstance().convert(lore),
-				new ItemStack(Material.STONE)) {
-
-			@Override
-			public void onClick(ClickEvent event) {
-				if (event.getWhoClicked() instanceof Player) {
-					Player player = event.getWhoClicked();
-					openAdminGUIConfig(player);
-				}
-			}
-		});
-
 		lore = new ArrayList<String>();
 		buttons.add(new BInventoryButton("&cReload Plugin", ArrayUtils.getInstance().convert(lore),
 				new ItemStack(Material.STONE, 1, (short) 3)) {
@@ -108,39 +94,6 @@ public class AdminGUI {
 		}
 	}
 
-	/**
-	 * Open admin GUI config.
-	 *
-	 * @param player
-	 *            the player
-	 */
-	public void openAdminGUIConfig(Player player) {
-		BInventory inv = new BInventory("Config");
-		inv.addButton(inv.getNextSlot(),
-				new BInventoryButton("BroadcastVote",
-						new String[] { "Currently: " + Config.getInstance().getBroadCastVotesEnabled() },
-						new ItemStack(Material.STONE)) {
-
-					@Override
-					public void onClick(ClickEvent event) {
-						Player player = event.getWhoClicked();
-						new ValueRequest().requestBoolean(player, "" + Config.getInstance().getBroadCastVotesEnabled(),
-								new BooleanListener() {
-
-									@Override
-									public void onInput(Player player, boolean value) {
-										Config.getInstance().setBroadcastVoteEnabled(value);
-										player.sendMessage("Value set");
-
-									}
-								});
-					}
-				});
-
-		inv.openInventory(player);
-
-	}
-
 	/**
 	 * Open admin GUI vote sites.
 	 *
@@ -215,7 +168,7 @@ public class AdminGUI {
 					public void onClick(ClickEvent event) {
 						if (event.getWhoClicked() instanceof Player) {
 							Player player = event.getWhoClicked();
-							player.closeInventory();
+
 							new ValueRequest().requestString(player, voteSite.getServiceSite(), null,
 									new StringListener() {
 
@@ -239,7 +192,6 @@ public class AdminGUI {
 			public void onClick(ClickEvent event) {
 				if (event.getWhoClicked() instanceof Player) {
 					Player player = event.getWhoClicked();
-					player.closeInventory();
 					new ValueRequest().requestString(player, voteSite.getServiceSite(), null, new StringListener() {
 
 						@Override
@@ -262,7 +214,7 @@ public class AdminGUI {
 					public void onClick(ClickEvent event) {
 						if (event.getWhoClicked() instanceof Player) {
 							Player player = event.getWhoClicked();
-							player.closeInventory();
+
 							new ValueRequest().requestString(player, voteSite.getVoteURL(), null, new StringListener() {
 
 								@Override

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

@@ -1,12 +1,14 @@
 package com.Ben12345rocks.VotingPlugin.Commands.GUI;
 
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 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;
@@ -25,6 +27,7 @@ import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+import com.Ben12345rocks.VotingPlugin.VoteShop.VoteShop;
 
 public class PlayerGUIs {
 	static PlayerGUIs instance = new PlayerGUIs();
@@ -62,8 +65,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteBest(player, getSelectedPlayer(player));
+
 			}
 		});
 
@@ -72,8 +74,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteBest(player, getSelectedPlayer(player));
+
 			}
 		});
 
@@ -82,8 +83,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteBest(player, getSelectedPlayer(player));
+
 			}
 		});
 
@@ -91,10 +91,16 @@ public class PlayerGUIs {
 	}
 
 	public void openVoteGUI(Player player, User user) {
-		if (!player.getName().equals(user.getPlayerName())
+		if (user == null) {
+			user = UserManager.getInstance().getVotingPluginUser(player);
+			setSelectedPlayer(player, user);
+		}
+		if ((!player.getName().equals(user.getPlayerName())
 				&& !player.hasPermission("VotingPlugin.Commands.Vote.GUI.Other")
-				&& !player.hasPermission("VotingPlugin.Mod")) {
-			player.sendMessage(AdvancedCoreHook.getInstance().getFormatNoPerms());
+				&& !player.hasPermission("VotingPlugin.Mod"))
+				|| (!player.hasPermission("VotingPlugin.Commands.Vote.GUI")
+						&& !player.hasPermission("VotingPlugin.Player"))) {
+			player.sendMessage(StringUtils.getInstance().colorize(AdvancedCoreHook.getInstance().getFormatNoPerms()));
 			return;
 		}
 		setSelectedPlayer(player, user);
@@ -109,7 +115,7 @@ public class PlayerGUIs {
 			lore = ArrayUtils.getInstance().convert(Config.getInstance().getVoteGUISlotLore(slot));
 			if (lore.length == 0) {
 				if (slot.equalsIgnoreCase("url")) {
-					lore = Commands.getInstance().voteURLs();
+					lore = Commands.getInstance().voteURLs(user);
 				} else if (slot.equalsIgnoreCase("next")) {
 					lore = Commands.getInstance().voteCommandNext(user);
 				} else if (slot.equalsIgnoreCase("last")) {
@@ -130,9 +136,7 @@ public class PlayerGUIs {
 				} else if (slot.equalsIgnoreCase("today")) {
 					lore = Commands.getInstance().voteToday();
 				} else if (slot.equalsIgnoreCase("help")) {
-					ArrayList<String> loreSt = new ArrayList<String>();
-					loreSt = ArrayUtils.getInstance().comptoString(Commands.getInstance().voteHelpText(player));
-					lore = ArrayUtils.getInstance().convert(loreSt);
+					lore = new String[] { "Click to view help" };
 				}
 			}
 
@@ -161,7 +165,9 @@ public class PlayerGUIs {
 						} else if (slot.equalsIgnoreCase("today")) {
 							openVoteToday(player);
 						} else if (slot.equalsIgnoreCase("help")) {
-							player.performCommand("v help");
+							player.performCommand("vote help");
+						} else if (slot.equalsIgnoreCase("shop")) {
+							VoteShop.getInstance().voteShop(player);
 						}
 					}
 
@@ -169,7 +175,7 @@ public class PlayerGUIs {
 			});
 		}
 
-		BInventory.openInventory(player, inv);
+		inv.openInventory(player);
 	}
 
 	public void openVoteLast(Player player, User user) {
@@ -178,16 +184,27 @@ public class PlayerGUIs {
 				.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())
+					new BInventoryButton(site.getItem().setName(site.getDisplayName())
 							.setLore(Commands.getInstance().voteCommandLastLine(user, site)).setAmountNone(1)) {
 
 						@Override
 						public void onClick(ClickEvent clickEvent) {
-							Player player = clickEvent.getPlayer();
-							openVoteLast(player, getSelectedPlayer(player));
+
 						}
 					});
 		}
+
+		if (Config.getInstance().getGUIVoteLastBackButton()) {
+			inv.addButton(new BInventoryButton(getBackButton()) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+
+			});
+		}
+
 		inv.openInventory(player);
 	}
 
@@ -197,16 +214,26 @@ public class PlayerGUIs {
 				.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())
+					new BInventoryButton(site.getItem().setName(site.getDisplayName())
 							.setLore(Commands.getInstance().voteCommandNextInfo(user, site)).setAmountNone(1)) {
 
 						@Override
 						public void onClick(ClickEvent clickEvent) {
-							Player player = clickEvent.getPlayer();
-							openVoteNext(player, getSelectedPlayer(player));
+
 						}
 					});
 		}
+
+		if (Config.getInstance().getGUIVoteNextBackButton()) {
+			inv.addButton(new BInventoryButton(getBackButton()) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+
+			});
+		}
 		inv.openInventory(player);
 	}
 
@@ -220,8 +247,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteBest(player, getSelectedPlayer(player));
+
 			}
 		});
 
@@ -230,8 +256,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteBest(player, getSelectedPlayer(player));
+
 			}
 		});
 
@@ -241,8 +266,7 @@ public class PlayerGUIs {
 
 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						Player player = clickEvent.getPlayer();
-						openVoteBest(player, getSelectedPlayer(player));
+
 					}
 				});
 
@@ -251,8 +275,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteBest(player, getSelectedPlayer(player));
+
 			}
 		});
 
@@ -261,8 +284,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteBest(player, getSelectedPlayer(player));
+
 			}
 		});
 
@@ -272,15 +294,25 @@ public class PlayerGUIs {
 
 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						Player player = clickEvent.getPlayer();
-						openVoteBest(player, getSelectedPlayer(player));
+
 					}
 				});
 
+		if (Config.getInstance().getGUIVoteStreakBackButton()) {
+			inv.addButton(new BInventoryButton(getBackButton()) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
+
 		inv.openInventory(player);
 	}
 
 	public void openVoteToday(Player player) {
+		setSelectedPlayer(player, null);
 		BInventory inv = new BInventory(Config.getInstance().getGUIVoteTodayName());
 		for (User user : plugin.voteToday.keySet()) {
 
@@ -301,6 +333,17 @@ public class PlayerGUIs {
 				});
 			}
 		}
+
+		if (Config.getInstance().getGUIVoteTodayBackButton()) {
+			inv.addButton(new BInventoryButton(getBackButton()) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+
+			});
+		}
 		inv.openInventory(player);
 	}
 
@@ -334,12 +377,20 @@ public class PlayerGUIs {
 							.addLoreLine(Config.getInstance().getGUIVoteTopItemLore())
 							.addPlaceholder("position", "" + pos)
 							.addPlaceholder("player", entry.getKey().getPlayerName())
-							.addPlaceholder("votes", "" + entry.getValue())) {
+							.addPlaceholder("votes", "" + entry.getValue())
+							.addLoreLine("&3Name: " + entry.getKey().getPlayerName())) {
 
 				@Override
 				public void onClick(ClickEvent clickEvent) {
-					User user = UserManager.getInstance()
-							.getVotingPluginUser(clickEvent.getClickedItem().getItemMeta().getDisplayName());
+					String name = "";
+					ItemBuilder item = new ItemBuilder(clickEvent.getClickedItem());
+					for (String lore : item.getLore()) {
+						if (lore.contains("Name:")) {
+							name = ChatColor.stripColor(item.getName()).split(":")[1].trim();
+							plugin.debug(name);
+						}
+					}
+					User user = UserManager.getInstance().getVotingPluginUser(name);
 					openVoteGUI(player, user);
 				}
 			});
@@ -351,12 +402,27 @@ public class PlayerGUIs {
 
 			@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.getPageButtons().add(new BInventoryButton(getBackButton().setSlot(1)) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
 		inv.setPages(true);
 		inv.setMaxInvSize(Config.getInstance().getGUIVoteTopSize());
 		inv.openInventory(player);
+
 	}
 
 	public void openVoteTotal(Player player, User user) {
@@ -368,8 +434,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteTotal(player, getSelectedPlayer(player));
+
 			}
 		});
 		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteTotalWeekTotalItem())
@@ -377,8 +442,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteTotal(player, getSelectedPlayer(player));
+
 			}
 		});
 		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteTotalMonthTotalItem())
@@ -386,8 +450,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteTotal(player, getSelectedPlayer(player));
+
 			}
 		});
 		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteTotalAllTimeTotalItem())
@@ -395,10 +458,18 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteTotal(player, getSelectedPlayer(player));
 			}
 		});
+
+		if (Config.getInstance().getGUIVoteTotalBackButton()) {
+			inv.addButton(new BInventoryButton(getBackButton()) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
 		inv.openInventory(player);
 	}
 
@@ -409,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);
@@ -421,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) {
 
@@ -431,7 +507,7 @@ public class PlayerGUIs {
 					User user = UserManager.getInstance().getVotingPluginUser(event.getPlayer());
 					Player player = event.getWhoClicked();
 					player.closeInventory();
-					user.sendMessage(Commands.getInstance().voteURLs());
+					user.sendMessage(Commands.getInstance().voteURLs(user));
 
 				}
 			});
@@ -468,7 +544,18 @@ public class PlayerGUIs {
 			count++;
 		}
 
-		BInventory.openInventory(player, inv);
+		if (Config.getInstance().getGUIVoteURLBackButton()) {
+			inv.addButton(new BInventoryButton(getBackButton()) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
+
+		inv.openInventory(player);
+
 	}
 
 	public void openVoteURL(Player player, String voteSite) {
@@ -506,6 +593,15 @@ public class PlayerGUIs {
 			}
 		});
 
+		if (Config.getInstance().getGUIVoteURLBackButton()) {
+			inv.addButton(new BInventoryButton(getBackButton()) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
 		inv.openInventory(player);
 	}
 
@@ -528,7 +624,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) {
@@ -568,6 +664,14 @@ public class PlayerGUIs {
 			}
 		}
 
-		BInventory.openInventory(player, inv);
+		inv.openInventory(player);
+	}
+
+	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");
 	}
 }

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

@@ -47,6 +47,10 @@ public class Config extends YMLFile {
 		return getData().getBoolean("AllowUnjoined");
 	}
 
+	public boolean getGUIVoteLastBackButton() {
+		return getData().getBoolean("GUI.VoteLast.BackButton");
+	}
+
 	/**
 	 * Gets the all sites reward.
 	 *
@@ -366,7 +370,6 @@ public class Config extends YMLFile {
 	 */
 	public String getFormatCommandsVoteNextInfoError() {
 		return getData().getString("Format.Commands.Vote.Next.Info.Error", "");
-
 	}
 
 	/**
@@ -377,7 +380,15 @@ public class Config extends YMLFile {
 	public String getFormatCommandsVoteNextInfoTime() {
 		return getData().getString("Format.Commands.Vote.Next.Info.TimeUntilVote",
 				"&cCould not caculate time until next vote!");
+	}
 
+	public String getFormatCommandsVoteNextInfoVoteDelayDaily() {
+		return getData().getString("Format.Commands.Vote.Next.Info.VoteDelayDaily",
+				"%hours% Hours and %minutes% Minutes");
+	}
+
+	public boolean getVoteShopBackButton() {
+		return getData().getBoolean("VoteShopBackButton", true);
 	}
 
 	/**
@@ -804,10 +815,6 @@ public class Config extends YMLFile {
 		return getData().getBoolean("LogVotesToFile");
 	}
 
-	public boolean getMilestoneResetMonthly(int milestones) {
-		return getData().getBoolean("MileStones." + milestones + ".ResetMonthly");
-	}
-
 	/**
 	 * Gets the milestone reward enabled.
 	 *
@@ -858,6 +865,26 @@ public class Config extends YMLFile {
 		return "MonthlyAwards." + pos + ".Rewards";
 	}
 
+	public boolean getAlternateUUIDLookup() {
+		return getData().getBoolean("AlternateUUIDLookup");
+	}
+
+	public int getMysqlMaxSize() {
+		return getData().getInt("MySQL.MaxSize", -1);
+	}
+
+	public ConfigurationSection getBackButton() {
+		return getData().getConfigurationSection("BackButton");
+	}
+
+	public boolean getAutoKillInvs() {
+		return getData().getBoolean("AutoKillInvs", true);
+	}
+
+	public boolean getVotePartyCountFakeVotes() {
+		return getData().getBoolean("VoteParty.CountFakeVotes", true);
+	}
+
 	/**
 	 * Gets the monthly awards enabled.
 	 *
@@ -867,6 +894,10 @@ public class Config extends YMLFile {
 		return getData().getBoolean("EnableMonthlyAwards");
 	}
 
+	public boolean getClearCacheOnUpdate() {
+		return getData().getBoolean("ClearCacheOnUpdate");
+	}
+
 	/**
 	 * Gets the monthly possible reward places.
 	 *
@@ -908,6 +939,10 @@ public class Config extends YMLFile {
 		return getData().getString("MySQL.Username", "");
 	}
 
+	public int getPointsOnVote() {
+		return getData().getInt("PointsOnVote", 1);
+	}
+
 	/**
 	 * Gets the request API default method.
 	 *
@@ -927,6 +962,10 @@ public class Config extends YMLFile {
 		return (ArrayList<String>) getData().getList("RequestAPI.DisabledMethods", new ArrayList<String>());
 	}
 
+	public boolean getResetMilestonesMonthly() {
+		return getData().getBoolean("ResetMilestonesMonthly");
+	}
+
 	/**
 	 * Gets the send scoreboards.
 	 *
@@ -1023,6 +1062,10 @@ public class Config extends YMLFile {
 		return getData().getInt("GUI.VoteGUI." + slot + ".Slot");
 	}
 
+	public String getVotePartyBroadcast() {
+		return getData().getString("VoteParty.Broadcast", "");
+	}
+
 	/**
 	 * Gets the vote party enabled.
 	 *
@@ -1370,4 +1413,28 @@ 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");
+	}
+
 }

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

@@ -55,7 +55,7 @@ public class ConfigVoteSites extends YMLFile {
 			String org = siteName;
 			siteName = siteName.replace(".", "_");
 			plugin.getLogger().warning("VoteSite " + siteName
-					+ " doe not exist, creating one, set AutoCreateVoteSites to false to prevent this");
+					+ " does not exist, creating one, set AutoCreateVoteSites to false to prevent this");
 			setEnabled(siteName, true);
 			setServiceSite(siteName, org);
 			setVoteURL(siteName, "VoteURL");
@@ -66,31 +66,6 @@ public class ConfigVoteSites extends YMLFile {
 		}
 	}
 
-	/**
-	 * Gets the cumulative rewards.
-	 *
-	 * @param siteName
-	 *            the site name
-	 * @return the cumulative rewards
-	 */
-	@SuppressWarnings("unchecked")
-	public ArrayList<String> getCumulativeRewards(String siteName) {
-
-		return (ArrayList<String>) getData(siteName).getList("Cumulative.Rewards", new ArrayList<String>());
-
-	}
-
-	/**
-	 * Gets the cumulative reward votes amount.
-	 *
-	 * @param siteName
-	 *            the site name
-	 * @return the cumulative reward votes amount
-	 */
-	public int getCumulativeRewardVotesAmount(String siteName) {
-		return getData(siteName).getInt("Cumulative.Votes");
-	}
-
 	/**
 	 * Gets the data.
 	 *
@@ -99,14 +74,17 @@ public class ConfigVoteSites extends YMLFile {
 	 * @return the data
 	 */
 	public ConfigurationSection getData(String siteName) {
-		ConfigurationSection data = getData().getConfigurationSection("VoteSites." + siteName);
-		return data;
+		return getData().getConfigurationSection("VoteSites." + siteName);
 	}
 
 	public String getDisplayName(String site) {
 		return getData(site).getString("Name");
 	}
 
+	public String getEverySiteRewardPath() {
+		return "EverySiteReward";
+	}
+
 	public ConfigurationSection getItem(String site) {
 		return getData(site).getConfigurationSection("Item");
 	}
@@ -188,6 +166,14 @@ public class ConfigVoteSites extends YMLFile {
 
 	}
 
+	public boolean getVoteSiteGiveOffline(String site) {
+		return getData(site).getBoolean("GiveOffline");
+	}
+
+	public boolean getVoteSiteResetVoteDelayDaily(String siteName) {
+		return getData(siteName).getBoolean("VoteDelayDaily");
+	}
+
 	/**
 	 * Gets the vote sites load.
 	 *
@@ -272,9 +258,7 @@ public class ConfigVoteSites extends YMLFile {
 	 * @return true, if is service site good
 	 */
 	public boolean isServiceSiteGood(String siteName) {
-		if (getServiceSite(siteName) == null) {
-			return false;
-		} else if (getServiceSite(siteName).equalsIgnoreCase("")) {
+		if (getServiceSite(siteName) == null || getServiceSite(siteName).equals("")) {
 			return false;
 		}
 		return true;
@@ -288,9 +272,7 @@ public class ConfigVoteSites extends YMLFile {
 	 * @return true, if is vote URL good
 	 */
 	public boolean isVoteURLGood(String siteName) {
-		if (getVoteURL(siteName) == null) {
-			return false;
-		} else if (getVoteURL(siteName).equalsIgnoreCase("")) {
+		if (getVoteURL(siteName) == null || getVoteURL(siteName).equals("")) {
 			return false;
 		}
 		return true;

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Data/ServerData.java

@@ -1,5 +1,6 @@
 package com.Ben12345rocks.VotingPlugin.Data;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -224,4 +225,20 @@ public class ServerData {
 	public void updateValues() {
 		setVersion();
 	}
+
+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getServiceSites() {
+		return (ArrayList<String>) getData().getList("ServiceSites", new ArrayList<String>());
+	}
+
+	public void addServiceSite(String site) {
+		ArrayList<String> l = getServiceSites();
+		l.add(site);
+		setServiceSites(l);
+	}
+
+	public void setServiceSites(ArrayList<String> list) {
+		getData().set("ServiceSites", list);
+		saveData();
+	}
 }

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

@@ -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,39 +36,46 @@ 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
-	 */
 	public static void playerVote(final String playerName, final String voteSiteURL) {
+		playerVote(playerName, voteSiteURL, true);
+	}
+
+	public static void playerVote(final String playerName, final String voteSiteURL, final boolean realVote) {
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 			@Override
 			public void run() {
-				synchronized (plugin) {
-					User user = UserManager.getInstance().getVotingPluginUser(playerName);
-					if (!user.hasJoinedBefore() && !config.allowUnJoined()) {
+				synchronized (configVoteSites) {
+					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;
 					}
+					User user = UserManager.getInstance().getVotingPluginUser(playerName);
 
 					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");
+
+							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;
 					}
 
 					// vote party
 					if (Config.getInstance().getVotePartyEnabled()) {
-						VoteParty.getInstance().addTotal(user);
-						VoteParty.getInstance().addVotePlayer(user);
-						VoteParty.getInstance().check();
+						if (Config.getInstance().getVotePartyCountFakeVotes() || realVote) {
+							VoteParty.getInstance().addTotal(user);
+							VoteParty.getInstance().addVotePlayer(user);
+							VoteParty.getInstance().check();
+						}
 					}
 
 					// broadcast vote if enabled in config
@@ -94,11 +104,14 @@ public class VotiferEvent implements Listener {
 					OtherVoteReward.getInstance().checkCumualativeVotes(user);
 					OtherVoteReward.getInstance().checkMilestone(user);
 
-					if (user.isOnline()) {
+					if (user.isOnline() || voteSite.isGiveOffline()) {
 						user.playerVote(voteSite, true, false);
+						user.closeInv();
 					} else {
 						user.addOfflineVote(voteSite.getKey());
-						plugin.debug("Offline vote set for " + playerName + " on " + voteSite.getKey());
+						// plugin.debug(ArrayUtils.getInstance().makeStringList(user.getOfflineVotes()));
+						plugin.debug("Offline vote set for " + playerName + " (" + user.getUUID() + ") on "
+								+ voteSite.getKey());
 					}
 
 					plugin.setUpdate(true);
@@ -128,8 +141,9 @@ public class VotiferEvent implements Listener {
 	public void onVotiferEvent(VotifierEvent event) {
 
 		Vote vote = event.getVote();
-		String voteSite = vote.getServiceName();
-		String voteUsername = vote.getUsername();
+		final String voteSite = vote.getServiceName();
+		final String voteUsername = vote.getUsername().trim();
+		ServerData.getInstance().addServiceSite(voteSite);
 
 		if (voteUsername.length() == 0) {
 			plugin.getLogger().warning("No name from vote on " + voteSite);
@@ -141,12 +155,12 @@ public class VotiferEvent implements Listener {
 		plugin.debug("PlayerUsername: " + voteUsername);
 		plugin.debug("VoteSite: " + voteSite);
 
-		String voteSiteName = plugin.getVoteSiteName(voteSite);
-
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 			@Override
 			public void run() {
+				String voteSiteName = plugin.getVoteSiteName(voteSite);
+
 				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName),
 						UserManager.getInstance().getVotingPluginUser(voteUsername));
 				plugin.getServer().getPluginManager().callEvent(voteEvent);
@@ -161,15 +175,13 @@ public class VotiferEvent implements Listener {
 						plugin.getLogger()
 								.warning("VoteSite " + voteSiteName + " doe not exist, generaterating one...");
 						ConfigVoteSites.getInstance().generateVoteSite(voteSiteName);
-						ConfigVoteSites.getInstance().setServiceSite(voteSiteName, voteSite);
 					}
 				} else if (Config.getInstance().getAutoCreateVoteSites()) {
 					plugin.getLogger().warning("VoteSite " + voteSiteName + " doe not exist, generaterating one...");
 					ConfigVoteSites.getInstance().generateVoteSite(voteSiteName);
-					ConfigVoteSites.getInstance().setServiceSite(voteSiteName, voteSite);
 				}
 
-				playerVote(voteUsername, voteSite);
+				playerVote(voteUsername, voteSite, true);
 
 			}
 		});

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

@@ -8,19 +8,22 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
 import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
-import com.Ben12345rocks.AdvancedCore.Objects.Reward;
 import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Objects.UUID;
 import com.Ben12345rocks.AdvancedCore.Objects.UserStorage;
@@ -51,7 +54,6 @@ import com.Ben12345rocks.VotingPlugin.Events.VotingPluginUpdateEvent;
 import com.Ben12345rocks.VotingPlugin.Objects.SignHandler;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
-import com.Ben12345rocks.VotingPlugin.OtherRewards.OtherVoteReward;
 import com.Ben12345rocks.VotingPlugin.Signs.Signs;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
@@ -74,16 +76,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 +100,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 +110,8 @@ public class Main extends JavaPlugin {
 
 	private boolean update = true;
 
+	private boolean updateStarted = false;
+
 	/**
 	 * Check votifier.
 	 */
@@ -125,69 +129,39 @@ public class Main extends JavaPlugin {
 			throw new RuntimeException("Invalid Storage Method");
 		}
 		UserStorage cur = AdvancedCoreHook.getInstance().getStorageType();
+		AdvancedCoreHook.getInstance().setStorageType(from);
+		loadMySQL();
+		HashMap<User, HashMap<String, String>> data = new HashMap<User, HashMap<String, String>>();
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			try {
 				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
 
-				AdvancedCoreHook.getInstance().setStorageType(from);
-
-				ArrayList<String> choiceRewards = user.getChoiceRewards();
-				String inputMethod = user.getInputMethod();
-				ArrayList<String> offlineRewards = user.getOfflineRewards();
-				HashMap<Reward, ArrayList<Long>> timed = user.getTimedRewards();
-				int allTime = user.getAllTimeTotal();
-				int dailyTotal = user.getDailyTotal();
-				HashMap<String, Boolean> mileStone = user.getHasGottenMilestone();
-				HashMap<VoteSite, Long> lastVotes = user.getLastVotes();
-				int monthTotals = user.getMonthTotal();
-				ArrayList<String> otherRewards = user.getOfflineOtherRewards();
-				ArrayList<String> offlineVotes = user.getOfflineVotes();
-				int points = user.getPoints();
-				int votePartyVotes = user.getVotePartyVotes();
-				int weeklyTotal = user.getWeeklyTotal();
-
-				int highestDailyTotal = user.getHighestDailyTotal();
-				int highestWeeklyTotal = user.getHighestWeeklyTotal();
-				int highestMonthlyTotal = user.getHighestMonthlyTotal();
-				int voteStreakDay = user.getDayVoteStreak();
-				int voteStreakWeek = user.getWeekVoteStreak();
-				int voteStreakMonth = user.getMonthVoteStreak();
-				int bestVoteStreakDay = user.getBestDayVoteStreak();
-				int bestVoteStreakWeek = user.getBestWeekVoteStreak();
-				int bestVoteStreakMonth = user.getBestMonthVoteStreak();
-
-				AdvancedCoreHook.getInstance().setStorageType(to);
-
-				user.setChoiceRewards(choiceRewards);
-				user.setInputMethod(inputMethod);
-				user.setOfflineRewards(offlineRewards);
-				user.setTimedRewards(timed);
-				user.setAllTimeTotal(allTime);
-				user.setDailyTotal(dailyTotal);
-				user.setHasGottenMilestone(mileStone);
-				user.setLastVotes(lastVotes);
-				user.setMonthTotal(monthTotals);
-				user.setOfflineOtherRewards(otherRewards);
-				user.setOfflineVotes(offlineVotes);
-				user.setPoints(points);
-				user.setVotePartyVotes(votePartyVotes);
-				user.setWeeklyTotal(weeklyTotal);
-
-				user.setHighestDailyTotal(highestDailyTotal);
-				user.setHighestWeeklyTotal(highestWeeklyTotal);
-				user.setHighestMonthlyTotal(highestMonthlyTotal);
-				user.setDayVoteStreak(voteStreakDay);
-				user.setWeekVoteStreak(voteStreakWeek);
-				user.setMonthVoteStreak(voteStreakMonth);
-				user.setBestDayVoteStreak(bestVoteStreakDay);
-				user.setBestWeekVoteStreak(bestVoteStreakWeek);
-				user.setBestMonthVoteStreak(bestVoteStreakMonth);
+				HashMap<String, String> values = new HashMap<String, String>();
+				for (String key : user.getData().getKeys()) {
+					values.put(key, user.getData().getString(key));
+				}
+				data.put(user, values);
 			} catch (Exception e) {
 				AdvancedCoreHook.getInstance().debug(e);
 				plugin.getLogger().warning("Exception occoured for '" + uuid + "': " + e.getMessage()
 						+ ", turn debug on to see full stack traces");
 			}
 		}
+
+		AdvancedCoreHook.getInstance().setStorageType(to);
+		loadMySQL();
+
+		for (Entry<User, HashMap<String, String>> entry : data.entrySet()) {
+			try {
+				for (Entry<String, String> values : entry.getValue().entrySet()) {
+					entry.getKey().getData().setString(values.getKey(), values.getValue());
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+				plugin.getLogger().warning("Exception occoured for '" + entry.getKey().getUUID() + "': "
+						+ e.getMessage() + ", turn debug on to see full stack traces");
+			}
+		}
 		AdvancedCoreHook.getInstance().setStorageType(cur);
 	}
 
@@ -234,7 +208,7 @@ public class Main extends JavaPlugin {
 				return voteSite;
 			}
 		}
-		if (config.getAutoCreateVoteSites() && !configVoteSites.getVoteSitesNames().contains(siteName)) {
+		if (Config.getInstance().getAutoCreateVoteSites() && !configVoteSites.getVoteSitesNames().contains(siteName)) {
 			configVoteSites.generateVoteSite(siteName);
 			return new VoteSite(siteName.replace(".", "_"));
 		}
@@ -258,11 +232,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;
 
@@ -282,6 +261,23 @@ public class Main extends JavaPlugin {
 		return false;
 	}
 
+	private void loadMySQL() {
+		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
+			Thread.getInstance().run(new Runnable() {
+
+				@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()));
+				}
+			});
+
+		}
+	}
+
 	private void loadTimer() {
 		AdvancedCoreHook.getInstance().getTimer().schedule(new TimerTask() {
 
@@ -338,13 +334,7 @@ public class Main extends JavaPlugin {
 		}
 
 		BStatsMetrics metrics = new BStatsMetrics(this);
-		metrics.addCustomChart(new BStatsMetrics.SimplePie("requestapi_defaultmethod") {
 
-			@Override
-			public String getValue() {
-				return Config.getInstance().getRequestAPIDefaultMethod();
-			}
-		});
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_firstvote") {
 
 			@Override
@@ -357,6 +347,18 @@ public class Main extends JavaPlugin {
 				}
 			}
 		});
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_everysite") {
+
+			@Override
+			public String getValue() {
+				if (RewardHandler.getInstance().hasRewards(ConfigVoteSites.getInstance().getData(),
+						ConfigVoteSites.getInstance().getEverySiteRewardPath())) {
+					return "True";
+				} else {
+					return "False";
+				}
+			}
+		});
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_allsites") {
 
 			@Override
@@ -631,6 +633,7 @@ public class Main extends JavaPlugin {
 				Signs.getInstance().storeSigns();
 			}
 		}, 0);
+		HandlerList.unregisterAll(plugin);
 		plugin = null;
 	}
 
@@ -647,6 +650,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();
@@ -665,11 +671,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"));
 
@@ -687,7 +693,7 @@ public class Main extends JavaPlugin {
 		AdvancedCoreHook.getInstance().getJavascriptEngineRequests().add(new JavascriptPlaceholderRequest("User") {
 
 			@Override
-			public Object getObject(Player player) {
+			public Object getObject(OfflinePlayer player) {
 				return getUserManager().getVotingPluginUser(player);
 			}
 		});
@@ -708,8 +714,8 @@ public class Main extends JavaPlugin {
 		// /vote, /v
 		getCommand("vote").setExecutor(new CommandVote(this));
 		getCommand("vote").setTabCompleter(new VoteTabCompleter());
-		getCommand("v").setExecutor(new CommandVote(this));
-		getCommand("v").setTabCompleter(new VoteTabCompleter());
+		// getCommand("v").setExecutor(new CommandVote(this));
+		// getCommand("v").setTabCompleter(new VoteTabCompleter());
 
 		// /adminvote, /av
 		getCommand("adminvote").setExecutor(new CommandAdminVote(this));
@@ -737,7 +743,6 @@ public class Main extends JavaPlugin {
 		pm.registerEvents(new PlayerInteract(this), this);
 
 		pm.registerEvents(new VotingPluginUpdateEvent(this), this);
-		pm.registerEvents(OtherVoteReward.getInstance(), this);
 
 		plugin.debug("Loaded Events");
 
@@ -767,6 +772,7 @@ public class Main extends JavaPlugin {
 			}
 		});
 		loadTimer();
+
 	}
 
 	public void setUpdate(boolean update) {
@@ -777,10 +783,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");
 
 	}
@@ -788,58 +819,73 @@ public class Main extends JavaPlugin {
 	/**
 	 * Update.
 	 */
-	public synchronized void update() {
-		if (update && plugin != null) {
+	public void update() {
+		if (update && plugin != null && !updateStarted) {
+			updateStarted = true;
+			update = false;
 			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 				@Override
 				public void run() {
-					if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
-						if (AdvancedCoreHook.getInstance().getMysql() == null) {
-							plugin.debug("MySQL not loaded yet");
-							return;
-						} else {
-							AdvancedCoreHook.getInstance().getMysql().clearCache();
+					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.");
 						}
-					}
-					update = false;
-					plugin.debug("Starting background task");
-					try {
-						TopVoterHandler.getInstance().updateTopVoters();
-						Commands.getInstance().updateVoteToday();
-						ServerData.getInstance().updateValues();
-						Signs.getInstance().updateSigns();
-						plugin.debug("Background task ran");
-					} catch (Exception ex) {
-						ex.printStackTrace();
-						plugin.getLogger().info("Looks like something went wrong.");
 					}
 				}
 
 			});
+			updateStarted = false;
 		}
 	}
 
+	public VoteParty getVoteParty() {
+		return VoteParty.getInstance();
+	}
+
 	public void updateAdvancedCoreHook() {
+		AdvancedCoreHook.getInstance().setMaxMysqlSize(Config.getInstance().getMysqlMaxSize());
 		AdvancedCoreHook.getInstance().setAutoDownload(Config.getInstance().getAutoDownload());
 		AdvancedCoreHook.getInstance().getJavascriptEngine().put("VotingPlugin", this);
 		AdvancedCoreHook.getInstance().allowDownloadingFromSpigot(15358);
 		AdvancedCoreHook.getInstance().setExtraDebug(Config.getInstance().getExtraDebug());
 		AdvancedCoreHook.getInstance().setStorageType(UserStorage.valueOf(Config.getInstance().getDataStorage()));
-		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
-			Thread.getInstance().run(new Runnable() {
-
-				@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()));
-				}
-			});
-
-		}
+		loadMySQL();
 
 		AdvancedCoreHook.getInstance().setCheckOnWorldChange(Config.getInstance().getCheckOnWorldChange());
 		AdvancedCoreHook.getInstance().setDebug(Config.getInstance().getDebugEnabled());
@@ -851,6 +897,8 @@ 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());
 	}
 
 }

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

@@ -5,10 +5,7 @@ import java.util.ArrayList;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 
 public enum TopVoter {
-	AllTime,
-	Monthly,
-	Weekly,
-	Daily;
+	AllTime, Monthly, Weekly, Daily;
 
 	public static TopVoter getDefault() {
 		TopVoter top = getTopVoter(Config.getInstance().getVoteTopDefault());
@@ -24,7 +21,7 @@ public enum TopVoter {
 				return value;
 			}
 		}
-		return null;
+		return AllTime;
 	}
 
 	public TopVoter next() {
@@ -52,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;
+
+		}
+
+	}
 }

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

@@ -11,13 +11,12 @@ 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.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 +112,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 * Adds the points.
 	 */
 	public void addPoints() {
-		setPoints(getPoints() + 1);
+		int points = Config.getInstance().getPointsOnVote();
+		if (points != 0) {
+			addPoints(points);
+		}
 	}
 
 	/**
@@ -131,6 +133,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 *
 	 */
 	public void addTotal() {
+		setMilestoneCount(getMilestoneCount() + 1);
 		addMonthTotal();
 		addAllTimeTotal();
 	}
@@ -180,6 +183,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 * @return true, if successful
 	 */
 	public boolean canVoteSite(VoteSite voteSite) {
+
 		String siteName = voteSite.getKey();
 		long time = getTime(voteSite);
 		if (time == 0) {
@@ -188,15 +192,23 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		LocalDateTime now = LocalDateTime.now();
 		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault());
 
-		int votedelay = ConfigVoteSites.getInstance().getVoteDelay(siteName);
+		if (!voteSite.isVoteDelayDaily()) {
+			int votedelay = ConfigVoteSites.getInstance().getVoteDelay(siteName);
 
-		if (votedelay == 0) {
+			if (votedelay == 0) {
+				return false;
+			}
+
+			LocalDateTime nextvote = lastVote.plusHours(votedelay);
+
+			return now.isAfter(nextvote);
+		} else {
+			if (now.getDayOfYear() != lastVote.getDayOfYear() && now.getYear() != lastVote.getYear()) {
+				return true;
+			}
 			return false;
 		}
 
-		LocalDateTime nextvote = lastVote.plusHours(votedelay);
-
-		return now.isAfter(nextvote);
 	}
 
 	/**
@@ -244,21 +256,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");
 	}
@@ -347,6 +344,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return sorted;
 	}
 
+	public int getMilestoneCount() {
+		return getData().getInt("MilestoneCount", getAllTimeTotal());
+	}
+
 	public int getMonthTotal() {
 		return getData().getInt("MonthTotal");
 	}
@@ -406,13 +407,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);
 	}
 
 	/**
@@ -422,13 +418,8 @@ 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() {
@@ -518,13 +509,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);
 	}
 
 	/**
@@ -568,21 +554,6 @@ 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.
 	 */
@@ -591,16 +562,22 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		if (player != null) {
 			setTopVoterIgnore(player.hasPermission("VotingPlugin.TopVoter.Ignore"));
 			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>());
+			if (!offlineVotes.isEmpty()) {
+				setOfflineVotes(new ArrayList<String>());
+			}
 
 			giveOfflineOtherRewards();
 		}
@@ -725,6 +702,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		getUserData().setStringList("LastVotes", data);
 	}
 
+	public void setMilestoneCount(int value) {
+		getData().setInt("MilestoneCount", value);
+	}
+
 	public void setMonthTotal(int total) {
 		getData().setInt("MonthTotal", total);
 	}
@@ -787,19 +768,4 @@ 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);
-		}
-	}
-
 }

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

@@ -1,8 +1,10 @@
 package com.Ben12345rocks.VotingPlugin.Objects;
 
+import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 
 import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
+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;
@@ -41,11 +43,15 @@ public class VoteSite {
 	/** The enabled. */
 	private boolean enabled;
 
+	private boolean voteDelayDaily;
+
 	/** The priority. */
 	private int priority;
 
 	private ConfigurationSection item;
 
+	private boolean giveOffline;
+
 	/**
 	 * Instantiates a new vote site.
 	 *
@@ -74,10 +80,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);
+		}
 	}
 
 	/**
@@ -90,8 +98,13 @@ 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);
+		} else {
+			return new ItemBuilder(item);
+		}
 	}
 
 	/**
@@ -149,6 +162,10 @@ public class VoteSite {
 		new RewardBuilder(configVoteSites.getData(), configVoteSites.getRewardsPath(key)).setOnline(online)
 				.withPlaceHolder("ServiceSite", getServiceSite()).withPlaceHolder("SiteName", getDisplayName())
 				.withPlaceHolder("VoteDelay", "" + getVoteDelay()).withPlaceHolder("VoteURL", getVoteURL()).send(user);
+
+		new RewardBuilder(configVoteSites.getData(), configVoteSites.getEverySiteRewardPath()).setOnline(online)
+				.withPlaceHolder("ServiceSite", getServiceSite()).withPlaceHolder("SiteName", getDisplayName())
+				.withPlaceHolder("VoteDelay", "" + getVoteDelay()).withPlaceHolder("VoteURL", getVoteURL()).send(user);
 	}
 
 	/**
@@ -177,6 +194,8 @@ public class VoteSite {
 			displayName = key;
 		}
 		item = configVoteSites.getItem(key);
+		voteDelayDaily = configVoteSites.getVoteSiteResetVoteDelayDaily(key);
+		giveOffline = configVoteSites.getVoteSiteGiveOffline(key);
 	}
 
 	/**
@@ -188,6 +207,20 @@ public class VoteSite {
 		return enabled;
 	}
 
+	/**
+	 * @return the giveOffline
+	 */
+	public boolean isGiveOffline() {
+		return giveOffline;
+	}
+
+	/**
+	 * @return the voteDelayDaily
+	 */
+	public boolean isVoteDelayDaily() {
+		return voteDelayDaily;
+	}
+
 	/**
 	 * @param displayName
 	 *            the displayName to set
@@ -206,6 +239,22 @@ public class VoteSite {
 		this.enabled = enabled;
 	}
 
+	/**
+	 * @param giveOffline
+	 *            the giveOffline to set
+	 */
+	public void setGiveOffline(boolean giveOffline) {
+		this.giveOffline = giveOffline;
+	}
+
+	/**
+	 * @param item
+	 *            the item to set
+	 */
+	public void setItem(ConfigurationSection item) {
+		this.item = item;
+	}
+
 	/**
 	 * @param key
 	 *            the key to set
@@ -244,6 +293,14 @@ public class VoteSite {
 		this.voteDelay = voteDelay;
 	}
 
+	/**
+	 * @param voteDelayDaily
+	 *            the voteDelayDaily to set
+	 */
+	public void setVoteDelayDaily(boolean voteDelayDaily) {
+		this.voteDelayDaily = voteDelayDaily;
+	}
+
 	/**
 	 * Sets the vote URL.
 	 *

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/OtherRewards/OtherVoteReward.java

@@ -2,25 +2,19 @@ package com.Ben12345rocks.VotingPlugin.OtherRewards;
 
 import java.util.Set;
 
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-import com.Ben12345rocks.AdvancedCore.Listeners.MonthChangeEvent;
 import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
 import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
 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.Objects.User;
-import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 
 // TODO: Auto-generated Javadoc
 /**
  * The Class OtherVoteReward.
  */
-public class OtherVoteReward implements Listener {
+public class OtherVoteReward {
 
 	/** The config. */
 	static Config config = Config.getInstance();
@@ -155,7 +149,7 @@ public class OtherVoteReward implements Listener {
 							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
 									Config.getInstance().getMilestoneRewardsPath(votesRequired))) {
 
-						int userVotesTotal = user.getAllTimeTotal();
+						int userVotesTotal = user.getMilestoneCount();
 						if (userVotesTotal >= votesRequired && !user.hasGottenMilestone(votesRequired)) {
 							giveMilestoneVoteReward(user, user.isOnline(), votesRequired);
 							user.setHasGotteMilestone(votesRequired, true);
@@ -267,28 +261,4 @@ public class OtherVoteReward implements Listener {
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getVoteStreakRewardsPath(type, streak))
 				.setOnline(online).withPlaceHolder("Type", type).withPlaceHolder("Streak", "" + streak).send(user);
 	}
-
-	@EventHandler
-	public void onMonthChange(MonthChangeEvent event) {
-		Set<String> votes = Config.getInstance().getMilestoneVotes();
-		for (String vote : votes) {
-			if (StringUtils.getInstance().isInt(vote)) {
-				int votesRequired = Integer.parseInt(vote);
-				plugin.debug("Is int: " + vote);
-				if (votesRequired != 0) {
-					plugin.debug("not 0");
-					if (Config.getInstance().getMilestoneRewardEnabled(votesRequired)
-							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-									Config.getInstance().getMilestoneRewardsPath(votesRequired))) {
-						if (Config.getInstance().getMilestoneResetMonthly(votesRequired)) {
-							for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-								User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-								user.setHasGotteMilestone(votesRequired, false);
-							}
-						}
-					}
-				}
-			}
-		}
-	}
 }

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

@@ -13,6 +13,7 @@ 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;
@@ -75,12 +76,18 @@ public class TopVoterHandler implements Listener {
 		return ArrayUtils.getInstance().convert(msg);
 	}
 
-	@EventHandler
+	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
 	public void onDateChanged(DateChangedEvent event) {
-		updateTopVoters();
+		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);
 	}
 
-	@EventHandler
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onDayChange(DayChangeEvent event) {
 
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
@@ -109,7 +116,7 @@ public class TopVoterHandler implements Listener {
 				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
 					i++;
 					if (places.contains(Integer.toString(i))) {
-						user.dailyTopVoterAward(i);
+						user.giveDailyTopVoterAward(i);
 					}
 				}
 			}
@@ -118,7 +125,7 @@ public class TopVoterHandler implements Listener {
 
 	}
 
-	@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));
@@ -146,16 +153,25 @@ public class TopVoterHandler implements Listener {
 				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
 					i++;
 					if (places.contains(Integer.toString(i))) {
-						user.monthlyTopVoterAward(i);
+						user.giveMonthlyTopVoterAward(i);
 					}
 				}
 			}
 		}
 		resetMonthlyTotals();
 
+		if (Config.getInstance().getResetMilestonesMonthly()) {
+			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				user.setMilestoneCount(0);
+				user.setHasGottenMilestone(new HashMap<String, Boolean>());
+			}
+
+		}
+
 	}
 
-	@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));
@@ -183,7 +199,7 @@ public class TopVoterHandler implements Listener {
 				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
 					i++;
 					if (places.contains(Integer.toString(i))) {
-						user.weeklyTopVoterAward(i);
+						user.giveWeeklyTopVoterAward(i);
 					}
 				}
 			}
@@ -232,9 +248,9 @@ public class TopVoterHandler implements Listener {
 	 *            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>>() {
@@ -250,11 +266,11 @@ 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());
 		}
-
+		
 		return sortedMap;
 	}
 
@@ -547,14 +563,13 @@ public class TopVoterHandler implements Listener {
 		return ArrayUtils.getInstance().convert(msg);
 	}
 
-	public synchronized void updateTopVoters() {
-		ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
+	public synchronized void updateTopVoters(ArrayList<User> users1) {
 		ArrayList<User> users = new ArrayList<User>();
 		ArrayList<String> blackList = getTopVoterBlackList();
-		for (String uuid : uuids) {
-			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+		for (User user : users1) {
 			if (!blackList.contains(user.getPlayerName())) {
-				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
+				if ((!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore())
+						&& !user.isBanned()) {
 					users.add(user);
 				}
 			}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/UserManager/UserManager.java

@@ -42,7 +42,7 @@ 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")

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Util/Updater/CheckUpdate.java

@@ -1,5 +1,8 @@
 package com.Ben12345rocks.VotingPlugin.Util.Updater;
 
+import java.util.Timer;
+import java.util.TimerTask;
+
 import org.bukkit.Bukkit;
 
 import com.Ben12345rocks.AdvancedCore.Util.Updater.Updater;
@@ -58,8 +61,27 @@ public class CheckUpdate {
 			break;
 		}
 		case UPDATE_AVAILABLE: {
-			plugin.getLogger().info(plugin.getName() + " has an update available! Your Version: "
-					+ plugin.getDescription().getVersion() + " New Version: " + plugin.updater.getVersion());
+			plugin.getLogger()
+					.info(plugin.getName() + " has an update available! Your Version: "
+							+ plugin.getDescription().getVersion() + " New Version: " + plugin.updater.getVersion()
+							+ " Use /av download to get the latest update!");
+			break;
+		}
+		default: {
+			break;
+		}
+		}
+	}
+
+	public void checkUpdateBasic() {
+		plugin.updater = new Updater(plugin, 15358, false);
+		final Updater.UpdateResult result = plugin.updater.getResult();
+		switch (result) {
+		case UPDATE_AVAILABLE: {
+			plugin.getLogger()
+					.info(plugin.getName() + " has an update available! Your Version: "
+							+ plugin.getDescription().getVersion() + " New Version: " + plugin.updater.getVersion()
+							+ " Use /av download to get the latest update!");
 			break;
 		}
 		default: {
@@ -77,6 +99,14 @@ public class CheckUpdate {
 			@Override
 			public void run() {
 				checkUpdate();
+				new Timer().schedule(new TimerTask() {
+
+					@Override
+					public void run() {
+						checkUpdateBasic();
+					}
+				}, 1000 * 60 * 1200, 1000 * 60 * 1200);
+
 			}
 		}, 10l);
 	}

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

@@ -11,6 +11,7 @@ import com.Ben12345rocks.AdvancedCore.Listeners.DayChangeEvent;
 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.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
@@ -84,6 +85,7 @@ public class VoteParty implements Listener {
 		if (getTotalVotes() >= Config.getInstance().getVotePartyVotesRequired()) {
 			setTotalVotes(getTotalVotes() - Config.getInstance().getVotePartyVotesRequired());
 			giveRewards();
+			MiscUtils.getInstance().broadcast(Config.getInstance().getVotePartyBroadcast());
 		}
 
 	}
@@ -150,11 +152,9 @@ public class VoteParty implements Listener {
 	 */
 	public void giveReward(User user) {
 		/*
-		 * if (PlayerUtils.getInstance().isPlayerOnline(user.getPlayerName())) {
-		 * if (user.getVotePartyVotes() >=
-		 * Config.getInstance().getUserVotesRequired()) {
-		 * RewardHandler.getInstance().giveReward(user,
-		 * Config.getInstance().getData(),
+		 * if (PlayerUtils.getInstance().isPlayerOnline(user.getPlayerName())) { if
+		 * (user.getVotePartyVotes() >= Config.getInstance().getUserVotesRequired()) {
+		 * RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
 		 * Config.getInstance().getVotePartyRewardsPath()); } } else {
 		 * user.addOfflineOtherReward("VoteParty"); }
 		 */

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/VoteReminding/VoteReminding.java

@@ -116,6 +116,7 @@ public class VoteReminding {
 		if (Config.getInstance().getVoteRemindingEnabled()
 				&& (!UserManager.getInstance().getAllUUIDs().contains(user.getUUID()) || user.canVoteAll())) {
 			giveReward(user);
+			user.setReminded(true);
 			plugin.debug(user.getPlayerName() + " was reminded!");
 
 		}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/VoteShop/VoteShop.java

@@ -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;
@@ -35,32 +36,43 @@ public class VoteShop {
 
 			ItemBuilder builder = new ItemBuilder(Config.getInstance().getIdentifierSection(identifier));
 
-			inv.addButton(Config.getInstance().getIdentifierSlot(identifier),
-					new BInventoryButton(builder.toItemStack()) {
+			inv.addButton(Config.getInstance().getIdentifierSlot(identifier), new BInventoryButton(builder) {
 
-						@Override
-						public void onClick(ClickEvent event) {
-							Player player = event.getWhoClicked();
+				@Override
+				public void onClick(ClickEvent event) {
+					Player player = event.getWhoClicked();
 
-							User user = UserManager.getInstance().getVotingPluginUser(player);
-							int points = Config.getInstance().getIdentifierCost(identifier);
-							String identifier = Config.getInstance().getIdentifierFromSlot(event.getSlot());
-							if (identifier != null) {
-								if (user.removePoints(points)) {
-									RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-											Config.getInstance().getIdentifierRewardsPath(identifier));
-									user.sendMessage(Config.getInstance().getFormatShopPurchaseMsg()
-											.replace("%Identifier%", identifier).replace("%Points%", "" + points));
-								} else {
-									user.sendMessage(Config.getInstance().getFormatShopFailedMsg()
-											.replace("%Identifier%", identifier).replace("%Points%", "" + points));
-								}
-							}
+					User user = UserManager.getInstance().getVotingPluginUser(player);
+					int points = Config.getInstance().getIdentifierCost(identifier);
+					String identifier = Config.getInstance().getIdentifierFromSlot(event.getSlot());
+					if (identifier != null) {
+						if (user.removePoints(points)) {
+							RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
+									Config.getInstance().getIdentifierRewardsPath(identifier));
+							user.sendMessage(Config.getInstance().getFormatShopPurchaseMsg()
+									.replace("%Identifier%", identifier).replace("%Points%", "" + points));
+						} else {
+							user.sendMessage(Config.getInstance().getFormatShopFailedMsg()
+									.replace("%Identifier%", identifier).replace("%Points%", "" + points));
 						}
+					}
+				}
 
-					});
+			});
 		}
 
-		BInventory.openInventory(player, inv);
+		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);
 	}
 }