Merge pull request #231 from Ben12345rocks/5.9.4

5.9.4

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/Resources/Config.yml

@@ -70,7 +70,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!'
@@ -155,6 +155,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: 'Tomorrow'
           
        # Format for /vote last
       Last:
@@ -341,6 +343,7 @@ GUI:
   VoteURL:
     # GUI Name
     Name: '&cVoteURL'
+    BackButton: true
     SiteName: '&c%Name%'
     SeeURL: '&cClick to see URL'
     NextVote: '&cCan Vote In: %Info%'
@@ -390,12 +393,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%'
@@ -411,6 +418,7 @@ GUI:
     Size: 27
   VoteTotal:
     Name: 'VoteTotal: %player%'
+    BackButton: true
     DayTotal:
       Item:
         Material: 'WATCH'
@@ -457,6 +465,7 @@ GUI:
         Amount: 1
   VoteStreak:
     Name: 'VoteBest: %player%'
+    BackButton: false
     CurrentDayStreak:
       Item:
         Material: 'WATCH'
@@ -596,6 +605,7 @@ VoteStreak:
   # Valid options: Day, Week, Month
   Day:
     # Number of days in a row
+    # Each day requires one vote
     '2':
       # Enabled or not
       Enabled: false
@@ -604,7 +614,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
@@ -613,7 +624,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
@@ -706,6 +718,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

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'

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:

VotingPlugin/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.8.7</version>
+	<version>5.9.4</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -156,7 +156,6 @@
 			<artifactId>AdvancedCore</artifactId>
 			<version>master-SNAPSHOT</version>
 		</dependency>
-
 		<!-- <dependency> <groupId>com.Ben12345rocks</groupId> <artifactId>AdvancedCore</artifactId> 
 			<version>LATEST</version> <scope>compile</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;
 
@@ -35,11 +39,20 @@ import com.Ben12345rocks.VotingPlugin.Commands.TabCompleter.AliasesTabCompleter;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 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 +106,13 @@ public class CommandLoader {
 		CommandLoader.plugin = plugin;
 	}
 
+	/**
+	 * @return the adminPerm
+	 */
+	public String getAdminPerm() {
+		return adminPerm;
+	}
+
 	/**
 	 * Gets the commands.
 	 *
@@ -102,25 +122,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") {
@@ -279,8 +365,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 +435,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]);
+				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[2]),
+						UserManager.getInstance().getVotingPluginUser(args[1]));
+				plugin.getServer().getPluginManager().callEvent(voteEvent);
 			}
 		});
 
@@ -552,8 +642,7 @@ public class CommandLoader {
 
 													@Override
 													public void onInput(Player player, String value) {
-
-														CommandAdminVote.getInstance().Vote(player,
+														VotiferEvent.playerVote(
 																UserGUI.getInstance().getCurrentPlayer(player), value);
 
 														player.sendMessage("Forced vote for "
@@ -628,11 +717,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
@@ -1090,7 +1178,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>();
@@ -470,13 +470,10 @@ public class Commands {
 	/**
 	 * 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);
@@ -587,29 +584,38 @@ 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));
-				info = timeMsg;
+				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()) {
+				info = config.getFormatCommandsVoteNextInfoVoteDelayDaily();
+			} else {
+				info = config.getFormatCommandsVoteNextInfoCanVote();
+			}
+
 		}
 		return info;
 	}
@@ -694,9 +700,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 +747,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 +767,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/PlayerGUIs.java

@@ -62,8 +62,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteBest(player, getSelectedPlayer(player));
+
 			}
 		});
 
@@ -72,8 +71,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteBest(player, getSelectedPlayer(player));
+
 			}
 		});
 
@@ -82,8 +80,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteBest(player, getSelectedPlayer(player));
+
 			}
 		});
 
@@ -91,9 +88,15 @@ 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.hasPermission("VotingPlugin.Mod"))
+				|| (!player.hasPermission("VotingPlugin.Commands.Vote.GUI")
+						&& !player.hasPermission("VotingPlugin.Player"))) {
 			player.sendMessage(AdvancedCoreHook.getInstance().getFormatNoPerms());
 			return;
 		}
@@ -109,7 +112,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,7 +133,7 @@ public class PlayerGUIs {
 				} else if (slot.equalsIgnoreCase("today")) {
 					lore = Commands.getInstance().voteToday();
 				} else if (slot.equalsIgnoreCase("help")) {
-					lore = new String[] {"Click to view help"};
+					lore = new String[] { "Click to view help" };
 				}
 			}
 
@@ -169,7 +172,7 @@ public class PlayerGUIs {
 			});
 		}
 
-		BInventory.openInventory(player, inv);
+		inv.openInventory(player);
 	}
 
 	public void openVoteLast(Player player, User user) {
@@ -183,11 +186,22 @@ public class PlayerGUIs {
 
 						@Override
 						public void onClick(ClickEvent clickEvent) {
-							Player player = clickEvent.getPlayer();
-							openVoteLast(player, getSelectedPlayer(player));
+
 						}
 					});
 		}
+
+		if (Config.getInstance().getGUIVoteLastBackButton()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+
+			});
+		}
+
 		inv.openInventory(player);
 	}
 
@@ -202,11 +216,21 @@ public class PlayerGUIs {
 
 						@Override
 						public void onClick(ClickEvent clickEvent) {
-							Player player = clickEvent.getPlayer();
-							openVoteNext(player, getSelectedPlayer(player));
+
 						}
 					});
 		}
+
+		if (Config.getInstance().getGUIVoteNextBackButton()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+
+			});
+		}
 		inv.openInventory(player);
 	}
 
@@ -220,8 +244,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteBest(player, getSelectedPlayer(player));
+
 			}
 		});
 
@@ -230,8 +253,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteBest(player, getSelectedPlayer(player));
+
 			}
 		});
 
@@ -241,8 +263,7 @@ public class PlayerGUIs {
 
 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						Player player = clickEvent.getPlayer();
-						openVoteBest(player, getSelectedPlayer(player));
+
 					}
 				});
 
@@ -251,8 +272,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteBest(player, getSelectedPlayer(player));
+
 			}
 		});
 
@@ -261,8 +281,7 @@ public class PlayerGUIs {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				Player player = clickEvent.getPlayer();
-				openVoteBest(player, getSelectedPlayer(player));
+
 			}
 		});
 
@@ -272,11 +291,20 @@ 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(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
+
 		inv.openInventory(player);
 	}
 
@@ -301,6 +329,17 @@ public class PlayerGUIs {
 				});
 			}
 		}
+
+		if (Config.getInstance().getGUIVoteTodayBackButton()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+
+			});
+		}
 		inv.openInventory(player);
 	}
 
@@ -354,9 +393,20 @@ public class PlayerGUIs {
 				openVoteTop(player, cur.next());
 			}
 		});
+
+		if (Config.getInstance().getGUIVoteTopBackButton()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+
+				@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 +418,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 +426,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 +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().getGUIVoteTotalAllTimeTotalItem())
@@ -395,10 +442,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(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
 		inv.openInventory(player);
 	}
 
@@ -431,7 +486,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 +523,18 @@ public class PlayerGUIs {
 			count++;
 		}
 
-		BInventory.openInventory(player, inv);
+		if (Config.getInstance().getGUIVoteURLBackButton()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
+
+		inv.openInventory(player);
+
 	}
 
 	public void openVoteURL(Player player, String voteSite) {
@@ -506,6 +572,15 @@ public class PlayerGUIs {
 			}
 		});
 
+		if (Config.getInstance().getGUIVoteURLBackButton()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
 		inv.openInventory(player);
 	}
 
@@ -568,6 +643,6 @@ public class PlayerGUIs {
 			}
 		}
 
-		BInventory.openInventory(player, inv);
+		inv.openInventory(player);
 	}
 }

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

@@ -46,6 +46,10 @@ public class Config extends YMLFile {
 	public boolean allowUnJoined() {
 		return getData().getBoolean("AllowUnjoined");
 	}
+	
+	public boolean getGUIVoteLastBackButton() {
+		return getData().getBoolean("GUI.VoteLast.BackButton");
+	}
 
 	/**
 	 * Gets the all sites reward.
@@ -366,7 +370,6 @@ public class Config extends YMLFile {
 	 */
 	public String getFormatCommandsVoteNextInfoError() {
 		return getData().getString("Format.Commands.Vote.Next.Info.Error", "");
-
 	}
 
 	/**
@@ -377,7 +380,10 @@ 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", "Tomorrow");
 	}
 
 	/**
@@ -804,10 +810,6 @@ public class Config extends YMLFile {
 		return getData().getBoolean("LogVotesToFile");
 	}
 
-	public boolean getResetMilestonesMonthly() {
-		return getData().getBoolean("ResetMilestonesMonthly");
-	}
-
 	/**
 	 * Gets the milestone reward enabled.
 	 *
@@ -908,6 +910,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 +933,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 +1033,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.
 	 *
@@ -1054,10 +1068,6 @@ public class Config extends YMLFile {
 		return "VoteParty.Rewards";
 	}
 
-	public String getVotePartyBroadcast() {
-		return getData().getString("VoteParty.Broadcast", "");
-	}
-
 	/**
 	 * Gets the vote party votes required.
 	 *
@@ -1374,4 +1384,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");
@@ -81,6 +81,10 @@ public class ConfigVoteSites extends YMLFile {
 		return getData(site).getString("Name");
 	}
 
+	public String getEverySiteRewardPath() {
+		return "EverySiteReward";
+	}
+
 	public ConfigurationSection getItem(String site) {
 		return getData(site).getConfigurationSection("Item");
 	}
@@ -106,10 +110,6 @@ public class ConfigVoteSites extends YMLFile {
 	public String getRewardsPath(String siteName) {
 		return "VoteSites." + siteName + ".Rewards";
 	}
-	
-	public String getEverySiteRewardPath() {
-		return "EverySiteReward";
-	}
 
 	/**
 	 * Gets the service site.
@@ -166,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.
 	 *

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

@@ -45,9 +45,9 @@ public class VotiferEvent implements Listener {
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 			@Override
 			public void run() {
-				synchronized (plugin) {
+				synchronized (configVoteSites) {
 					User user = UserManager.getInstance().getVotingPluginUser(playerName);
-					if (!user.hasJoinedBefore() && !config.allowUnJoined()) {
+					if (!user.hasLoggedOnBefore() && !config.allowUnJoined()) {
 						plugin.getLogger().warning("Player " + playerName
 								+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
 						return;
@@ -94,7 +94,7 @@ 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);
 					} else {
 						user.addOfflineVote(voteSite.getKey());
@@ -128,8 +128,8 @@ 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();
 
 		if (voteUsername.length() == 0) {
 			plugin.getLogger().warning("No name from vote on " + voteSite);
@@ -141,12 +141,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,12 +161,10 @@ 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);

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

@@ -15,7 +15,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -52,7 +52,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;
@@ -126,78 +125,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);
-
 				HashMap<String, String> values = new HashMap<String, String>();
 				for (String key : user.getData().getKeys()) {
 					values.put(key, user.getData().getString(key));
 				}
-
-				/*
-				 * 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);
-				 */
-				for (Entry<String, String> entry : values.entrySet()) {
-					user.getData().setString(entry.getKey(), entry.getValue());
-				}
+				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);
 	}
 
@@ -244,7 +204,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(".", "_"));
 		}
@@ -292,6 +252,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() {
 
@@ -704,7 +681,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);
 			}
 		});
@@ -725,8 +702,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));
@@ -754,7 +731,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");
 
@@ -784,6 +760,7 @@ public class Main extends JavaPlugin {
 			}
 		});
 		loadTimer();
+
 	}
 
 	public void setUpdate(boolean update) {
@@ -798,6 +775,7 @@ public class Main extends JavaPlugin {
 		configVoteSites = ConfigVoteSites.getInstance();
 		config.setup();
 		configVoteSites.setup();
+
 		plugin.debug("Loaded Files");
 
 	}
@@ -823,8 +801,15 @@ public class Main extends JavaPlugin {
 						update = false;
 						plugin.debug("Starting background task");
 						try {
-							TopVoterHandler.getInstance().updateTopVoters();
-							Commands.getInstance().updateVoteToday();
+							ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
+							ArrayList<User> users = new ArrayList<User>();
+							for (String uuid : uuids) {
+								User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+								users.add(user);
+							}
+							plugin.debug("Finished loading player data");
+							TopVoterHandler.getInstance().updateTopVoters(users);
+							Commands.getInstance().updateVoteToday(users);
 							ServerData.getInstance().updateValues();
 							Signs.getInstance().updateSigns();
 							plugin.debug("Background task ran");
@@ -845,20 +830,7 @@ public class Main extends JavaPlugin {
 		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());

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

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

@@ -113,7 +113,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 * Adds the points.
 	 */
 	public void addPoints() {
-		setPoints(getPoints() + 1);
+		addPoints(Config.getInstance().getPointsOnVote());
 	}
 
 	/**
@@ -156,14 +156,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	public void addWeekVoteStreak() {
 		setWeekVoteStreak(getWeekVoteStreak() + 1);
 	}
-	
-	public int getMilestoneCount() {
-		return getData().getInt("MilestoneCount",getAllTimeTotal());
-	}
-	
-	public void setMilestoneCount(int value) {
-		getData().setInt("MilestoneCount", value);
-	}
 
 	/**
 	 * Can vote all.
@@ -188,6 +180,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) {
@@ -196,15 +189,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);
 	}
 
 	/**
@@ -355,6 +356,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");
 	}
@@ -733,6 +738,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);
 	}

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

@@ -41,11 +41,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.
 	 *
@@ -181,6 +185,8 @@ public class VoteSite {
 			displayName = key;
 		}
 		item = configVoteSites.getItem(key);
+		voteDelayDaily = configVoteSites.getVoteSiteResetVoteDelayDaily(key);
+		giveOffline = configVoteSites.getVoteSiteGiveOffline(key);
 	}
 
 	/**
@@ -192,6 +198,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
@@ -210,6 +230,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
@@ -248,6 +284,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

@@ -1,27 +1,20 @@
 package com.Ben12345rocks.VotingPlugin.OtherRewards;
 
-import java.util.HashMap;
 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();
@@ -268,16 +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) {
-		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>());
-			}
-
-		}
-	}
 }

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

@@ -77,7 +77,13 @@ public class TopVoterHandler implements Listener {
 
 	@EventHandler
 	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
@@ -153,6 +159,15 @@ public class TopVoterHandler implements Listener {
 		}
 		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
@@ -547,14 +562,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/VoteParty/VoteParty.java

@@ -152,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/VoteShop/VoteShop.java

@@ -35,30 +35,29 @@ 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));
 						}
+					}
+				}
 
-					});
+			});
 		}
 
 		inv.openInventory(player);