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

@@ -343,6 +343,7 @@ GUI:
   VoteURL:
     # GUI Name
     Name: '&cVoteURL'
+    BackButton: true
     SiteName: '&c%Name%'
     SeeURL: '&cClick to see URL'
     NextVote: '&cCan Vote In: %Info%'
@@ -392,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%'
@@ -413,6 +418,7 @@ GUI:
     Size: 27
   VoteTotal:
     Name: 'VoteTotal: %player%'
+    BackButton: true
     DayTotal:
       Item:
         Material: 'WATCH'
@@ -459,6 +465,7 @@ GUI:
         Amount: 1
   VoteStreak:
     Name: 'VoteBest: %player%'
+    BackButton: false
     CurrentDayStreak:
       Item:
         Material: 'WATCH'

VotingPlugin/Resources/VoteSites.yml

@@ -31,6 +31,9 @@ VoteSites:
     # Reset vote delay each day (for certain sites that do this)
     VoteDelayDaily: false
     
+    # If true, rewards can be executed offline (required ForceOffline to be true in the reward)
+    GiveOffline: false
+    
     # 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.9.2</version>
+	<version>5.9.4</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>

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

@@ -39,6 +39,7 @@ 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;
@@ -105,6 +106,13 @@ public class CommandLoader {
 		CommandLoader.plugin = plugin;
 	}
 
+	/**
+	 * @return the adminPerm
+	 */
+	public String getAdminPerm() {
+		return adminPerm;
+	}
+
 	/**
 	 * Gets the commands.
 	 *
@@ -114,26 +122,26 @@ 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") {
 
@@ -187,7 +195,8 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				if (Bukkit.getServer().getPluginManager().getPlugin("VoteRoulette") != null) {
 					for (OfflinePlayer offPlayer : Bukkit.getOfflinePlayers()) {
-						Voter voter = VoteRoulette.getInstance().getVoterManager().getVoter(offPlayer.getUniqueId(),
+						VoteRoulette.getInstance();
+						Voter voter = VoteRoulette.getVoterManager().getVoter(offPlayer.getUniqueId(),
 								offPlayer.getName());
 						User user = UserManager.getInstance().getVotingPluginUser(offPlayer);
 						user.setAllTimeTotal(user.getAllTimeTotal() + voter.getStatSheet().getLifetimeVotes());
@@ -426,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);
 			}
 		});
 
@@ -631,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 "
@@ -707,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
@@ -1192,27 +1201,6 @@ public class CommandLoader {
 		plugin.voteCommand.addAll(avCommands);
 	}
 
-	/**
-	 * @return the adminPerm
-	 */
-	public String getAdminPerm() {
-		return adminPerm;
-	}
-
-	/**
-	 * @return the modPerm
-	 */
-	public String getModPerm() {
-		return modPerm;
-	}
-
-	/**
-	 * @return the playerPerm
-	 */
-	public String getPlayerPerm() {
-		return playerPerm;
-	}
-
 	/**
 	 * Sets the commands.
 	 *

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

@@ -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);
@@ -613,13 +610,12 @@ public class Commands {
 				}
 			}
 		} else {
-			if (lastVote.getDayOfYear()==now.getDayOfYear() && lastVote.getYear()==now.getYear()) {
+			if (lastVote.getDayOfYear() == now.getDayOfYear() && lastVote.getYear() == now.getYear()) {
 				info = config.getFormatCommandsVoteNextInfoVoteDelayDaily();
 			} else {
 				info = config.getFormatCommandsVoteNextInfoCanVote();
 			}
-			
-			
+
 		}
 		return info;
 	}
@@ -750,7 +746,7 @@ public class Commands {
 
 		}
 	}
-	
+
 	public String[] voteURLs(User user) {
 		ArrayList<String> sites = new ArrayList<String>();
 

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/GUI/PlayerGUIs.java

@@ -88,6 +88,10 @@ public class PlayerGUIs {
 	}
 
 	public void openVoteGUI(Player player, User user) {
+		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"))
@@ -168,7 +172,7 @@ public class PlayerGUIs {
 			});
 		}
 
-		BInventory.openInventory(player, inv);
+		inv.openInventory(player);
 	}
 
 	public void openVoteLast(Player player, User user) {
@@ -186,13 +190,18 @@ public class PlayerGUIs {
 						}
 					});
 		}
-		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()));
-			}
-		});
+		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);
 	}
 
@@ -212,13 +221,16 @@ public class PlayerGUIs {
 					});
 		}
 
-		inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+		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()));
-			}
-		});
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+
+			});
+		}
 		inv.openInventory(player);
 	}
 
@@ -283,13 +295,15 @@ public class PlayerGUIs {
 					}
 				});
 
-		inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+		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()));
-			}
-		});
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
 
 		inv.openInventory(player);
 	}
@@ -315,13 +329,17 @@ public class PlayerGUIs {
 				});
 			}
 		}
-		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()));
-			}
-		});
+		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);
 	}
 
@@ -375,16 +393,20 @@ public class PlayerGUIs {
 				openVoteTop(player, cur.next());
 			}
 		});
-		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()));
-			}
-		});
+		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) {
@@ -422,13 +444,16 @@ public class PlayerGUIs {
 			public void onClick(ClickEvent clickEvent) {
 			}
 		});
-		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()));
-			}
-		});
+		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);
 	}
 
@@ -498,15 +523,18 @@ public class PlayerGUIs {
 			count++;
 		}
 
-		inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+		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()));
-			}
-		});
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
+
+		inv.openInventory(player);
 
-		BInventory.openInventory(player, inv);
 	}
 
 	public void openVoteURL(Player player, String voteSite) {
@@ -544,13 +572,15 @@ public class PlayerGUIs {
 			}
 		});
 
-		inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+		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()));
-			}
-		});
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
 		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.
@@ -806,10 +810,6 @@ public class Config extends YMLFile {
 		return getData().getBoolean("LogVotesToFile");
 	}
 
-	public boolean getResetMilestonesMonthly() {
-		return getData().getBoolean("ResetMilestonesMonthly");
-	}
-
 	/**
 	 * Gets the milestone reward enabled.
 	 *
@@ -910,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.
 	 *
@@ -929,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.
 	 *
@@ -1025,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.
 	 *
@@ -1056,14 +1068,6 @@ public class Config extends YMLFile {
 		return "VoteParty.Rewards";
 	}
 
-	public String getVotePartyBroadcast() {
-		return getData().getString("VoteParty.Broadcast", "");
-	}
-
-	public int getPointsOnVote() {
-		return getData().getInt("PointsOnVote", 1);
-	}
-
 	/**
 	 * Gets the vote party votes required.
 	 *
@@ -1380,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");
 	}
@@ -107,10 +111,6 @@ public class ConfigVoteSites extends YMLFile {
 		return "VoteSites." + siteName + ".Rewards";
 	}
 
-	public String getEverySiteRewardPath() {
-		return "EverySiteReward";
-	}
-
 	/**
 	 * Gets the service site.
 	 *
@@ -144,10 +144,6 @@ public class ConfigVoteSites extends YMLFile {
 		return getData(siteName).getBoolean("Enabled");
 	}
 
-	public boolean getVoteSiteResetVoteDelayDaily(String siteName) {
-		return getData(siteName).getBoolean("VoteDelayDaily");
-	}
-
 	/**
 	 * Gets the vote site file.
 	 *
@@ -170,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,7 +45,7 @@ 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.hasLoggedOnBefore() && !config.allowUnJoined()) {
 						plugin.getLogger().warning("Player " + playerName
@@ -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());
@@ -141,14 +141,12 @@ public class VotiferEvent implements Listener {
 		plugin.debug("PlayerUsername: " + voteUsername);
 		plugin.debug("VoteSite: " + 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);

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;
@@ -252,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() {
 
@@ -664,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);
 			}
 		});
@@ -685,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));
@@ -784,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");
@@ -820,21 +844,4 @@ public class Main extends JavaPlugin {
 		AdvancedCoreHook.getInstance().setSendScoreboards(Config.getInstance().getSendScoreboards());
 	}
 
-	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()));
-				}
-			});
-
-		}
-	}
-
 }

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

@@ -157,14 +157,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		setWeekVoteStreak(getWeekVoteStreak() + 1);
 	}
 
-	public int getMilestoneCount() {
-		return getData().getInt("MilestoneCount", getAllTimeTotal());
-	}
-
-	public void setMilestoneCount(int value) {
-		getData().setInt("MilestoneCount", value);
-	}
-
 	/**
 	 * Can vote all.
 	 *
@@ -364,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");
 	}
@@ -742,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

@@ -40,7 +40,7 @@ public class VoteSite {
 
 	/** The enabled. */
 	private boolean enabled;
-	
+
 	private boolean voteDelayDaily;
 
 	/** The priority. */
@@ -48,6 +48,8 @@ public class VoteSite {
 
 	private ConfigurationSection item;
 
+	private boolean giveOffline;
+
 	/**
 	 * Instantiates a new vote site.
 	 *
@@ -69,20 +71,6 @@ public class VoteSite {
 		init();
 	}
 
-	/**
-	 * @return the voteDelayDaily
-	 */
-	public boolean isVoteDelayDaily() {
-		return voteDelayDaily;
-	}
-
-	/**
-	 * @param voteDelayDaily the voteDelayDaily to set
-	 */
-	public void setVoteDelayDaily(boolean voteDelayDaily) {
-		this.voteDelayDaily = voteDelayDaily;
-	}
-
 	/**
 	 * Broadcast vote.
 	 *
@@ -198,6 +186,7 @@ public class VoteSite {
 		}
 		item = configVoteSites.getItem(key);
 		voteDelayDaily = configVoteSites.getVoteSiteResetVoteDelayDaily(key);
+		giveOffline = configVoteSites.getVoteSiteGiveOffline(key);
 	}
 
 	/**
@@ -209,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
@@ -227,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
@@ -265,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/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
@@ -556,12 +562,10 @@ 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())
 						&& !user.isBanned()) {

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) {
+			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);