Code cleanup

VotingPlugin/Resources/BungeeSettings.yml

@@ -35,6 +35,14 @@ BungeeBroadcastAlways: false
 # Requires server name below to be correct
 PerServerRewards: false
 
+# If true, points will be given on a per server level
+# Points will be added when server gets vote from bungee
+PerServerPoints: false
+
+# If true, plugin will trigger VotifierEvent
+# Should allow some compability with other plugins
+TriggerVotifierEvent: false
+
 # What server this is in bungee (must match)
 # Also can be applied to rewards
 Server: PleaseSet

VotingPlugin/Resources/Config.yml

@@ -137,6 +137,13 @@ Format:
   # Broadcast only when player is online
   BroadcastWhenOnline: false
   
+  # Broadcast every x number of minutes with number of players that voted
+  AlternateBroadcast:
+    Enabled: false
+    Broadcast: '&6[&4Broadcast&6] &2%numberofplayers% voted in the last half hour! /vote'
+    # Delay in minutes
+    Delay: 30
+  
   Commands:
     # Format for /vote
     # %num% = the number of the site, for a numbered list
@@ -247,7 +254,7 @@ Format:
         
       Today:
         Title:
-        - '&cToday's Votes %page%/%maxpage%'
+        - "&cToday's Votes %page%/%maxpage%"
         - '&cPlayerName : VoteSite : Time'
         Line: '&6%player% : %VoteSite% : %Time%'
         
@@ -384,6 +391,9 @@ TreatVanishAsOffline: false
 # If true, cooldown check is disabled
 DisableCoolDownCheck: false
 
+# If true, disable PlayerInteractEvent (for clicking signs and skulls)
+DisableInteractEvent: false
+
 # Delays login event, delays vote reminding and more
 # In ticks
 DelayLoginEvent: 0
@@ -442,6 +452,11 @@ PreventRepeatMilestones: false
 # Mainly to be used for alts and such
 UsePrimaryAccountForPlaceholders: false
 
+# Always force placeholders to return value if the value isn't cached
+# This should prevent server from crashing when pulling placeholders on main thread
+# Only affects placeholderapi placeholders
+AlwaysWaitForCachePlaceholders: false
+
 # If true, permissions will be handled differently
 MultiplePermissionsCheck: false
 
@@ -576,6 +591,10 @@ UseVaultPermissions: false
 # - PERMISSION
 DisabledCommands: []
 
+# Enable Geyser prefix support
+GeyserPrefixSupport: false
+GeyserPrefix: '*'
+
 # Enable to true for extra player checks
 ExtraBackgroundUpdate: false
 

VotingPlugin/Resources/GUI.yml

@@ -132,6 +132,10 @@ CHEST:
   VoteLast:
     Name: 'VoteLast: %player%'
     BackButton: true
+    # Lines for each vote site
+    # %time% = time, using timeformat below
+    # %timesince% = time since vote
+    Line: '&6%timeSince%'
   VoteNext:
     Name: 'VoteNext: %player%'
     BackButton: true
@@ -147,7 +151,7 @@ CHEST:
       Amount: 1
   VoteTop:
     Name: 'VoteTop %topvoter%'
-    BackButton: false
+    BackButton: true
     # Item of top voter (change material below)
     Item:
       Name: '&3&l%position%: &3%player%'
@@ -268,6 +272,8 @@ CHEST:
     Name: '&8Back to VoteGUI'
     # If true, clicking back button will open VoteURL
     OpenVoteURL: false
+    # If true, backbutton will be the last slot of the GUI
+    EndOfGUI: false
 
   VoteShopBackButton: true
   VoteShopEnabled: true

VotingPlugin/Resources/SpecialRewards.yml

@@ -28,9 +28,12 @@ Cumulative:
     # Wether or not votes must be made in same day/week
     # Useful if you want to require a certain number of voting sites to be voted on
     # for a daily/weekly reward instead of all of them
-    VotesInSameDay: false
-    VotesInSameWeek: false
-    VotesInSameMonth: false
+    # Valid options
+    # AllTime
+    # Monthly
+    # Weekly
+    # Daily
+    TotalToUse: AllTime
     Rewards: 
       Messages:
         Player: '&aYou got %cumulative% cumulative votes!'
@@ -47,6 +50,9 @@ VoteParty:
   # recieve the reward
   # If false, only players who voted get rewards
   GiveAllPlayers: false
+  # If true, give online players the vote party reward
+  # Can also use RewardType: ONLINE if you wanted
+  GiveOnlinePlayersOnly: false
   # If true, the vote count will reset each day
   ResetEachDay: false
   # If true, the vote count will reset each week

VotingPlugin/Resources/bungeeconfig.yml

@@ -43,6 +43,8 @@ BungeeMethod: PLUGINMESSAGING
 # This requires spigot servers AllowUnJoined to be set to true in Config.yml
 AllowUnJoined: false
 
+PointsOnVote: 1
+
 # If true, bungee will handle adding totals
 # If false, spigot servers will EACH set their own totals
 # If false, AllowUnJoined should false on bungee, spigot servers will handle that

VotingPlugin/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>6.2</version>
+	<version>6.3.1</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -228,14 +228,7 @@
 			<id>spigot-repo</id>
 			<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
 		</repository>
-		<repository>
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
+
 		<repository>
 			<id>maven-central</id>
 			<url>https://oss.sonatype.org/content/groups/public</url>
@@ -253,12 +246,7 @@
 			<url>https://dl.bintray.com/ichbinjoe/public/</url>
 		</repository>
 	</repositories>
-
 	<dependencies>
-		<!--<dependency> <groupId>com.github.Ben12345rocks</groupId> <artifactId>AdvancedCore</artifactId> 
-			<version>3.0-SNAPSHOT</version> </dependency> -->
-
-
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
@@ -318,6 +306,16 @@
 					<version>master-SNAPSHOT</version>
 				</dependency>
 			</dependencies>
+			<repositories>
+				<repository>
+					<id>jitpack.io</id>
+					<url>https://jitpack.io</url>
+					<snapshots>
+						<enabled>true</enabled>
+						<updatePolicy>always</updatePolicy>
+					</snapshots>
+				</repository>
+			</repositories>
 		</profile>
 		<profile>
 			<id>prod2</id>

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

@@ -8,23 +8,24 @@ import com.bencodez.votingplugin.user.VotingPluginUser;
 @Deprecated
 public class User {
 	private VotingPluginUser user;
+
 	public User(Player p) {
 		user = UserManager.getInstance().getVotingPluginUser(p);
 	}
-	
-	public int getPoints() {
-		return user.getPoints();
-	}
-	
-	public void setPoints(int points) {
-		user.setPoints(points);
-	}
-	
+
 	public void addPoints(int points) {
 		user.addPoints(points);
 	}
-	
+
+	public int getPoints() {
+		return user.getPoints();
+	}
+
 	public boolean removePoints(int points) {
 		return user.removePoints(points);
 	}
- }
+
+	public void setPoints(int points) {
+		user.setPoints(points);
+	}
+}

VotingPlugin/src/com/bencodez/votingplugin/BungeeHandler.java

@@ -80,6 +80,9 @@ public class BungeeHandler {
 						user.clearCache();
 
 						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline);
+						if (plugin.getBungeeSettings().isPerServerPoints()) {
+							user.addPoints(plugin.getConfigFile().getPointsOnVote());
+						}
 
 						if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
 							if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
@@ -122,6 +125,10 @@ public class BungeeHandler {
 								player);
 						user.clearCache();
 
+						if (plugin.getBungeeSettings().isPerServerPoints()) {
+							user.addPoints(plugin.getConfigFile().getPointsOnVote());
+						}
+
 						boolean setTotals = Boolean.valueOf(args.get(7));
 
 						boolean wasOnline = Boolean.valueOf(args.get(4));
@@ -213,6 +220,10 @@ public class BungeeHandler {
 
 						user.clearCache();
 
+						if (plugin.getBungeeSettings().isPerServerPoints()) {
+							user.addPoints(plugin.getConfigFile().getPointsOnVote());
+						}
+
 						user.bungeeVote(data[3], new BungeeMessageData(data[4]), !Boolean.valueOf(data[5]));
 					}
 				}
@@ -234,6 +245,10 @@ public class BungeeHandler {
 
 						user.clearCache();
 
+						if (plugin.getBungeeSettings().isPerServerPoints()) {
+							user.addPoints(plugin.getConfigFile().getPointsOnVote());
+						}
+
 						user.bungeeVoteOnline(data[3], new BungeeMessageData(data[4]), !Boolean.valueOf(data[5]));
 					}
 				}

VotingPlugin/src/com/bencodez/votingplugin/VotingPluginHooks.java

@@ -1,9 +1,12 @@
 package com.bencodez.votingplugin;
 
+import org.bukkit.entity.Player;
+
 import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInject;
 import com.bencodez.advancedcore.api.rewards.injectedrequirement.RequirementInject;
 import com.bencodez.votingplugin.user.UserManager;
+import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VotingPluginHooks {
 	private static VotingPluginHooks instance = new VotingPluginHooks();
@@ -20,6 +23,12 @@ public class VotingPluginHooks {
 		RewardHandler.getInstance().addInjectedReward(inject);
 	}
 
+	public void backgroundUpdate(Player player) {
+		VotingPluginUser user = getUserManager().getVotingPluginUser(player);
+		user.offVote();
+		user.checkOfflineRewards();
+	}
+
 	public VotingPluginMain getMainClass() {
 		return VotingPluginMain.plugin;
 	}

VotingPlugin/src/com/bencodez/votingplugin/VotingPluginMain.java

@@ -54,6 +54,7 @@ import com.bencodez.advancedcore.api.user.UUID;
 import com.bencodez.advancedcore.api.user.UserStorage;
 import com.bencodez.advancedcore.logger.Logger;
 import com.bencodez.advancedcore.nms.NMSManager;
+import com.bencodez.votingplugin.broadcast.BroadcastHandler;
 import com.bencodez.votingplugin.commands.CommandLoader;
 import com.bencodez.votingplugin.commands.executers.CommandAdminVote;
 import com.bencodez.votingplugin.commands.executers.CommandVote;
@@ -105,6 +106,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	@Getter
 	private LinkedHashMap<java.util.UUID, ArrayList<String>> advancedTab = new LinkedHashMap<java.util.UUID, ArrayList<String>>();
 
+	@Getter
+	private BroadcastHandler broadcastHandler;
+
 	@Getter
 	private BungeeHandler bungeeHandler;
 
@@ -198,6 +202,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	@Getter
 	private boolean ymlError = false;
 
+	private void addDirectlyDefinedRewards(DirectlyDefinedReward directlyDefinedReward) {
+		RewardHandler.getInstance().addDirectlyDefined(directlyDefinedReward);
+	}
+
 	public void basicBungeeUpdate() {
 		for (Player player : Bukkit.getOnlinePlayers()) {
 			VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
@@ -467,6 +475,434 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		return false;
 	}
 
+	public void loadDirectlyDefined() {
+		RewardHandler.getInstance().getDirectlyDefinedRewards().clear();
+		// AllSites reward
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("AllSites") {
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+		});
+
+		// FirstVote
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("FirstVote") {
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+		});
+
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteReminding.Rewards") {
+
+			@Override
+			public void createSection(String key) {
+				getConfigFile().saveData();
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getConfigFile().getData();
+			}
+
+			@Override
+			public void save() {
+				getConfigFile().saveData();
+			}
+
+			@Override
+			public void setData(String path, Object value) {
+				getConfigFile().setValue(path, value);
+			}
+		});
+
+		// vote cooldown ended
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteCoolDownEndedReward") {
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+		});
+
+		// any site rewards
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("AnySiteRewards") {
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+		});
+
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("EverySiteReward") {
+
+			@Override
+			public void createSection(String key) {
+				getConfigVoteSites().createSection(key);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getConfigVoteSites().getData();
+			}
+
+			@Override
+			public void save() {
+				getConfigVoteSites().saveData();
+			}
+
+			@Override
+			public void setData(String path, Object value) {
+				getConfigVoteSites().setValue(path, value);
+			}
+		});
+
+		// login rewards
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("LoginRewards") {
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+		});
+
+		// logout rewards
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("LogoutRewards") {
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+		});
+
+		// VoteParty
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteParty.Rewards") {
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+		});
+
+		// Cumulative rewards
+		for (String num : getSpecialRewardsConfig().getCumulativeVotes()) {
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("Cumulative." + num + ".Rewards") {
+
+				@Override
+				public void createSection(String key) {
+					getSpecialRewardsConfig().createSection(key);
+				}
+
+				@Override
+				public ConfigurationSection getFileData() {
+					return getSpecialRewardsConfig().getData();
+				}
+
+				@Override
+				public void save() {
+					getSpecialRewardsConfig().saveData();
+				}
+
+				@Override
+				public void setData(String path, Object value) {
+					getSpecialRewardsConfig().setValue(path, value);
+				}
+			});
+		}
+
+		// Milestones rewards
+		for (String num : getSpecialRewardsConfig().getMilestoneVotes()) {
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("MileStones." + num + ".Rewards") {
+
+				@Override
+				public void createSection(String key) {
+					getSpecialRewardsConfig().createSection(key);
+				}
+
+				@Override
+				public ConfigurationSection getFileData() {
+					return getSpecialRewardsConfig().getData();
+				}
+
+				@Override
+				public void save() {
+					getSpecialRewardsConfig().saveData();
+				}
+
+				@Override
+				public void setData(String path, Object value) {
+					getSpecialRewardsConfig().setValue(path, value);
+				}
+			});
+		}
+
+		// VoteSites
+		for (VoteSite site : plugin.getVoteSites()) {
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteSites." + site.getKey() + ".Rewards") {
+
+				@Override
+				public void createSection(String key) {
+					getConfigVoteSites().createSection(key);
+				}
+
+				@Override
+				public ConfigurationSection getFileData() {
+					return getConfigVoteSites().getData();
+				}
+
+				@Override
+				public void save() {
+					getConfigVoteSites().saveData();
+				}
+
+				@Override
+				public void setData(String path, Object value) {
+					getConfigVoteSites().setValue(path, value);
+				}
+			});
+		}
+
+		// vote streaks
+		String[] types = new String[] { "Day", "Week", "Month" };
+		for (String type : types) {
+			for (String str : plugin.getSpecialRewardsConfig().getVoteStreakVotes(type)) {
+				addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteStreak." + type + "." + str + ".Rewards") {
+
+					@Override
+					public void createSection(String key) {
+						getSpecialRewardsConfig().createSection(key);
+					}
+
+					@Override
+					public ConfigurationSection getFileData() {
+						return getSpecialRewardsConfig().getData();
+					}
+
+					@Override
+					public void save() {
+						getSpecialRewardsConfig().saveData();
+					}
+
+					@Override
+					public void setData(String path, Object value) {
+						getSpecialRewardsConfig().setValue(path, value);
+					}
+				});
+			}
+		}
+
+		for (String path : plugin.getSpecialRewardsConfig().getMonthlyPossibleRewardPlaces()) {
+			addDirectlyDefinedRewards(
+					new DirectlyDefinedReward(plugin.getSpecialRewardsConfig().getMonthlyAwardRewardsPath(path)) {
+
+						@Override
+						public void createSection(String key) {
+							getSpecialRewardsConfig().createSection(key);
+						}
+
+						@Override
+						public ConfigurationSection getFileData() {
+							return getSpecialRewardsConfig().getData();
+						}
+
+						@Override
+						public void save() {
+							getSpecialRewardsConfig().saveData();
+						}
+
+						@Override
+						public void setData(String path, Object value) {
+							getSpecialRewardsConfig().setValue(path, value);
+						}
+					});
+		}
+
+		for (String path : plugin.getSpecialRewardsConfig().getWeeklyPossibleRewardPlaces()) {
+			addDirectlyDefinedRewards(
+					new DirectlyDefinedReward(plugin.getSpecialRewardsConfig().getWeeklyAwardRewardsPath(path)) {
+
+						@Override
+						public void createSection(String key) {
+							getSpecialRewardsConfig().createSection(key);
+						}
+
+						@Override
+						public ConfigurationSection getFileData() {
+							return getSpecialRewardsConfig().getData();
+						}
+
+						@Override
+						public void save() {
+							getSpecialRewardsConfig().saveData();
+						}
+
+						@Override
+						public void setData(String path, Object value) {
+							getSpecialRewardsConfig().setValue(path, value);
+						}
+					});
+		}
+
+		for (String path : plugin.getSpecialRewardsConfig().getDailyPossibleRewardPlaces()) {
+			addDirectlyDefinedRewards(
+					new DirectlyDefinedReward(plugin.getSpecialRewardsConfig().getDailyAwardRewardsPath(path)) {
+
+						@Override
+						public void createSection(String key) {
+							getSpecialRewardsConfig().createSection(key);
+						}
+
+						@Override
+						public ConfigurationSection getFileData() {
+							return getSpecialRewardsConfig().getData();
+						}
+
+						@Override
+						public void save() {
+							getSpecialRewardsConfig().saveData();
+						}
+
+						@Override
+						public void setData(String path, Object value) {
+							getSpecialRewardsConfig().setValue(path, value);
+						}
+					});
+		}
+
+		for (String identifier : plugin.getGui().getChestShopIdentifiers()) {
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("CHEST.Shop." + identifier + ".Rewards") {
+
+				@Override
+				public void createSection(String key) {
+					getGui().createSection(key);
+				}
+
+				@Override
+				public ConfigurationSection getFileData() {
+					return getGui().getData();
+				}
+
+				@Override
+				public void save() {
+					getGui().saveData();
+				}
+
+				@Override
+				public void setData(String path, Object value) {
+					getGui().setValue(path, value);
+				}
+			});
+		}
+
+	}
+
 	private void loadTimer() {
 		Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
 
@@ -656,6 +1092,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
+			getMysql().alterColumnType("DayVoteStreakLastUpdate", "MEDIUMTEXT");
 			if (getOptions().isPerServerRewards()) {
 				getMysql().alterColumnType("OfflineRewards" + getOptions().getServer(), "MEDIUMTEXT");
 			}
@@ -716,6 +1153,11 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			});
 		}
 
+		if (plugin.getConfigFile().isFormatAlternateBroadcastEnabled()) {
+			broadcastHandler = new BroadcastHandler(plugin, plugin.getConfigFile().getFormatAlternateBroadcastDelay());
+			plugin.debug("Using alternate broadcast method");
+		}
+
 		plugin.getLogger().info("Enabled VotingPlugin " + plugin.getDescription().getVersion());
 		if (getProfile().equals("dev")) {
 			plugin.getLogger().warning("Using dev build, this is not a stable build, use at your own risk");
@@ -759,268 +1201,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	}
 
-	public void loadDirectlyDefined() {
-		RewardHandler.getInstance().getDirectlyDefinedRewards().clear();
-		// AllSites reward
-		addDirectlyDefinedRewards(new DirectlyDefinedReward("AllSites") {
-
-			@Override
-			public void setData(String path, Object value) {
-				getSpecialRewardsConfig().setValue(path, value);
-			}
-
-			@Override
-			public ConfigurationSection getFileData() {
-				return getSpecialRewardsConfig().getData();
-			}
-		});
-
-		// FirstVote
-		addDirectlyDefinedRewards(new DirectlyDefinedReward("FirstVote") {
-
-			@Override
-			public void setData(String path, Object value) {
-				getSpecialRewardsConfig().setValue(path, value);
-			}
-
-			@Override
-			public ConfigurationSection getFileData() {
-				return getSpecialRewardsConfig().getData();
-			}
-		});
-
-		addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteReminding.Rewards") {
-
-			@Override
-			public void setData(String path, Object value) {
-				getConfigFile().setValue(path, value);
-			}
-
-			@Override
-			public ConfigurationSection getFileData() {
-				return getConfigFile().getData();
-			}
-		});
-
-		// vote cooldown ended
-		addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteCoolDownEndedReward") {
-
-			@Override
-			public void setData(String path, Object value) {
-				getSpecialRewardsConfig().setValue(path, value);
-			}
-
-			@Override
-			public ConfigurationSection getFileData() {
-				return getSpecialRewardsConfig().getData();
-			}
-		});
-
-		// any site rewards
-		addDirectlyDefinedRewards(new DirectlyDefinedReward("AnySiteRewards") {
-
-			@Override
-			public void setData(String path, Object value) {
-				getSpecialRewardsConfig().setValue(path, value);
-			}
-
-			@Override
-			public ConfigurationSection getFileData() {
-				return getSpecialRewardsConfig().getData();
-			}
-		});
-
-		addDirectlyDefinedRewards(new DirectlyDefinedReward("EverySiteReward") {
-
-			@Override
-			public void setData(String path, Object value) {
-				getConfigVoteSites().setValue(path, value);
-			}
-
-			@Override
-			public ConfigurationSection getFileData() {
-				return getConfigVoteSites().getData();
-			}
-		});
-
-		// login rewards
-		addDirectlyDefinedRewards(new DirectlyDefinedReward("LoginRewards") {
-
-			@Override
-			public void setData(String path, Object value) {
-				getSpecialRewardsConfig().setValue(path, value);
-			}
-
-			@Override
-			public ConfigurationSection getFileData() {
-				return getSpecialRewardsConfig().getData();
-			}
-		});
-
-		// logout rewards
-		addDirectlyDefinedRewards(new DirectlyDefinedReward("LogoutRewards") {
-
-			@Override
-			public void setData(String path, Object value) {
-				getSpecialRewardsConfig().setValue(path, value);
-			}
-
-			@Override
-			public ConfigurationSection getFileData() {
-				return getSpecialRewardsConfig().getData();
-			}
-		});
-
-		// VoteParty
-		addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteParty.Rewards") {
-
-			@Override
-			public void setData(String path, Object value) {
-				getSpecialRewardsConfig().setValue(path, value);
-			}
-
-			@Override
-			public ConfigurationSection getFileData() {
-				return getSpecialRewardsConfig().getData();
-			}
-		});
-
-		// Cumulative rewards
-		for (String num : getSpecialRewardsConfig().getCumulativeVotes()) {
-			addDirectlyDefinedRewards(new DirectlyDefinedReward("Cumulative." + num + ".Rewards") {
-
-				@Override
-				public void setData(String path, Object value) {
-					getSpecialRewardsConfig().setValue(path, value);
-				}
-
-				@Override
-				public ConfigurationSection getFileData() {
-					return getSpecialRewardsConfig().getData();
-				}
-			});
-		}
-
-		// Milestones rewards
-		for (String num : getSpecialRewardsConfig().getMilestoneVotes()) {
-			addDirectlyDefinedRewards(new DirectlyDefinedReward("MileStones." + num + ".Rewards") {
-
-				@Override
-				public void setData(String path, Object value) {
-					getSpecialRewardsConfig().setValue(path, value);
-				}
-
-				@Override
-				public ConfigurationSection getFileData() {
-					return getSpecialRewardsConfig().getData();
-				}
-			});
-		}
-
-		// VoteSites
-		for (VoteSite site : plugin.getVoteSites()) {
-			addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteSites." + site.getKey() + ".Rewards") {
-
-				@Override
-				public void setData(String path, Object value) {
-					getConfigVoteSites().setValue(path, value);
-				}
-
-				@Override
-				public ConfigurationSection getFileData() {
-					return getConfigVoteSites().getData();
-				}
-			});
-		}
-
-		// vote streaks
-		String[] types = new String[] { "Day", "Week", "Month" };
-		for (String type : types) {
-			for (String str : plugin.getSpecialRewardsConfig().getVoteStreakVotes(type)) {
-				addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteStreak." + type + "." + str + ".Rewards") {
-
-					@Override
-					public void setData(String path, Object value) {
-						getSpecialRewardsConfig().setValue(path, value);
-					}
-
-					@Override
-					public ConfigurationSection getFileData() {
-						return getSpecialRewardsConfig().getData();
-					}
-				});
-			}
-		}
-
-		for (String path : plugin.getSpecialRewardsConfig().getMonthlyPossibleRewardPlaces()) {
-			addDirectlyDefinedRewards(
-					new DirectlyDefinedReward(plugin.getSpecialRewardsConfig().getMonthlyAwardRewardsPath(path)) {
-
-						@Override
-						public void setData(String path, Object value) {
-							getSpecialRewardsConfig().setValue(path, value);
-						}
-
-						@Override
-						public ConfigurationSection getFileData() {
-							return getSpecialRewardsConfig().getData();
-						}
-					});
-		}
-
-		for (String path : plugin.getSpecialRewardsConfig().getWeeklyPossibleRewardPlaces()) {
-			addDirectlyDefinedRewards(
-					new DirectlyDefinedReward(plugin.getSpecialRewardsConfig().getWeeklyAwardRewardsPath(path)) {
-
-						@Override
-						public void setData(String path, Object value) {
-							getSpecialRewardsConfig().setValue(path, value);
-						}
-
-						@Override
-						public ConfigurationSection getFileData() {
-							return getSpecialRewardsConfig().getData();
-						}
-					});
-		}
-
-		for (String path : plugin.getSpecialRewardsConfig().getDailyPossibleRewardPlaces()) {
-			addDirectlyDefinedRewards(
-					new DirectlyDefinedReward(plugin.getSpecialRewardsConfig().getDailyAwardRewardsPath(path)) {
-
-						@Override
-						public void setData(String path, Object value) {
-							getSpecialRewardsConfig().setValue(path, value);
-						}
-
-						@Override
-						public ConfigurationSection getFileData() {
-							return getSpecialRewardsConfig().getData();
-						}
-					});
-		}
-
-		for (String identifier : plugin.getGui().getChestShopIdentifiers()) {
-			addDirectlyDefinedRewards(new DirectlyDefinedReward("CHEST.Shop." + identifier + ".Rewards") {
-
-				@Override
-				public void setData(String path, Object value) {
-					getGui().setValue(path, value);
-				}
-
-				@Override
-				public ConfigurationSection getFileData() {
-					return getGui().getData();
-				}
-			});
-		}
-
-	}
-
-	private void addDirectlyDefinedRewards(DirectlyDefinedReward directlyDefinedReward) {
-		RewardHandler.getInstance().addDirectlyDefined(directlyDefinedReward);
-	}
-
 	/*
 	 * (non-Javadoc)
 	 *
@@ -1118,7 +1298,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		pm.registerEvents(new PlayerVoteListener(this), this);
 		pm.registerEvents(new SignChange(this), this);
 		pm.registerEvents(new BlockBreak(this), this);
-		pm.registerEvents(new PlayerInteract(this), this);
+		if (!plugin.getConfigFile().isDisableInteractEvent()) {
+			pm.registerEvents(new PlayerInteract(this), this);
+		}
+
 		pm.registerEvents(new VotingPluginUpdateEvent(this), this);
 		/*
 		 * if (!NMSManager.getInstance().isVersion("1.12")) { pm.registerEvents(new
@@ -1158,6 +1341,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		bungeeSettings.reloadData();
 		checkYMLError();
 
+		if (broadcastHandler != null) {
+			broadcastHandler.schelude(getConfigFile().getFormatAlternateBroadcastDelay());
+		}
+
 		updateAdvancedCoreHook();
 		plugin.loadVoteSites();
 		loadDirectlyDefined();

VotingPlugin/src/com/bencodez/votingplugin/broadcast/BroadcastHandler.java

@@ -0,0 +1,67 @@
+package com.bencodez.votingplugin.broadcast;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.misc.MiscUtils;
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.user.UserManager;
+
+public class BroadcastHandler {
+	private VotingPluginMain plugin;
+	private Timer timer;
+	ConcurrentLinkedQueue<String> votedPlayers = new ConcurrentLinkedQueue<String>();
+
+	public BroadcastHandler(VotingPluginMain plugin, int delay) {
+		this.plugin = plugin;
+		schelude(delay);
+	}
+
+	public void check() {
+		int size = votedPlayers.size();
+		if (size > 0) {
+			for (int i = 0; i < size; i++) {
+				votedPlayers.poll();
+			}
+			String bc = StringParser.getInstance()
+					.colorize(plugin.getConfigFile().getFormatAlternateBroadcastBroadcast());
+			HashMap<String, String> placeholders = new HashMap<String, String>();
+			placeholders.put("numberofplayers", "" + size);
+			bc = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
+			ArrayList<Player> players = new ArrayList<Player>();
+			for (Player p : Bukkit.getOnlinePlayers()) {
+				if (!UserManager.getInstance().getVotingPluginUser(p).getDisableBroadcast()) {
+					players.add(p);
+				}
+			}
+
+			MiscUtils.getInstance().broadcast(bc, players);
+		}
+	}
+
+	public void onVote(String player) {
+		votedPlayers.add(player);
+	}
+
+	public void schelude(int delay) {
+		if (timer != null) {
+			timer.cancel();
+		} else {
+			timer = new Timer();
+		}
+		timer.schedule(new TimerTask() {
+
+			@Override
+			public void run() {
+				check();
+			}
+		}, 1000 * 60, 1000 * 60 * delay);
+	}
+}

VotingPlugin/src/com/bencodez/votingplugin/bungee/BungeeMessageData.java

@@ -12,15 +12,25 @@ public class BungeeMessageData {
 	@Getter
 	private int allTimeTotal = 0;
 	@Getter
-	private int monthTotal = 0;
-	@Getter
-	private int weeklyTotal = 0;
-	@Getter
 	private int dailyTotal = 0;
 	@Getter
+	private int milestoneCount = 0;
+	@Getter
+	private int monthTotal = 0;
+	@Getter
 	private int points = 0;
 	@Getter
-	private int milestoneCount = 0;
+	private int weeklyTotal = 0;
+
+	public BungeeMessageData(int allTimeTotal, int monthTotal, int weeklyTotal, int dailyTotal, int points,
+			int milestoneCount) {
+		this.allTimeTotal = allTimeTotal;
+		this.monthTotal = monthTotal;
+		this.weeklyTotal = weeklyTotal;
+		this.dailyTotal = dailyTotal;
+		this.points = points;
+		this.milestoneCount = milestoneCount;
+	}
 
 	public BungeeMessageData(String str) {
 		String[] data = str.split(Pattern.quote("//"));
@@ -40,14 +50,4 @@ public class BungeeMessageData {
 				+ milestoneCount;
 	}
 
-	public BungeeMessageData(int allTimeTotal, int monthTotal, int weeklyTotal, int dailyTotal, int points,
-			int milestoneCount) {
-		this.allTimeTotal = allTimeTotal;
-		this.monthTotal = monthTotal;
-		this.weeklyTotal = weeklyTotal;
-		this.dailyTotal = dailyTotal;
-		this.points = points;
-		this.milestoneCount = milestoneCount;
-	}
-
 }

VotingPlugin/src/com/bencodez/votingplugin/bungee/Config.java

@@ -21,6 +21,10 @@ public class Config {
 		this.bungee = bungee;
 	}
 
+	public boolean getAllowUnJoined() {
+		return getData().getBoolean("AllowUnJoined", false);
+	}
+
 	public List<String> getBlockedServers() {
 		return getData().getStringList("BlockedServers");
 	}
@@ -29,22 +33,14 @@ public class Config {
 		return getData().getBoolean("Broadcast", false);
 	}
 
-	public boolean getWaitForUserOnline() {
-		return getData().getBoolean("WaitForUserOnline", false);
+	public String getBungeeHost() {
+		return getData().getString("BungeeServer.Host", "");
 	}
 
 	public boolean getBungeeManageTotals() {
 		return getData().getBoolean("BungeeManageTotals", true);
 	}
 
-	public boolean getAllowUnJoined() {
-		return getData().getBoolean("AllowUnJoined", false);
-	}
-
-	public String getBungeeHost() {
-		return getData().getString("BungeeServer.Host", "");
-	}
-
 	public String getBungeeMethod() {
 		return getData().getString("BungeeMethod", "SOCKETS");
 	}
@@ -61,6 +57,10 @@ public class Config {
 		return getData().getString("FallBackServer", "");
 	}
 
+	public int getPointsOnVote() {
+		return getData().getInt("PointsOnVote", 1);
+	}
+
 	public boolean getSendVotesToAllServers() {
 		return getData().getBoolean("SendVotesToAllServers");
 	}
@@ -73,6 +73,10 @@ public class Config {
 		return getData().getSection("SpigotServers").getKeys();
 	}
 
+	public boolean getWaitForUserOnline() {
+		return getData().getBoolean("WaitForUserOnline", false);
+	}
+
 	public void load() {
 		if (!bungee.getDataFolder().exists()) {
 			bungee.getDataFolder().mkdir();

VotingPlugin/src/com/bencodez/votingplugin/bungee/NonVotedPlayersCache.java

@@ -29,18 +29,6 @@ public class NonVotedPlayersCache {
 		getData().set("NonVotedPlayers." + playerName + ".LastTime", System.currentTimeMillis());
 	}
 
-	public String playerExists(String playerName) {
-		if (getData().getSection("NonVotedPlayers").getKeys().contains(playerName)) {
-			return getData().getString("NonVotedPlayers." + playerName + ".UUID", "");
-		}
-		return "";
-	}
-
-	private void remove(String player) {
-		bungee.debug("Removing nonvotedplayer: " + player);
-		getData().set("NonVotedPlayers." + player, null);
-	}
-
 	public void check() {
 		for (String player : getData().getSection("NonVotedPlayers").getKeys()) {
 			long time = getData().getLong("NonVotedPlayers." + player + ".LastTime", 0);
@@ -82,6 +70,18 @@ public class NonVotedPlayersCache {
 		}
 	}
 
+	public String playerExists(String playerName) {
+		if (getData().getSection("NonVotedPlayers").getKeys().contains(playerName)) {
+			return getData().getString("NonVotedPlayers." + playerName + ".UUID", "");
+		}
+		return "";
+	}
+
+	private void remove(String player) {
+		bungee.debug("Removing nonvotedplayer: " + player);
+		getData().set("NonVotedPlayers." + player, null);
+	}
+
 	public void save() {
 		try {
 			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,

VotingPlugin/src/com/bencodez/votingplugin/bungee/VotingPluginBungee.java

@@ -61,11 +61,13 @@ public class VotingPluginBungee extends Plugin {
 	@Getter
 	private BungeeMySQL mysql;
 
+	private NonVotedPlayersCache nonVotedPlayersCache;
+
 	private SocketHandler socketHandler;
 
 	private VoteCache voteCacheFile;
 
-	private NonVotedPlayersCache nonVotedPlayersCache;
+	private boolean votifierEnabled = true;
 
 	public void checkCachedVotes(String server) {
 		if (getProxy().getServerInfo(server) != null) {
@@ -233,8 +235,6 @@ public class VotingPluginBungee extends Plugin {
 		}
 	}
 
-	private boolean votifierEnabled = true;
-
 	@Override
 	public void onEnable() {
 		try {
@@ -279,6 +279,7 @@ public class VotingPluginBungee extends Plugin {
 			getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
+			getMysql().alterColumnType("DayVoteStreakLastUpdate", "MEDIUMTEXT");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -320,7 +321,7 @@ public class VotingPluginBungee extends Plugin {
 			try {
 				for (String player : voteCacheFile.getPlayers()) {
 					ArrayList<OfflineBungeeVote> vote = new ArrayList<OfflineBungeeVote>();
-					for (String num : voteCacheFile.getServerVotes(player)) {
+					for (String num : voteCacheFile.getOnlineVotes(player)) {
 						Configuration data = voteCacheFile.getOnlineVotes(player, num);
 						vote.add(new OfflineBungeeVote(data.getString("Name"), data.getString("UUID"),
 								data.getString("Service"), data.getLong("Time"), data.getBoolean("Real"),
@@ -415,6 +416,13 @@ public class VotingPluginBungee extends Plugin {
 		getLogger().info("VotingPlugin loaded, using method: " + method.toString());
 	}
 
+	@EventHandler
+	public void onLogin(PostLoginEvent event) {
+		if (nonVotedPlayersCache != null) {
+			nonVotedPlayersCache.addPlayer(event.getPlayer());
+		}
+	}
+
 	@EventHandler
 	public void onPluginMessage(PluginMessageEvent ev) {
 		if (!ev.getTag().equals("vp:vp".toLowerCase())) {
@@ -423,8 +431,9 @@ public class VotingPluginBungee extends Plugin {
 
 		ev.setCancelled(true);
 
-		if (!(ev.getSender() instanceof Server))
+		if (!(ev.getSender() instanceof Server)) {
 			return;
+		}
 
 		ByteArrayInputStream instream = new ByteArrayInputStream(ev.getData());
 		DataInputStream in = new DataInputStream(instream);
@@ -439,7 +448,15 @@ public class VotingPluginBungee extends Plugin {
 				String server = in.readUTF();
 				getLogger().info("Status okay for " + server);
 				return;
+			} else if (subchannel.equalsIgnoreCase("login")) {
+				String player = in.readUTF();
+				ProxiedPlayer p = getProxy().getPlayer(player);
+				String server = p.getServer().getInfo().getName();
+				checkCachedVotes(server);
+				checkOnlineVotes(p, p.getUniqueId().toString(), server);
+				return;
 			} else {
+
 				// reforward message
 				out.writeUTF(subchannel);
 				out.writeInt(size);
@@ -457,13 +474,6 @@ public class VotingPluginBungee extends Plugin {
 		}
 	}
 
-	@EventHandler
-	public void onLogin(PostLoginEvent event) {
-		if (nonVotedPlayersCache != null) {
-			nonVotedPlayersCache.addPlayer(event.getPlayer());
-		}
-	}
-
 	@EventHandler
 	public void onServerConnected(ServerConnectedEvent event) {
 		final String server = event.getServer().getInfo().getName();
@@ -476,7 +486,7 @@ public class VotingPluginBungee extends Plugin {
 				checkOnlineVotes(event.getPlayer(), uuid, server);
 			}
 
-		}, 2, TimeUnit.SECONDS);
+		}, 3, TimeUnit.SECONDS);
 	}
 
 	private UUID parseUUIDFromString(String uuidAsString) {
@@ -631,7 +641,8 @@ public class VotingPluginBungee extends Plugin {
 
 				text = new BungeeMessageData(mysqlUpdate(data, uuid, "AllTimeTotal", 1),
 						mysqlUpdate(data, uuid, "MonthTotal", 1), mysqlUpdate(data, uuid, "WeeklyTotal", 1),
-						mysqlUpdate(data, uuid, "DailyTotal", 1), mysqlUpdate(data, uuid, "Points", 1),
+						mysqlUpdate(data, uuid, "DailyTotal", 1),
+						mysqlUpdate(data, uuid, "Points", getConfig().getPointsOnVote()),
 						mysqlUpdate(data, uuid, "MilestoneCount", 1));
 			} else {
 				text = new BungeeMessageData(0, 0, 0, 0, 0, 0);

VotingPlugin/src/com/bencodez/votingplugin/bungee/VotingPluginBungeeCommand.java

@@ -33,12 +33,13 @@ public class VotingPluginBungeeCommand extends Command {
 						sender.sendMessage(new TextComponent(
 								"Checking status, waiting for response, check console, method: sockets"));
 						bungee.status(sender);
-					} else if (bungee.getMethod().equals(BungeeMethod.PLUGINMESSAGING)){
+					} else if (bungee.getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
 						sender.sendMessage(new TextComponent(
 								"Checking status, waiting for response, check console, method: plugin messaging"));
 						bungee.status(sender);
 					} else {
-						sender.sendMessage(new TextComponent("Not using socket/pluginmessage method, command unavailable"));
+						sender.sendMessage(
+								new TextComponent("Not using socket/pluginmessage method, command unavailable"));
 					}
 				}
 				if (args[0].equalsIgnoreCase("help")) {

VotingPlugin/src/com/bencodez/votingplugin/commands/CommandLoader.java

@@ -41,6 +41,7 @@ import com.bencodez.advancedcore.command.gui.UserGUI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.commands.executers.CommandAliases;
 import com.bencodez.votingplugin.commands.gui.AdminGUI;
+import com.bencodez.votingplugin.commands.gui.admin.AdminVoteBungeeSettings;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVoteHelp;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVotePerms;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVotePlaceholders;
@@ -125,8 +126,14 @@ public class CommandLoader {
 					new VoteURL(plugin, event.getWhoClicked(), user, true).open();
 				}
 			}
+
 		};
 
+		// set item to end of the GUI
+		if (sec != null && sec.getBoolean("EndOfGUI")) {
+			b.setSlot(-2);
+		}
+
 		if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
 			b.dontClose();
 		}
@@ -428,6 +435,15 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Edit", "BungeeSettings" },
+				"VotingPlugin.Commands.AdminVote.Edit.BungeeSettings", "Edit BungeeSettings.yml", false) {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				new AdminVoteBungeeSettings(plugin, sender).open(GUIMethod.CHEST);
+			}
+		});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Edit", "VoteShop" },
 				"VotingPlugin.Commands.AdminVote.Edit.VoteShop", "Edit VoteShop", false) {
 
@@ -444,7 +460,7 @@ public class CommandLoader {
 				new AdminVoteMilestones(plugin, sender).open(GUIMethod.CHEST);
 			}
 		});
-		
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Edit", "Cumulative" },
 				"VotingPlugin.Commands.AdminVote.Edit.Cumulative", "Edit cumulative rewards", false) {
 
@@ -453,7 +469,7 @@ public class CommandLoader {
 				new AdminVoteCumulative(plugin, sender).open(GUIMethod.CHEST);
 			}
 		});
-		
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Edit", "VoteParty" },
 				"VotingPlugin.Commands.AdminVote.Edit.VoteParty", "Edit voteparty", false) {
 
@@ -799,6 +815,31 @@ public class CommandLoader {
 					}
 				});
 
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Vote", "(player)", "All" },
+				"VotingPlugin.Commands.AdminVote.Vote|" + adminPerm, "Trigger manual vote") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				sendMessage(sender, "&cTriggering vote for all voting sites...");
+				for (VoteSite site : plugin.getVoteSites()) {
+					PlayerVoteEvent voteEvent = new PlayerVoteEvent(site, args[1], site.getServiceSite(), false);
+					if (voteEvent.getVoteSite() != null) {
+						if (!voteEvent.getVoteSite().isVaidServiceSite()) {
+							sendMessage(sender,
+									"&cPossible issue with service site, has the server gotten the vote from "
+											+ voteEvent.getServiceSite() + "?");
+						}
+					}
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
+				}
+
+				if (plugin.isYmlError()) {
+					sendMessage(sender, "&3Detected yml error, please check server log for details");
+				}
+
+			}
+		});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Vote", "(player)", "(Sitename)" },
 				"VotingPlugin.Commands.AdminVote.Vote|" + adminPerm, "Trigger manual vote") {
 
@@ -821,6 +862,40 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Vote" },
+				"VotingPlugin.Commands.AdminVote.Vote|" + adminPerm, "Manual vote syntax") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				sendMessage(sender, "&aUse /av vote (player) (site)");
+			}
+		});
+
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "User", "(Player)", "ForceVote", "All" },
+				"VotingPlugin.Commands.AdminVote.Vote|" + adminPerm, "Trigger manual vote") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				sendMessage(sender, "&cTriggering vote for all voting sites...");
+				for (VoteSite site : plugin.getVoteSites()) {
+					PlayerVoteEvent voteEvent = new PlayerVoteEvent(site, args[1], site.getServiceSite(), false);
+					if (voteEvent.getVoteSite() != null) {
+						if (!voteEvent.getVoteSite().isVaidServiceSite()) {
+							sendMessage(sender,
+									"&cPossible issue with service site, has the server gotten the vote from "
+											+ voteEvent.getServiceSite() + "?");
+						}
+					}
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
+				}
+
+				if (plugin.isYmlError()) {
+					sendMessage(sender, "&3Detected yml error, please check server log for details");
+				}
+
+			}
+		});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "User", "(Player)", "ForceVote", "(Sitename)" },
 						"VotingPlugin.Commands.AdminVote.Vote|" + adminPerm, "Trigger manual vote") {
@@ -1682,8 +1757,7 @@ public class CommandLoader {
 										placeholders.put("limit", "" + limit);
 										if (user.removePoints(points)) {
 
-											RewardHandler.getInstance().giveReward(user,
-													plugin.getConfigFile().getData(),
+											RewardHandler.getInstance().giveReward(user, plugin.getGui().getData(),
 													plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
 													new RewardOptions().setPlaceholders(placeholders));
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/AdminGUI.java

@@ -28,6 +28,7 @@ import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
 import com.bencodez.advancedcore.api.valuerequest.listeners.StringListener;
 import com.bencodez.advancedcore.command.gui.RewardEditGUI;
 import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.commands.gui.admin.AdminVoteBungeeSettings;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVoteVoteParty;
 import com.bencodez.votingplugin.commands.gui.admin.cumulative.AdminVoteCumulative;
 import com.bencodez.votingplugin.commands.gui.admin.milestones.AdminVoteMilestones;
@@ -121,7 +122,7 @@ public class AdminGUI {
 						RewardHandler.getInstance().getDirectlyDefined("AllSites"));
 			}
 		});
-		
+
 		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit AnySiteRewards")) {
 
 			@Override
@@ -130,7 +131,7 @@ public class AdminGUI {
 						RewardHandler.getInstance().getDirectlyDefined("AnySiteRewards"));
 			}
 		});
-		
+
 		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit EverySiteReward")) {
 
 			@Override
@@ -140,6 +141,14 @@ public class AdminGUI {
 			}
 		});
 
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.GRASS_BLOCK).setName("&cEdit BungeeSettings.yml")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteBungeeSettings(plugin, clickEvent.getPlayer()).open();
+			}
+		});
+
 		buttons.add(new BInventoryButton("&cReload Plugin", new String[] {}, new ItemStack(Material.BUCKET, 1)) {
 
 			@Override
@@ -276,7 +285,7 @@ public class AdminGUI {
 				plugin.reload();
 			}
 		}));
-		
+
 		inv.addButton(new EditGUIButton(new EditGUIValueNumber("VoteDelayMin", voteSite.getVoteDelay()) {
 
 			@Override

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVoteBungeeSettings.java

@@ -0,0 +1,138 @@
+package com.bencodez.votingplugin.commands.gui.admin;
+
+import java.util.ArrayList;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.editgui.EditGUI;
+import com.bencodez.advancedcore.api.inventory.editgui.EditGUIButton;
+import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueBoolean;
+import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+public class AdminVoteBungeeSettings extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteBungeeSettings(VotingPluginMain plugin, CommandSender player) {
+		super(player);
+		this.plugin = plugin;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	@Override
+	public void onChest(Player player) {
+		EditGUI inv = new EditGUI("Edit BungeeSettings");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.BungeeSettings");
+
+		inv.addButton(new EditGUIButton(
+				new EditGUIValueBoolean("UseBungeecord", plugin.getBungeeSettings().isUseBungeecoord()) {
+
+					@Override
+					public void setValue(Player player, boolean value) {
+						setPathData(getKey(), value);
+					}
+				}));
+
+		inv.addButton(
+				new EditGUIButton(new EditGUIValueString("BungeeMethod", plugin.getBungeeSettings().getBungeeMethod()) {
+
+					@Override
+					public void setValue(Player player, String value) {
+						setPathData(getKey(), value);
+					}
+				}).addOptions("PLUGINMESSAGING", "SOCKETS", "MYSQL"));
+
+		inv.addButton(
+				new EditGUIButton(new EditGUIValueBoolean("BungeeDebug", plugin.getBungeeSettings().isBungeeDebug()) {
+
+					@Override
+					public void setValue(Player player, boolean value) {
+						setPathData(getKey(), value);
+					}
+				}));
+
+		inv.addButton(new EditGUIButton(
+				new EditGUIValueBoolean("BungeeBroadcast", plugin.getBungeeSettings().isBungeeBroadcast()) {
+
+					@Override
+					public void setValue(Player player, boolean value) {
+						setPathData(getKey(), value);
+					}
+				}.addLore("Triggers a broadcast for the entire network, most cases it is best for this to be false")));
+
+		inv.addButton(new EditGUIButton(
+				new EditGUIValueBoolean("BungeeBroadcastAlways", plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
+
+					@Override
+					public void setValue(Player player, boolean value) {
+						setPathData(getKey(), value);
+					}
+				}.addLore("Whether or not to broadcast on cached votes").addLore("PLUGINMESSAGING ONLY")));
+
+		inv.addButton(new EditGUIButton(
+				new EditGUIValueBoolean("PerServerRewards", plugin.getBungeeSettings().isPerServerRewards()) {
+
+					@Override
+					public void setValue(Player player, boolean value) {
+						setPathData(getKey(), value);
+					}
+				}));
+
+		inv.addButton(new EditGUIButton(
+				new EditGUIValueBoolean("PerServerPoints", plugin.getBungeeSettings().isPerServerPoints()) {
+
+					@Override
+					public void setValue(Player player, boolean value) {
+						setPathData(getKey(), value);
+					}
+				}));
+
+		inv.addButton(new EditGUIButton(
+				new EditGUIValueBoolean("TriggerVotifierEvent", plugin.getBungeeSettings().isTriggerVotifierEvent()) {
+
+					@Override
+					public void setValue(Player player, boolean value) {
+						setPathData(getKey(), value);
+					}
+				}));
+
+		inv.addButton(new EditGUIButton(new EditGUIValueString("Server", plugin.getBungeeSettings().getServer()) {
+
+			@Override
+			public void setValue(Player player, String value) {
+				setPathData(getKey(), value);
+			}
+		}.addLore("Server name as stated in proxy")));
+
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+	private void setPathData(String path, Object value) {
+		plugin.getBungeeSettings().getData().set(path, value);
+		plugin.getBungeeSettings().saveData();
+		plugin.reload();
+	}
+
+}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVoteConfirmation.java

@@ -40,10 +40,6 @@ public abstract class AdminVoteConfirmation extends GUIHandler {
 
 	}
 
-	public abstract void onConfirm(Player p);
-
-	public abstract void onDeny(Player p);
-
 	@Override
 	public void onChest(Player player) {
 		BInventory inv = new BInventory(title);
@@ -64,6 +60,10 @@ public abstract class AdminVoteConfirmation extends GUIHandler {
 		inv.openInventory(player);
 	}
 
+	public abstract void onConfirm(Player p);
+
+	public abstract void onDeny(Player p);
+
 	@Override
 	public void open() {
 		open(GUIMethod.CHEST);

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVoteHelp.java

@@ -67,9 +67,7 @@ public class AdminVoteHelp extends GUIHandler {
 		boolean requirePerms = plugin.getConfigFile().getFormatCommandsVoteHelpRequirePermission();
 
 		for (CommandHandler cmdHandle : plugin.getAdminVoteCommand()) {
-			if (requirePerms && sender.hasPermission(cmdHandle.getPerm())) {
-				unsorted.put(cmdHandle.getHelpLineCommand("/adminvote"), cmdHandle.getHelpLine("/adminvote"));
-			} else {
+			if (!requirePerms || cmdHandle.hasPerm(sender)) {
 				unsorted.put(cmdHandle.getHelpLineCommand("/adminvote"), cmdHandle.getHelpLine("/adminvote"));
 			}
 		}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVoteVoteParty.java

@@ -46,12 +46,6 @@ public class AdminVoteVoteParty extends GUIHandler {
 
 	}
 
-	private void setPathData(String path, Object value) {
-		plugin.getSpecialRewardsConfig().getData().set("VoteParty." + path, value);
-		plugin.getSpecialRewardsConfig().saveData();
-		plugin.reload();
-	}
-
 	@Override
 	public void onChest(Player player) {
 		EditGUI inv = new EditGUI("Edit VoteParty");
@@ -121,6 +115,15 @@ public class AdminVoteVoteParty extends GUIHandler {
 			}
 		}));
 
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean(
+				"GiveOnlinePlayersOnly", plugin.getSpecialRewardsConfig().isVotePartyGiveOnlinePlayersOnly()) {
+
+			@Override
+			public void setValue(Player player, boolean name) {
+				setPathData(getKey(), name);
+			}
+		}));
+
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
 				new EditGUIValueBoolean("ResetEachDay", plugin.getSpecialRewardsConfig().getVotePartyResetEachDay()) {
 
@@ -223,4 +226,10 @@ public class AdminVoteVoteParty extends GUIHandler {
 		open(GUIMethod.CHEST);
 	}
 
+	private void setPathData(String path, Object value) {
+		plugin.getSpecialRewardsConfig().getData().set("VoteParty." + path, value);
+		plugin.getSpecialRewardsConfig().saveData();
+		plugin.reload();
+	}
+
 }

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/cumulative/AdminVoteCumulative.java

@@ -48,30 +48,34 @@ public class AdminVoteCumulative extends GUIHandler {
 	public void onChest(Player player) {
 		BInventory inv = new BInventory("Edit Cumulative");
 		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.Cumulative");
-		inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&cEdit existing cumulative rewards")) {
-
-			@Override
-			public void onClick(ClickEvent clickEvent) {
-				ArrayList<Integer> nums = new ArrayList<Integer>();
-				for (String num : plugin.getSpecialRewardsConfig().getCumulativeVotes()) {
-					if (StringParser.getInstance().isInt(num)) {
-						nums.add(Integer.parseInt(num));
-					}
-				}
-				Number[] options = new Number[nums.size()];
-				for (int i = 0; i < nums.size(); i++) {
-					options[i] = nums.get(i);
-				}
-				new ValueRequestBuilder(new NumberListener() {
+		inv.addButton(
+				new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&cEdit existing cumulative rewards")) {
 
 					@Override
-					public void onInput(Player player, Number value) {
-						RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-								RewardHandler.getInstance().getDirectlyDefined("Cumulative." + value.intValue() + ".Rewards"));
+					public void onClick(ClickEvent clickEvent) {
+						ArrayList<Integer> nums = new ArrayList<Integer>();
+						for (String num : plugin.getSpecialRewardsConfig().getCumulativeVotes()) {
+							if (StringParser.getInstance().isInt(num)) {
+								nums.add(Integer.parseInt(num));
+							}
+						}
+						Number[] options = new Number[nums.size()];
+						for (int i = 0; i < nums.size(); i++) {
+							options[i] = nums.get(i);
+						}
+						new ValueRequestBuilder(new NumberListener() {
+
+							@Override
+							public void onInput(Player player, Number value) {
+								RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+										RewardHandler.getInstance()
+												.getDirectlyDefined("Cumulative." + value.intValue() + ".Rewards"));
+							}
+						}, options).allowCustomOption(false).usingMethod(InputMethod.INVENTORY)
+								.request(clickEvent.getPlayer());
+						;
 					}
-				}, options).allowCustomOption(false).usingMethod(InputMethod.INVENTORY).request(clickEvent.getPlayer());;
-			}
-		});
+				});
 
 		inv.addButton(new BInventoryButton(new ItemBuilder(Material.EMERALD_BLOCK).setName("&aAdd cumulative reward")) {
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/cumulative/AdminVoteCumulativeRemove.java

@@ -50,18 +50,19 @@ public class AdminVoteCumulativeRemove extends GUIHandler {
 				public void onClick(ClickEvent clickEvent) {
 					new AdminVoteConfirmation(plugin, clickEvent.getPlayer(), "Remove cumulative " + votes + "?") {
 
-						@Override
-						public void onDeny(Player p) {
-							new AdminVoteCumulative(plugin, p);
-						}
-
 						@Override
 						public void onConfirm(Player p) {
 							plugin.getSpecialRewardsConfig().removeCumulative(votes);
 							p.sendMessage("Removed cumulative " + votes);
 							plugin.reload();
 						}
-					}.open();;
+
+						@Override
+						public void onDeny(Player p) {
+							new AdminVoteCumulative(plugin, p);
+						}
+					}.open();
+					;
 
 				}
 			});

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/milestones/AdminVoteMilestoneRemove.java

@@ -50,18 +50,19 @@ public class AdminVoteMilestoneRemove extends GUIHandler {
 				public void onClick(ClickEvent clickEvent) {
 					new AdminVoteConfirmation(plugin, clickEvent.getPlayer(), "Remove milestone " + votes + "?") {
 
-						@Override
-						public void onDeny(Player p) {
-							new AdminVoteMilestones(plugin, p);
-						}
-
 						@Override
 						public void onConfirm(Player p) {
 							plugin.getSpecialRewardsConfig().removeMilestone(votes);
 							p.sendMessage("Removed milestone " + votes);
 							plugin.reload();
 						}
-					}.open();;
+
+						@Override
+						public void onDeny(Player p) {
+							new AdminVoteMilestones(plugin, p);
+						}
+					}.open();
+					;
 
 				}
 			});

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/milestones/AdminVoteMilestones.java

@@ -71,7 +71,9 @@ public class AdminVoteMilestones extends GUIHandler {
 										RewardHandler.getInstance()
 												.getDirectlyDefined("MileStones." + value.intValue() + ".Rewards"));
 							}
-						}, options).allowCustomOption(false).usingMethod(InputMethod.INVENTORY).request(clickEvent.getPlayer());;
+						}, options).allowCustomOption(false).usingMethod(InputMethod.INVENTORY)
+								.request(clickEvent.getPlayer());
+						;
 					}
 				});
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/voteshop/AdminVoteVoteShopItem.java

@@ -9,8 +9,8 @@ import org.bukkit.entity.Player;
 
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
-import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.editgui.EditGUI;
 import com.bencodez.advancedcore.api.inventory.editgui.EditGUIButton;
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueList;
@@ -23,8 +23,8 @@ import com.bencodez.votingplugin.VotingPluginMain;
 
 public class AdminVoteVoteShopItem extends GUIHandler {
 
-	private VotingPluginMain plugin;
 	private String identifier;
+	private VotingPluginMain plugin;
 
 	public AdminVoteVoteShopItem(VotingPluginMain plugin, CommandSender player, String identifier) {
 		super(player);
@@ -46,12 +46,6 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 
 	}
 
-	private void setPathData(String path, Object value) {
-		plugin.getGui().getData().set("CHEST.Shop." + identifier + "." + path, value);
-		plugin.getGui().saveData();
-		plugin.reload();
-	}
-
 	@Override
 	public void onChest(Player player) {
 		EditGUI inv = new EditGUI("Edit VoteShop Item: " + identifier);
@@ -135,4 +129,10 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 		open(GUIMethod.CHEST);
 	}
 
+	private void setPathData(String path, Object value) {
+		plugin.getGui().getData().set("CHEST.Shop." + identifier + "." + path, value);
+		plugin.getGui().saveData();
+		plugin.reload();
+	}
+
 }

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/voteshop/AdminVoteVoteShopItemRemove.java

@@ -41,7 +41,7 @@ public class AdminVoteVoteShopItemRemove extends GUIHandler {
 	public void onChest(Player player) {
 		BInventory inv = new BInventory("Edit VoteShop Remove Item");
 		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");
-		
+
 		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
 			inv.addButton(
 					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier))
@@ -52,18 +52,19 @@ public class AdminVoteVoteShopItemRemove extends GUIHandler {
 							new AdminVoteConfirmation(plugin, clickEvent.getPlayer(),
 									"Remove shop item " + identifier + "?") {
 
-								@Override
-								public void onDeny(Player p) {
-									new AdminVoteVoteShop(plugin, p).open();
-								}
-
 								@Override
 								public void onConfirm(Player p) {
 									plugin.getGui().removeShop(identifier);
 									p.sendMessage("Removed " + identifier);
 									plugin.reload();
 								}
-							}.open();;
+
+								@Override
+								public void onDeny(Player p) {
+									new AdminVoteVoteShop(plugin, p).open();
+								}
+							}.open();
+							;
 
 						}
 					}.addData("ident", identifier));

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/voteshop/AdminVoteVoteShopItems.java

@@ -40,7 +40,7 @@ public class AdminVoteVoteShopItems extends GUIHandler {
 	public void onChest(Player player) {
 		BInventory inv = new BInventory("Edit VoteShop Items");
 		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");
-		
+
 		for (String identifier : plugin.getGui().getChestShopIdentifiers()) {
 			inv.addButton(
 					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier))) {

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteGUI.java

@@ -121,7 +121,7 @@ public class VoteGUI extends GUIHandler {
 	@Override
 	public void onChest(Player player) {
 		if (this.user == null) {
-			user = UserManager.getInstance().getVotingPluginUser((Player) player);
+			user = UserManager.getInstance().getVotingPluginUser(player);
 		}
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteGUIName());
 		if (!plugin.getConfigFile().isAlwaysCloseInventory()) {

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteHelp.java

@@ -38,11 +38,9 @@ public class VoteHelp extends GUIHandler {
 		boolean requirePerms = plugin.getConfigFile().getFormatCommandsVoteHelpRequirePermission();
 
 		for (CommandHandler cmdHandle : plugin.getVoteCommand()) {
-			if (requirePerms && sender.hasPermission(cmdHandle.getPerm())) {
+			if (!requirePerms || cmdHandle.hasPerm(sender)) {
 				unsorted.put(cmdHandle.getHelpLineCommand("/vote"),
 						cmdHandle.getHelpLine("/vote", plugin.getConfigFile().getFormatCommandsVoteHelpLine()));
-			} else {
-				unsorted.put(cmdHandle.getHelpLineCommand("/vote"), cmdHandle.getHelpLine("/vote"));
 			}
 		}
 		ArrayList<String> unsortedList = new ArrayList<String>();

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteLast.java

@@ -64,7 +64,7 @@ public class VoteLast extends GUIHandler {
 			if (!site.isHidden()) {
 				inv.addButton(inv.getNextSlot(),
 						new UpdatingBInventoryButton(site.getItem().setName(site.getDisplayName())
-								.setLore(user.voteCommandLastLine(site)).setAmountNone(1), 1000, 1000) {
+								.setLore(user.voteCommandLastGUILine(site)).setAmountNone(1), 1000, 1000) {
 
 							@Override
 							public void onClick(ClickEvent clickEvent) {
@@ -74,7 +74,7 @@ public class VoteLast extends GUIHandler {
 							@Override
 							public ItemBuilder onUpdate(Player p) {
 								return site.getItem().setName(site.getDisplayName())
-										.setLore(user.voteCommandLastLine(site)).setAmountNone(1);
+										.setLore(user.voteCommandLastGUILine(site)).setAmountNone(1);
 							}
 						});
 			}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteShop.java

@@ -119,7 +119,8 @@ public class VoteShop extends GUIHandler {
 													new RewardOptions().setPlaceholders(placeholders));
 
 											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
-													plugin.getGui().getCHESTVoteShopPurchase(identifier), placeholders));
+													plugin.getGui().getCHESTVoteShopPurchase(identifier),
+													placeholders));
 											if (limit > 0) {
 												user.setVoteShopIdentifierLimit(identifier,
 														user.getVoteShopIdentifierLimit(identifier) + 1);

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteToday.java

@@ -54,11 +54,11 @@ public class VoteToday extends GUIHandler {
 		HashMap<String, String> placeholders = new HashMap<String, String>();
 		placeholders.put("page", "" + page);
 		placeholders.put("maxpage", "" + maxPage);
-		
+
 		for (String m : plugin.getConfigFile().getFormatCommandsVoteTodayTitle()) {
 			msg.add(m);
 		}
-		
+
 		page--;
 
 		for (int i = pagesize * page; (i < voteToday.length) && (i < ((page + 1) * pagesize)); i++) {

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteURL.java

@@ -13,8 +13,8 @@ import com.bencodez.advancedcore.api.bookgui.Layout;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.inventory.BInventory;
-import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.MessageBuilder;
@@ -115,17 +115,17 @@ public class VoteURL extends GUIHandler {
 
 	private ItemBuilder getItemVoteSite(VoteSite voteSite) {
 		ItemBuilder builder = new ItemBuilder(plugin.getGui().getChestVoteURLAlreadyVotedItemSection());
-		
+
 		if (user.canVoteSite(voteSite)) {
 			builder = new ItemBuilder(plugin.getGui().getChestVoteURLCanVoteItemSection());
-			builder.setName(plugin.getGui().getChestVoteURLGUISiteNameCanVote().replace("%Name%", voteSite.getDisplayName()));
+			builder.setName(
+					plugin.getGui().getChestVoteURLGUISiteNameCanVote().replace("%Name%", voteSite.getDisplayName()));
 		} else {
 			builder.setName(plugin.getGui().getChestVoteURLGUISiteName().replace("%Name%", voteSite.getDisplayName()));
 			builder.addLoreLine(
 					plugin.getGui().getChestVoteURLNextVote().replace("%Info%", user.voteCommandNextInfo(voteSite)));
 		}
 
-		
 		return builder;
 	}
 

VotingPlugin/src/com/bencodez/votingplugin/config/BungeeSettings.java

@@ -25,10 +25,6 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private boolean bungeeDebug = false;
 
-	@ConfigDataBoolean(path = "VotifierBypass")
-	@Getter
-	private boolean votifierBypass = false;
-
 	@ConfigDataString(path = "BungeeMethod")
 	@Getter
 	private String bungeeMethod = "PLUGINMESSAGING";
@@ -41,14 +37,18 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private int bungeeServerPort = 1297;
 
-	@ConfigDataBoolean(path = "RemoveInvalidUsers")
+	@ConfigDataBoolean(path = "PerServerPoints")
 	@Getter
-	private boolean removeInvalidUsers = false;
+	private boolean perServerPoints = false;
 
 	@ConfigDataBoolean(path = "PerServerRewards")
 	@Getter
 	private boolean perServerRewards = false;
 
+	@ConfigDataBoolean(path = "RemoveInvalidUsers")
+	@Getter
+	private boolean removeInvalidUsers = false;
+
 	@ConfigDataString(path = "Server")
 	@Getter
 	private String server = "PleaseSet";
@@ -61,10 +61,18 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private int spigotServerPort = 1298;
 
+	@ConfigDataBoolean(path = "TriggerVotifierEvent")
+	@Getter
+	private boolean triggerVotifierEvent = false;
+
 	@ConfigDataBoolean(path = "UseBungeecord", secondPath = "UseBungeecoord")
 	@Getter
 	private boolean useBungeecoord = false;
 
+	@ConfigDataBoolean(path = "VotifierBypass")
+	@Getter
+	private boolean votifierBypass = false;
+
 	public BungeeSettings(VotingPluginMain plugin) {
 		super(plugin, new File(plugin.getDataFolder(), "BungeeSettings.yml"));
 	}

VotingPlugin/src/com/bencodez/votingplugin/config/Config.java

@@ -37,14 +37,6 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean allowUnjoined = false;
 
-	@ConfigDataBoolean(path = "UseVoteGUIMainCommand")
-	@Getter
-	private boolean useVoteGUIMainCommand = false;
-
-	@ConfigDataBoolean(path = "ExtraAllSitesCheck")
-	@Getter
-	private boolean extraAllSitesCheck = false;
-
 	@ConfigDataBoolean(path = "AllowUnJoinedCheckServer")
 	@Getter
 	private boolean allowUnJoinedCheckServer = true;
@@ -69,6 +61,10 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean alwaysUpdate = false;
 
+	@ConfigDataBoolean(path = "AlwaysWaitForCachePlaceholders")
+	@Getter
+	private boolean alwaysWaitForCachePlaceholders = false;
+
 	@ConfigDataBoolean(path = "AutoCreateVoteSites")
 	@Getter
 	private boolean autoCreateVoteSites = true;
@@ -105,10 +101,18 @@ public class Config extends YMLFile {
 	@Getter
 	private int delayBetweenUpdates = 3;
 
+	@ConfigDataInt(path = "DelayLoginEvent")
+	@Getter
+	private int delayLoginEvent = 0;
+
 	@ConfigDataBoolean(path = "DisableAdvancedTab")
 	@Getter
 	private boolean disableAdvancedTab = false;
 
+	@ConfigDataBoolean(path = "DisableCoolDownCheck")
+	@Getter
+	private boolean disableCoolDownCheck = false;
+
 	@ConfigDataListString(path = "DisabledCommands")
 	@Getter
 	private ArrayList<String> disabledCommands = new ArrayList<String>();
@@ -117,6 +121,10 @@ public class Config extends YMLFile {
 	@Getter
 	private ArrayList<String> disabledDefaultPermissions = new ArrayList<String>();
 
+	@ConfigDataBoolean(path = "DisableInteractEvent")
+	@Getter
+	private boolean disableInteractEvent = false;
+
 	@ConfigDataBoolean(path = "DisableNoServiceSiteMessage")
 	@Getter
 	private boolean disableNoServiceSiteMessage = false;
@@ -125,10 +133,26 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean disableUpdateChecking = false;
 
+	@ConfigDataBoolean(path = "ExtraAllSitesCheck")
+	@Getter
+	private boolean extraAllSitesCheck = false;
+
 	@ConfigDataBoolean(path = "ExtraBackgroundUpdate")
 	@Getter
 	private boolean extraBackgroundUpdate = false;
 
+	@ConfigDataString(path = "Format.AlternateBroadcast.Broadcast")
+	@Getter
+	private String formatAlternateBroadcastBroadcast = "&6[&4Broadcast&6] &2%numberofplayers% voted in the last half hour! /vote";
+
+	@ConfigDataInt(path = "Format.AlternateBroadcast.Delay")
+	@Getter
+	private int formatAlternateBroadcastDelay = 30;
+
+	@ConfigDataBoolean(path = "Format.AlternateBroadcast.Enabled")
+	@Getter
+	private boolean formatAlternateBroadcastEnabled = false;
+
 	@ConfigDataBoolean(path = "Format.Commands.Vote.ForceLinks")
 	@Getter
 	private boolean formatCommandsVoteForceLinks = true;
@@ -217,10 +241,6 @@ public class Config extends YMLFile {
 	@Getter
 	private int MaxiumNumberOfTopVotersToLoad = -1;
 
-	@ConfigDataInt(path = "DelayLoginEvent")
-	@Getter
-	private int delayLoginEvent = 0;
-
 	@ConfigDataBoolean(path = "OverrideVersionDisable")
 	@Getter
 	private boolean overrideVersionDisable = false;
@@ -233,6 +253,10 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean updateWithPlayersOnlineOnly = false;
 
+	@ConfigDataBoolean(path = "UseHighestTotals")
+	@Getter
+	private boolean useHighestTotals = true;
+
 	@ConfigDataBoolean(path = "UseJavascriptPlaceholders")
 	@Getter
 	private boolean useJavascriptPlaceholders = false;
@@ -241,9 +265,13 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean usePrimaryAccountForPlaceholders = false;
 
-	@ConfigDataBoolean(path = "DisableCoolDownCheck")
+	@ConfigDataBoolean(path = "UseVoteGUIMainCommand")
 	@Getter
-	private boolean disableCoolDownCheck = false;
+	private boolean useVoteGUIMainCommand = false;
+
+	@ConfigDataBoolean(path = "UseVoteStreaks")
+	@Getter
+	private boolean useVoteStreaks = true;
 
 	@ConfigDataListString(path = "VotingBroadcastBlacklist")
 	@Getter
@@ -661,14 +689,6 @@ public class Config extends YMLFile {
 		return getData().getBoolean("LoadTopVoter.AllTime", true);
 	}
 
-	@ConfigDataBoolean(path = "UseVoteStreaks")
-	@Getter
-	private boolean useVoteStreaks = true;
-
-	@ConfigDataBoolean(path = "UseHighestTotals")
-	@Getter
-	private boolean useHighestTotals = true;
-
 	public boolean getLoadTopVoterDaily() {
 		return getData().getBoolean("LoadTopVoter.Daily", false);
 	}

VotingPlugin/src/com/bencodez/votingplugin/config/ConfigVoteSites.java

@@ -144,10 +144,6 @@ public class ConfigVoteSites extends YMLFile {
 	public boolean getVoteSiteEnabled(String siteName) {
 		return getData(siteName).getBoolean("Enabled");
 	}
-	
-	public boolean getVoteSiteHidden(String siteName) {
-		return getData(siteName).getBoolean("Hidden");
-	}
 
 	/**
 	 * Gets the vote site file.
@@ -174,6 +170,14 @@ public class ConfigVoteSites extends YMLFile {
 		return getData(site).getBoolean("ForceOffline", getData(site).getBoolean("GiveOffline"));
 	}
 
+	public boolean getVoteSiteHidden(String siteName) {
+		return getData(siteName).getBoolean("Hidden");
+	}
+
+	public boolean getVoteSiteIgnoreCanVote(String siteName) {
+		return getData(siteName).getBoolean("IgnoreCanVote");
+	}
+
 	public boolean getVoteSiteResetVoteDelayDaily(String siteName) {
 		return getData(siteName).getBoolean("VoteDelayDaily");
 	}

VotingPlugin/src/com/bencodez/votingplugin/config/GUI.java

@@ -144,16 +144,27 @@ public class GUI extends YMLFile {
 
 	private VotingPluginMain plugin;
 
-	public String getCHESTVoteShopPurchase(String identifier) {
-		return getData().getString("CHEST.Shop." + identifier + ".PurchaseMessage",
-				plugin.getConfigFile().getFormatShopPurchaseMsg());
-	}
-
 	public GUI(VotingPluginMain plugin) {
 		super(plugin, new File(plugin.getDataFolder(), "GUI.yml"));
 		this.plugin = plugin;
 	}
 
+	public void createShop(String value) {
+		ConfigurationSection shopData = getData().createSection("CHEST.Shop." + value);
+		shopData.set("Identifier_Name", value);
+		shopData.set("Material", "STONE");
+		shopData.set("Amount", 1);
+		shopData.set("Name", "&cPlaceholder item");
+		shopData.set("Cost", 1);
+		shopData.set("Permission", "");
+		shopData.set("CloseGUI", true);
+		shopData.set("RequireConfirmation", false);
+
+		shopData.set("Rewards.Items.Item1.Material", "STONE");
+		shopData.set("Rewards.Items.Item1.Amount", 1);
+		saveData();
+	}
+
 	public ConfigurationSection getCHESTBackButton() {
 		return getData().getConfigurationSection("CHEST.BackButton");
 	}
@@ -218,10 +229,6 @@ public class GUI extends YMLFile {
 		return getData().getString("CHEST.VoteGUI." + slot + ".Command", "");
 	}
 
-	public String getChestVoteGUISlotRewardsPath(String slot) {
-		return "CHEST.VoteGUI." + slot + ".Rewards";
-	}
-
 	/**
 	 * Gets the vote GUI slot lore.
 	 *
@@ -233,6 +240,10 @@ public class GUI extends YMLFile {
 		return (ArrayList<String>) getData().getList("CHEST.VoteGUI." + slot + ".Item.Lore", new ArrayList<String>());
 	}
 
+	public String getChestVoteGUISlotRewardsPath(String slot) {
+		return "CHEST.VoteGUI." + slot + ".Rewards";
+	}
+
 	/**
 	 * Gets the vote GUI slots.
 	 *
@@ -264,6 +275,10 @@ public class GUI extends YMLFile {
 		return getData().getBoolean("CHEST.VoteLast.BackButton");
 	}
 
+	public String getChestVoteLastLine() {
+		return getData().getString("CHEST.VoteLast.Line", "&6%timeSince%");
+	}
+
 	public String getChestVoteLastName() {
 		return getData().getString("CHEST.VoteLast.Name", "VoteLast: %player%");
 	}
@@ -304,6 +319,11 @@ public class GUI extends YMLFile {
 		return getData().getString("CHEST.Shop." + ident + ".Permission", "");
 	}
 
+	public String getCHESTVoteShopPurchase(String identifier) {
+		return getData().getString("CHEST.Shop." + identifier + ".PurchaseMessage",
+				plugin.getConfigFile().getFormatShopPurchaseMsg());
+	}
+
 	public boolean getChestVoteShopResetDaily(String shop) {
 		return getData().getBoolean("CHEST.Shop." + shop + ".Reset.Daily", false);
 	}
@@ -357,7 +377,7 @@ public class GUI extends YMLFile {
 	}
 
 	public boolean getChestVoteTopBackButton() {
-		return getData().getBoolean("CHEST.VoteToday.BackButton");
+		return getData().getBoolean("CHEST.VoteTop.BackButton");
 	}
 
 	public String getChestVoteTopItemLore() {
@@ -368,14 +388,14 @@ public class GUI extends YMLFile {
 		return getData().getString("CHEST.VoteTop.Item.Name", "&3&l%position%: &3%player%");
 	}
 
-	public boolean getChestVoteTopOpenMainGUIOnClick() {
-		return getData().getBoolean("CHEST.VoteTop.OpenMainGUIOnClick", true);
-	}
-
 	public String getChestVoteTopName() {
 		return getData().getString("CHEST.VoteTop.Name", "VoteTop %topvoter%");
 	}
 
+	public boolean getChestVoteTopOpenMainGUIOnClick() {
+		return getData().getBoolean("CHEST.VoteTop.OpenMainGUIOnClick", true);
+	}
+
 	public int getChestVoteTopSize() {
 		return getData().getInt("CHEST.VoteTop.Size", 27);
 	}
@@ -424,6 +444,14 @@ public class GUI extends YMLFile {
 		return getData().getConfigurationSection("CHEST.VoteTotal.WeekTotal.Item");
 	}
 
+	public int getChestVoteURLAllUrlsButtonSlot() {
+		return getData().getInt("CHEST.VoteURL.AllUrlsButton.Slot", -1);
+	}
+
+	public int getChestVoteURLAllUrlsButtonStartSlot() {
+		return getData().getInt("CHEST.VoteURL.StartSlot", -1);
+	}
+
 	public ConfigurationSection getChestVoteURLAlreadyVotedAllUrlsButtonItemSection() {
 		if (getData().isConfigurationSection("CHEST.VoteURL.AllUrlsButton.AlreadyVotedItem")) {
 			return getData().getConfigurationSection("CHEST.VoteURL.AllUrlsButton.AlreadyVotedItem");
@@ -436,25 +464,6 @@ public class GUI extends YMLFile {
 		return getData().getConfigurationSection("CHEST.VoteURL.AlreadyVotedItem");
 	}
 
-	public int getChestVoteURLAllUrlsButtonSlot() {
-		return getData().getInt("CHEST.VoteURL.AllUrlsButton.Slot", -1);
-	}
-
-	public int getChestVoteURLAllUrlsButtonStartSlot() {
-		return getData().getInt("CHEST.VoteURL.StartSlot", -1);
-	}
-
-	public Set<String> getChestVoteURLExtraItems() {
-		if (getData().isConfigurationSection("CHEST.VoteURL.ExtraItems")) {
-			return getData().getConfigurationSection("CHEST.VoteURL.ExtraItems").getKeys(false);
-		}
-		return new HashSet<String>();
-	}
-
-	public ConfigurationSection getChestVoteURLExtraItemsItem(String item) {
-		return getData().getConfigurationSection("CHEST.VoteURL.ExtraItems." + item);
-	}
-
 	public boolean getChestVoteURLBackButton() {
 		return getData().getBoolean("CHEST.VoteURL.BackButton");
 	}
@@ -471,6 +480,17 @@ public class GUI extends YMLFile {
 		return getData().getConfigurationSection("CHEST.VoteURL.CanVoteItem");
 	}
 
+	public Set<String> getChestVoteURLExtraItems() {
+		if (getData().isConfigurationSection("CHEST.VoteURL.ExtraItems")) {
+			return getData().getConfigurationSection("CHEST.VoteURL.ExtraItems").getKeys(false);
+		}
+		return new HashSet<String>();
+	}
+
+	public ConfigurationSection getChestVoteURLExtraItemsItem(String item) {
+		return getData().getConfigurationSection("CHEST.VoteURL.ExtraItems." + item);
+	}
+
 	/**
 	 * Gets the vote URL site name.
 	 *
@@ -524,6 +544,11 @@ public class GUI extends YMLFile {
 		return getData().getBoolean("CHEST.VoteURL.ViewAllUrlsButtonEnabled");
 	}
 
+	public boolean isChestVoteShopRequireConfirmation(String identifier) {
+		return getData().getBoolean("CHEST.Shop." + identifier + ".RequireConfirmation",
+				isChestVoteShopRequireConfirmation());
+	}
+
 	@Override
 	public void loadValues() {
 		new AnnotationHandler().load(getData(), this);
@@ -534,27 +559,6 @@ public class GUI extends YMLFile {
 		plugin.saveResource("GUI.yml", true);
 	}
 
-	public boolean isChestVoteShopRequireConfirmation(String identifier) {
-		return getData().getBoolean("CHEST.Shop." + identifier + ".RequireConfirmation",
-				isChestVoteShopRequireConfirmation());
-	}
-
-	public void createShop(String value) {
-		ConfigurationSection shopData = getData().createSection("CHEST.Shop." + value);
-		shopData.set("Identifier_Name", value);
-		shopData.set("Material", "STONE");
-		shopData.set("Amount", 1);
-		shopData.set("Name", "&cPlaceholder item");
-		shopData.set("Cost", 1);
-		shopData.set("Permission", "");
-		shopData.set("CloseGUI", true);
-		shopData.set("RequireConfirmation", false);
-
-		shopData.set("Rewards.Items.Item1.Material", "STONE");
-		shopData.set("Rewards.Items.Item1.Amount", 1);
-		saveData();
-	}
-
 	public void removeShop(String value) {
 		getData().set("CHEST.Shop." + value, null);
 		saveData();

VotingPlugin/src/com/bencodez/votingplugin/config/SpecialRewardsConfig.java

@@ -10,6 +10,7 @@ import com.bencodez.advancedcore.api.yml.annotation.AnnotationHandler;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataBoolean;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataDouble;
 import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.topvoter.TopVoter;
 
 import lombok.Getter;
 
@@ -39,14 +40,18 @@ public class SpecialRewardsConfig extends YMLFile {
 	/** The plugin. */
 	private VotingPluginMain plugin;
 
-	@ConfigDataBoolean(path = "VoteParty.ResetExtraVotesMonthly")
+	@ConfigDataBoolean(path = "VoteParty.GiveOnlinePlayersOnly")
 	@Getter
-	private boolean votePartyResetExtraVotesMonthly = false;
+	private boolean votePartyGiveOnlinePlayersOnly = false;
 
 	@ConfigDataBoolean(path = "VoteParty.ResetCount")
 	@Getter
 	private boolean votePartyResetCount = true;
 
+	@ConfigDataBoolean(path = "VoteParty.ResetExtraVotesMonthly")
+	@Getter
+	private boolean votePartyResetExtraVotesMonthly = false;
+
 	@Getter
 	private String votePartyRewardsPath = "VoteParty.Rewards";
 
@@ -102,18 +107,35 @@ public class SpecialRewardsConfig extends YMLFile {
 	 * @param cumulative the cumulative
 	 * @return the cumulative votes in same day
 	 */
+	@Deprecated
 	public boolean getCumulativeVotesInSameDay(int cumulative) {
 		return getData().getBoolean("Cumulative." + cumulative + ".VotesInSameDay");
 	}
 
+	@Deprecated
 	public boolean getCumulativeVotesInSameMonth(int cumulative) {
 		return getData().getBoolean("Cumulative." + cumulative + ".VotesInSameMonth");
 	}
 
+	@Deprecated
 	public boolean getCumulativeVotesInSameWeek(int cumulative) {
 		return getData().getBoolean("Cumulative." + cumulative + ".VotesInSameWeek");
 	}
 
+	public String getCumulativeVotesTotal(int cumulative) {
+		String str = getData().getString("Cumulative." + cumulative + ".TotalToUse", "");
+		if (str.isEmpty()) {
+			if (getCumulativeVotesInSameMonth(cumulative)) {
+				return TopVoter.Monthly.toString();
+			} else if (getCumulativeVotesInSameWeek(cumulative)) {
+				return TopVoter.Weekly.toString();
+			} else if (getCumulativeVotesInSameDay(cumulative)) {
+				return TopVoter.Daily.toString();
+			}
+		}
+		return TopVoter.AllTime.toString();
+	}
+
 	public String getDailyAwardRewardsPath(String path) {
 		return "DailyAwards." + path + ".Rewards";
 	}
@@ -229,14 +251,14 @@ public class SpecialRewardsConfig extends YMLFile {
 		return getData().getInt("VoteParty.IncreaseVotesRquired", 0);
 	}
 
-	public boolean getVotePartyResetEachDay() {
-		return getData().getBoolean("VoteParty.ResetEachDay");
-	}
-
 	public boolean getVotePartyOnlyOncePerDay() {
 		return getData().getBoolean("VoteParty.OnlyOncePerDay");
 	}
 
+	public boolean getVotePartyResetEachDay() {
+		return getData().getBoolean("VoteParty.ResetEachDay");
+	}
+
 	public boolean getVotePartyResetMontly() {
 		return getData().getBoolean("VoteParty.ResetMonthly");
 	}
@@ -305,9 +327,8 @@ public class SpecialRewardsConfig extends YMLFile {
 		plugin.saveResource("SpecialRewards.yml", true);
 	}
 
-	public void setMilestone(int intValue) {
-		getData().set("Milestones." + intValue + ".Enabled", true);
-		getData().set("Milestones." + intValue + ".Rewards.Messages.Player", "&aYou got %milestone% milestone votes!");
+	public void removeCumulative(String votes) {
+		getData().set("Cumulative." + votes, null);
 		saveData();
 	}
 
@@ -316,14 +337,17 @@ public class SpecialRewardsConfig extends YMLFile {
 		saveData();
 	}
 
-	public void removeCumulative(String votes) {
-		getData().set("Cumulative." + votes, null);
+	public void setCumulative(int intValue) {
+		getData().set("Cumulative." + intValue + ".Enabled", true);
+		getData().set("Cumulative." + intValue + ".TotalToUse", "AllTime");
+		getData().set("Cumulative." + intValue + ".Rewards.Messages.Player",
+				"&aYou got %cumulative% cumulative votes!");
 		saveData();
 	}
 
-	public void setCumulative(int intValue) {
-		getData().set("Cumulative." + intValue + ".Enabled", true);
-		getData().set("Cumulative." + intValue + ".Rewards.Messages.Player", "&aYou got %cumulative% cumulative votes!");
+	public void setMilestone(int intValue) {
+		getData().set("Milestones." + intValue + ".Enabled", true);
+		getData().set("Milestones." + intValue + ".Rewards.Messages.Player", "&aYou got %milestone% milestone votes!");
 		saveData();
 	}
 }

VotingPlugin/src/com/bencodez/votingplugin/cooldown/CoolDownCheck.java

@@ -32,10 +32,6 @@ public class CoolDownCheck implements Listener {
 		this.plugin = plugin;
 	}
 
-	public void load() {
-		checkAll();
-	}
-
 	public void checkAll() {
 		if (!plugin.getConfigFile().isDisableCoolDownCheck() && RewardHandler.getInstance()
 				.hasRewards(plugin.getSpecialRewardsConfig().getData(), "VoteCoolDownEndedReward")) {
@@ -72,6 +68,10 @@ public class CoolDownCheck implements Listener {
 
 	}
 
+	public void load() {
+		checkAll();
+	}
+
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onCoolDownEnd(PlayerVoteCoolDownEndEvent event) {
 		RewardHandler.getInstance().giveReward(event.getPlayer(), plugin.getSpecialRewardsConfig().getData(),

VotingPlugin/src/com/bencodez/votingplugin/data/ServerData.java

@@ -137,6 +137,14 @@ public class ServerData {
 		return getData().getInt("VotePartyExtraRequired", 0);
 	}
 
+	public boolean isLastVotePartySameDay() {
+		int num = getData().getInt("LastVoteParty", 0);
+		if (num != plugin.getTimeChecker().getTime().getDayOfYear()) {
+			return true;
+		}
+		return false;
+	}
+
 	/**
 	 * Next sign number.
 	 *
@@ -233,23 +241,15 @@ public class ServerData {
 		saveData();
 	}
 
+	public void updateLastVoteParty() {
+		getData().set("LastVoteParty", plugin.getTimeChecker().getTime().getDayOfYear());
+		saveData();
+	}
+
 	/**
 	 * Update values.
 	 */
 	public void updateValues() {
 		setVersion();
 	}
-
-	public boolean isLastVotePartySameDay() {
-		int num = getData().getInt("LastVoteParty", 0);
-		if (num != plugin.getTimeChecker().getTime().getDayOfYear()) {
-			return true;
-		}
-		return false;
-	}
-
-	public void updateLastVoteParty() {
-		getData().set("LastVoteParty", plugin.getTimeChecker().getTime().getDayOfYear());
-		saveData();
-	}
 }

VotingPlugin/src/com/bencodez/votingplugin/events/PlayerVoteEvent.java

@@ -71,7 +71,7 @@ public class PlayerVoteEvent extends Event {
 	@Getter
 	@Setter
 	private VotingPluginUser votingPluginUser;
-	
+
 	@Getter
 	@Setter
 	private boolean wasOnline;

VotingPlugin/src/com/bencodez/votingplugin/listeners/BungeeVotifierEvent.java

@@ -0,0 +1,15 @@
+package com.bencodez.votingplugin.listeners;
+
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.events.PlayerVoteEvent;
+import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.model.VotifierEvent;
+
+public class BungeeVotifierEvent {
+	public void send(VotingPluginMain plugin, PlayerVoteEvent event) {
+		plugin.debug("Triggering vote event");
+		VotifierEvent e = new VotifierEvent(
+				new Vote(event.getServiceSite(), event.getPlayer(), "VotingPlugin", "" + event.getTime()));
+		plugin.getServer().getPluginManager().callEvent(e);
+	}
+}

VotingPlugin/src/com/bencodez/votingplugin/listeners/PlayerCommandSendListener.java

@@ -1,53 +0,0 @@
-package com.bencodez.votingplugin.listeners;
-
-import java.util.ArrayList;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerCommandSendEvent;
-
-import com.bencodez.votingplugin.VotingPluginMain;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class PlayerJoinEvent.
- */
-@Deprecated
-public class PlayerCommandSendListener implements Listener {
-
-	@SuppressWarnings("unused")
-	private VotingPluginMain plugin;
-
-	public PlayerCommandSendListener(VotingPluginMain plugin) {
-		this.plugin = plugin;
-	}
-
-	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-	public void onTab(PlayerCommandSendEvent event) {
-		if (plugin.getConfigFile().isDisableAdvancedTab()) {
-			return;
-		}
-		ArrayList<String> removeCmds = new ArrayList<String>();
-		if (!VotingPluginMain.plugin.getAdvancedTab().containsKey(event.getPlayer().getUniqueId())) {
-			ArrayList<String> whiteListed = new ArrayList<String>();
-			for (String cmd : event.getCommands()) {
-				if (plugin.getCommandLoader().isVotingPluginCommand(event.getPlayer(), cmd)) {
-					if (!plugin.getCommandLoader().hasPermission(event.getPlayer(), cmd)
-							&& !whiteListed.contains(cmd)) {
-						removeCmds.add(cmd);
-						// plugin.debug("removed " + cmd);
-					} else {
-						removeCmds.remove(cmd);
-						whiteListed.add(cmd);
-						// plugin.debug("has " + cmd);
-					}
-				}
-			}
-			VotingPluginMain.plugin.getAdvancedTab().put(event.getPlayer().getUniqueId(), removeCmds);
-		} else {
-			removeCmds = VotingPluginMain.plugin.getAdvancedTab().get(event.getPlayer().getUniqueId());
-		}
-		event.getCommands().removeAll(removeCmds);
-	}
-}

VotingPlugin/src/com/bencodez/votingplugin/listeners/PlayerInteract.java

@@ -39,44 +39,51 @@ public class PlayerInteract implements Listener {
 	 */
 	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void onPlayerInteract(PlayerInteractEvent event) {
-		Player player = event.getPlayer();
-		if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-			// plugin.debug("Checking for sign click");
-			if (event.getClickedBlock().getState() instanceof Sign) {
-				// plugin.debug(player.getName() + " right clicked a sign");
-				for (SignHandler sign : plugin.getSigns().getSigns()) {
-					if (sign.isLocationSame(event.getClickedBlock().getLocation())) {
-						// plugin.debug(player.getName() +
-						// " right clicked a top voter sign, sending message");
-						UserManager.getInstance().getVotingPluginUser(player).sendMessage(sign.getRightClickMessage());
+		if (plugin.getConfigFile().isDisableInteractEvent()) {
+			return;
+		}
+		if (plugin.getSigns().getSigns().size() > 0) {
+			Player player = event.getPlayer();
+			if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+				// plugin.debug("Checking for sign click");
+				if (event.getClickedBlock().getState() instanceof Sign) {
+					// plugin.debug(player.getName() + " right clicked a sign");
+					for (SignHandler sign : plugin.getSigns().getSigns()) {
+						if (sign.isLocationSame(event.getClickedBlock().getLocation())) {
+							// plugin.debug(player.getName() +
+							// " right clicked a top voter sign, sending message");
+							UserManager.getInstance().getVotingPluginUser(player)
+									.sendMessage(sign.getRightClickMessage());
 
-						if (!sign.isSkullSet()) {
-							if (PlayerUtils.getInstance().hasServerPermission(event.getPlayer().getName(),
-									"VotingPlugin.Sign.Create")
-									|| PlayerUtils.getInstance().hasServerPermission(event.getPlayer().getName(),
-											"VotingPlugin.Admin")) {
-								player.sendMessage("Skull not set, click to set skull");
-								PlayerUtils.getInstance().setPlayerMeta(player, "skullset", sign.getSign());
+							if (!sign.isSkullSet()) {
+								if (PlayerUtils.getInstance().hasServerPermission(event.getPlayer().getName(),
+										"VotingPlugin.Sign.Create")
+										|| PlayerUtils.getInstance().hasServerPermission(event.getPlayer().getName(),
+												"VotingPlugin.Admin")) {
+									player.sendMessage("Skull not set, click to set skull");
+									PlayerUtils.getInstance().setPlayerMeta(player, "skullset", sign.getSign());
+								}
 							}
 						}
 					}
-				}
 
-			} else if (event.getClickedBlock().getState() instanceof Skull) {
-				Object ob = PlayerUtils.getInstance().getPlayerMeta(player, "skullset");
-				if (ob != null) {
-					String sign1 = (String) ob;
-					for (SignHandler sign : plugin.getSigns().getSigns()) {
-						if (sign.getSign().equals(sign1)) {
-							sign.setSkullLocation(event.getClickedBlock().getLocation());
-							sign.storeSign();
-							sign.checkSkulls();
-							player.sendMessage("Skull set");
+				} else if (event.getClickedBlock().getState() instanceof Skull) {
+					Object ob = PlayerUtils.getInstance().getPlayerMeta(player, "skullset");
+					if (ob != null) {
+						String sign1 = (String) ob;
+						for (SignHandler sign : plugin.getSigns().getSigns()) {
+							if (sign.getSign().equals(sign1)) {
+								sign.setSkullLocation(event.getClickedBlock().getLocation());
+								sign.storeSign();
+								sign.checkSkulls();
+								player.sendMessage("Skull set");
+							}
 						}
+						PlayerUtils.getInstance().setPlayerMeta(player, "skullset", null);
 					}
-					PlayerUtils.getInstance().setPlayerMeta(player, "skullset", null);
 				}
 			}
+
 		}
 	}
 }

VotingPlugin/src/com/bencodez/votingplugin/listeners/PlayerJoinEvent.java

@@ -31,6 +31,24 @@ public class PlayerJoinEvent implements Listener {
 		PlayerJoinEvent.plugin = plugin;
 	}
 
+	private void login(Player player) {
+		VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
+		if (player.isOp() && plugin.isYmlError()) {
+			user.sendMessage("&cVotingPlugin: Detected yml error, please check console for details");
+		}
+
+		boolean data = user.getData().hasData();
+		// run remind
+		user.loginMessage();
+
+		if (data) {
+			// give offline vote (if they voted offline)
+			user.offVote();
+		}
+
+		user.loginRewards();
+	}
+
 	/**
 	 * On player login.
 	 *
@@ -58,24 +76,6 @@ public class PlayerJoinEvent implements Listener {
 
 	}
 
-	private void login(Player player) {
-		VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-		if (player.isOp() && plugin.isYmlError()) {
-			user.sendMessage("&cVotingPlugin: Detected yml error, please check console for details");
-		}
-
-		boolean data = user.getData().hasData();
-		// run remind
-		user.loginMessage();
-
-		if (data) {
-			// give offline vote (if they voted offline)
-			user.offVote();
-		}
-
-		user.loginRewards();
-	}
-
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onPlayerQuit(PlayerQuitEvent event) {
 		if (plugin.getConfigFile().isDisableAdvancedTab()) {

VotingPlugin/src/com/bencodez/votingplugin/listeners/PlayerVoteListener.java

@@ -64,6 +64,10 @@ public class PlayerVoteListener implements Listener {
 		if (event.isBungee()) {
 			plugin.debug("BungeePlayerVote forcebungee: " + event.isForceBungee() + ", bungeetotals: "
 					+ event.getBungeeTextTotals());
+
+			if (plugin.getBungeeSettings().isTriggerVotifierEvent()) {
+				new BungeeVotifierEvent().send(plugin, event);
+			}
 		}
 
 		VoteSite voteSite = event.getVoteSite();
@@ -113,6 +117,10 @@ public class PlayerVoteListener implements Listener {
 				}
 			}
 
+			if (plugin.getBroadcastHandler() != null) {
+				plugin.getBroadcastHandler().onVote(playerName);
+			}
+
 			// update last vote time
 			if (event.getTime() != 0) {
 				user.setTime(voteSite, event.getTime());

VotingPlugin/src/com/bencodez/votingplugin/listeners/VotiferEvent.java

@@ -44,6 +44,10 @@ public class VotiferEvent implements Listener {
 		final String voteSite = vote.getServiceName();
 		final String IP = vote.getAddress();
 		final String voteUsername = vote.getUsername().trim();
+		if (IP.equals("VotingPlugin")) {
+			// ignore own plugin calls of event
+			return;
+		}
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 			@Override
@@ -92,9 +96,9 @@ public class VotiferEvent implements Listener {
 					plugin.getLogger().warning("VoteSite with service site '" + voteSiteName
 							+ "' does not exist, attempting to generaterate...");
 					plugin.getConfigVoteSites().generateVoteSite(voteSiteName);
-					
-					plugin.getLogger()
-							.info("Current known service sites: " + ArrayUtils.getInstance().makeStringList(plugin.getServerData().getServiceSites()));
+
+					plugin.getLogger().info("Current known service sites: "
+							+ ArrayUtils.getInstance().makeStringList(plugin.getServerData().getServiceSites()));
 				}
 
 				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName), voteUsername,

VotingPlugin/src/com/bencodez/votingplugin/objects/VoteSite.java

@@ -36,13 +36,17 @@ public class VoteSite {
 	@Setter
 	private boolean enabled;
 
+	@Getter
+	@Setter
+	private boolean giveOffline;
+
 	@Getter
 	@Setter
 	private boolean hidden;
 
 	@Getter
 	@Setter
-	private boolean giveOffline;
+	private boolean ignoreCanVote;
 
 	@Setter
 	private ConfigurationSection item;
@@ -101,6 +105,9 @@ public class VoteSite {
 	 * @param checkBungee check bungee broadcast
 	 */
 	public void broadcastVote(VotingPluginUser user, boolean checkBungee) {
+		if (plugin.getConfigFile().isFormatAlternateBroadcastEnabled()) {
+			return;
+		}
 		if (!user.isVanished()) {
 			if (checkBungee && plugin.getBungeeSettings().isBungeeBroadcast()
 					&& plugin.getBungeeSettings().isUseBungeecoord()) {
@@ -228,6 +235,7 @@ public class VoteSite {
 		waitUntilVoteDelay = plugin.getConfigVoteSites().getWaitUntilVoteDelay(key);
 		timeOffSet = plugin.getConfigVoteSites().getTimeOffSet(key);
 		hidden = plugin.getConfigVoteSites().getVoteSiteHidden(key);
+		ignoreCanVote = plugin.getConfigVoteSites().getVoteSiteIgnoreCanVote(key);
 	}
 
 	public boolean isVaidServiceSite() {

VotingPlugin/src/com/bencodez/votingplugin/placeholders/PlaceHolders.java

@@ -1,6 +1,8 @@
 package com.bencodez.votingplugin.placeholders;
 
 import java.text.NumberFormat;
+import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Locale;
@@ -50,14 +52,11 @@ public class PlaceHolders {
 		}
 
 		VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(p);
-		if (Bukkit.isPrimaryThread()) {
+		if (Bukkit.isPrimaryThread() || plugin.getConfigFile().isAlwaysWaitForCachePlaceholders()) {
 			user.setWaitForCache(false);
 		}
 		if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
 			user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
-			if (Bukkit.isPrimaryThread()) {
-				user.setWaitForCache(false);
-			}
 		}
 
 		for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
@@ -569,5 +568,43 @@ public class PlaceHolders {
 				return Integer.toString(total);
 			}
 		}.withDescription("Global daily total"));
+
+		nonPlayerPlaceholders.add(new PlaceHolder<VotingPluginUser>("TimeUntilDayReset") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, VotingPluginUser user, String identifier) {
+				LocalDateTime now = LocalDateTime.now();
+				LocalDateTime offsetoclocktoday = plugin.getTimeChecker().getTime().withHour(0).withMinute(0);
+				LocalDateTime offsetoclocktomorrow = plugin.getTimeChecker().getTime().plusDays(1).withHour(0)
+						.withMinute(0);
+
+				String timeMsg = "%hours% Hours %minutes% Minutes";
+				Duration dur = null;
+				if (!now.isBefore(offsetoclocktoday)) {
+					dur = Duration.between(now, offsetoclocktomorrow);
+
+				} else {
+					dur = Duration.between(now, offsetoclocktoday);
+				}
+				int diffHours = (int) (dur.getSeconds() / (60 * 60));
+				long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;
+
+				if (diffHours < 0) {
+					diffHours = diffHours * -1;
+				}
+				if (diffHours >= 24) {
+					diffHours = diffHours - 24;
+				}
+				if (diffMinutes < 0) {
+					diffMinutes = diffMinutes * -1;
+				}
+
+				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
+				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
+						Long.toString(diffMinutes));
+				return timeMsg;
+
+			}
+		}.withDescription("Time until plugin time day changes"));
 	}
 }

VotingPlugin/src/com/bencodez/votingplugin/specialrewards/SpecialRewards.java

@@ -63,29 +63,27 @@ public class SpecialRewards {
 						boolean gotCumulative = false;
 						int total = 0;
 						boolean useBungeeTotalNum = bungeeMessageData != null;
-						if (plugin.getSpecialRewardsConfig().getCumulativeVotesInSameDay(votesRequired)) {
-							if (!useBungeeTotalNum) {
-								total = user.getTotal(TopVoter.Daily);
-							} else {
-								total = bungeeMessageData.getDailyTotal();
-							}
-						} else if (plugin.getSpecialRewardsConfig().getCumulativeVotesInSameWeek(votesRequired)) {
-							if (!useBungeeTotalNum) {
-								total = user.getTotal(TopVoter.Weekly);
-							} else {
-								total = bungeeMessageData.getWeeklyTotal();
-							}
-						} else if (plugin.getSpecialRewardsConfig().getCumulativeVotesInSameMonth(votesRequired)) {
-							if (!useBungeeTotalNum) {
-								total = user.getTotal(TopVoter.Monthly);
-							} else {
-								total = bungeeMessageData.getMonthTotal();
-							}
+						String totalToUse = plugin.getSpecialRewardsConfig().getCumulativeVotesTotal(votesRequired);
+						TopVoter top = TopVoter.getTopVoter(totalToUse);
+						if (!useBungeeTotalNum) {
+							total = user.getTotal(top);
 						} else {
-							if (!useBungeeTotalNum) {
-								total = user.getTotal(TopVoter.AllTime);
-							} else {
+							switch (top) {
+							case AllTime:
 								total = bungeeMessageData.getAllTimeTotal();
+								break;
+							case Daily:
+								total = bungeeMessageData.getDailyTotal();
+								break;
+							case Monthly:
+								total = bungeeMessageData.getMonthTotal();
+								break;
+							case Weekly:
+								total = bungeeMessageData.getWeeklyTotal();
+								break;
+							default:
+								break;
+
 							}
 						}
 
@@ -97,10 +95,12 @@ public class SpecialRewards {
 
 						if (gotCumulative) {
 							gotCumulativeAny = true;
-							plugin.debug(user.getPlayerName() + " got cumulative " + votesRequired + ", current total: " + total);
+							plugin.debug(user.getPlayerName() + " got cumulative " + votesRequired + ", total: "
+									+ top.toString() + ", current total: " + total);
 							giveCumulativeVoteReward(user, user.isOnline(), votesRequired, forceBungee);
 						} else {
-							plugin.devDebug(user.getPlayerName() + " not able to get cumulative " + votesRequired);
+							plugin.devDebug(user.getPlayerName() + " not able to get cumulative " + votesRequired
+									+ ", total required: " + top.toString() + ", current player total: " + total);
 						}
 					}
 				}

VotingPlugin/src/com/bencodez/votingplugin/topvoter/TopVoter.java

@@ -28,6 +28,22 @@ public enum TopVoter {
 		return new TopVoter[] { TopVoter.Daily, TopVoter.Weekly, TopVoter.Monthly };
 	}
 
+	public String getColumnName() {
+		switch (this) {
+		case AllTime:
+			return "AllTimeTotal";
+		case Daily:
+			return "DailyTotal";
+		case Monthly:
+			return "MonthTotal";
+		case Weekly:
+			return "WeeklyTotal";
+		default:
+			return null;
+
+		}
+	}
+
 	public String getName() {
 		if (this.equals(TopVoter.Monthly)) {
 			return VotingPluginMain.plugin.getConfigFile().getFormatTopVoterMonthly();
@@ -91,20 +107,4 @@ public enum TopVoter {
 		}
 		return TopVoter.AllTime;
 	}
-
-	public String getColumnName() {
-		switch (this) {
-		case AllTime:
-			return "AllTimeTotal";
-		case Daily:
-			return "DailyTotal";
-		case Monthly:
-			return "MonthTotal";
-		case Weekly:
-			return "WeeklyTotal";
-		default:
-			return null;
-		
-		}
-	}
 }

VotingPlugin/src/com/bencodez/votingplugin/user/VotingPluginUser.java

@@ -61,14 +61,14 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	}
 
 	@Deprecated
-	public VotingPluginUser(VotingPluginMain plugin, UUID uuid, String playerName) {
-		super(plugin, uuid, playerName);
+	public VotingPluginUser(VotingPluginMain plugin, UUID uuid, boolean loadName) {
+		super(plugin, uuid, loadName);
 		this.plugin = plugin;
 	}
 
 	@Deprecated
-	public VotingPluginUser(VotingPluginMain plugin, UUID uuid, boolean loadName) {
-		super(plugin, uuid, loadName);
+	public VotingPluginUser(VotingPluginMain plugin, UUID uuid, String playerName) {
+		super(plugin, uuid, playerName);
 		this.plugin = plugin;
 	}
 
@@ -193,7 +193,8 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		}
 	}
 
-	public void bungeeVotePluginMessaging(String service, long time, BungeeMessageData text, boolean setTotals, boolean wasOnline) {
+	public void bungeeVotePluginMessaging(String service, long time, BungeeMessageData text, boolean setTotals,
+			boolean wasOnline) {
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
 			VotingPluginMain.plugin.debug("Pluginmessaging vote for " + getPlayerName() + " on " + service);
 
@@ -233,30 +234,16 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 
 	public boolean canVoteAny() {
 		for (VoteSite voteSite : plugin.getVoteSites()) {
-			boolean canVote = canVoteSite(voteSite);
-			if (canVote) {
-				return true;
+			if (!voteSite.isIgnoreCanVote()) {
+				boolean canVote = canVoteSite(voteSite);
+				if (canVote) {
+					return true;
+				}
 			}
 		}
 		return false;
 	}
 
-	public int getGottenAllSitesDay() {
-		if (plugin.getBungeeSettings().isUseBungeecoord()) {
-			return getData().getInt("AllSitesLast_" + plugin.getBungeeSettings().getServer(), 0, true);
-		} else {
-			return getData().getInt("AllSitesLast", 0, true);
-		}
-	}
-
-	public void setGottenAllSitesDay(int day) {
-		if (plugin.getBungeeSettings().isUseBungeecoord()) {
-			getData().setInt("AllSitesLast_" + plugin.getBungeeSettings().getServer(), day);
-		} else {
-			getData().setInt("AllSitesLast", day);
-		}
-	}
-
 	/**
 	 * Can vote site.
 	 *
@@ -408,6 +395,14 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		return getUserData().getBoolean("DisableBroadcast");
 	}
 
+	public int getGottenAllSitesDay() {
+		if (plugin.getBungeeSettings().isUseBungeecoord()) {
+			return getData().getInt("AllSitesLast_" + plugin.getBungeeSettings().getServer(), 0, true);
+		} else {
+			return getData().getInt("AllSitesLast", 0, true);
+		}
+	}
+
 	public HashMap<String, Boolean> getHasGottenMilestone() {
 		HashMap<String, Boolean> hasGottenMilestone = new HashMap<String, Boolean>();
 		ArrayList<String> milestoneList = getUserData().getStringList("GottenMileStones");
@@ -528,7 +523,15 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	 * @return the points
 	 */
 	public int getPoints() {
-		return getUserData().getInt("Points", isWaitForCache());
+		return getUserData().getInt(getPointsPath(), isWaitForCache());
+	}
+
+	public String getPointsPath() {
+		if (plugin.getBungeeSettings().isPerServerPoints()) {
+			return plugin.getBungeeSettings().getServer() + "_Points";
+		} else {
+			return "Points";
+		}
 	}
 
 	public java.util.UUID getPrimaryAccount() {
@@ -717,9 +720,10 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			return;
 		}
 
-		VotingPluginMain.plugin.extraDebug("Checking offline vote site votes");
 		Player player = getPlayer();
 		if (player != null) {
+			VotingPluginMain.plugin.extraDebug("Checking offline vote site votes for " + player.getName());
+
 			boolean topVoterIngorePerm = player.hasPermission("VotingPlugin.TopVoter.Ignore");
 			if (isTopVoterIgnore() != topVoterIngorePerm) {
 				setTopVoterIgnore(topVoterIngorePerm);
@@ -815,6 +819,14 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		getUserData().setBoolean("DisableBroadcast", value);
 	}
 
+	public void setGottenAllSitesDay(int day) {
+		if (plugin.getBungeeSettings().isUseBungeecoord()) {
+			getData().setInt("AllSitesLast_" + plugin.getBungeeSettings().getServer(), day);
+		} else {
+			getData().setInt("AllSitesLast", day);
+		}
+	}
+
 	public void setHasGotteMilestone(int votesRequired, boolean b) {
 		HashMap<String, Boolean> hasGottenMilestone = getHasGottenMilestone();
 		hasGottenMilestone.put("" + votesRequired, b);
@@ -900,7 +912,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	 * @param value the new points
 	 */
 	public void setPoints(int value) {
-		getUserData().setInt("Points", value, !plugin.getBungeeSettings().isUseBungeecoord());
+		getUserData().setInt(getPointsPath(), value, !plugin.getBungeeSettings().isUseBungeecoord());
 	}
 
 	public void setPrimaryAccount(java.util.UUID uuid) {
@@ -1073,6 +1085,18 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		return plugin.getConfigFile().getFormatCommandsVoteLastNeverVoted();
 	}
 
+	public String voteCommandLastGUILine(VoteSite voteSite) {
+		String timeString = voteCommandLastDate(voteSite);
+		String timeSince = voteCommandLastDuration(voteSite);
+
+		HashMap<String, String> placeholders = new HashMap<String, String>();
+		placeholders.put("time", timeString);
+		placeholders.put("SiteName", voteSite.getDisplayName());
+		placeholders.put("timesince", timeSince);
+
+		return StringParser.getInstance().replacePlaceHolder(plugin.getGui().getChestVoteLastLine(), placeholders);
+	}
+
 	public String voteCommandLastLine(VoteSite voteSite) {
 		String timeString = voteCommandLastDate(voteSite);
 		String timeSince = voteCommandLastDuration(voteSite);
@@ -1091,7 +1115,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 
 		long time = getTime(voteSite);
 		LocalDateTime now = plugin.getTimeChecker().getTime();
-		;
+
 		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault())
 				.plusHours(VotingPluginMain.plugin.getOptions().getTimeHourOffSet());
 

VotingPlugin/src/com/bencodez/votingplugin/voteparty/VoteParty.java

@@ -186,14 +186,20 @@ public class VoteParty implements Listener {
 			plugin.debug("Trying to give all players vote party");
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				giveReward(user, forceBungee);
+				if (!plugin.getSpecialRewardsConfig().isVotePartyGiveOnlinePlayersOnly() || user.isOnline()) {
+					giveReward(user, forceBungee);
+				}
+
 			}
 		} else {
 			plugin.debug("Trying to give all voted players vote party");
 			plugin.debug(ArrayUtils.getInstance().makeStringList(getVotedUsers()));
 			for (String uuid : getVotedUsers()) {
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				giveReward(user, forceBungee);
+				if (!plugin.getSpecialRewardsConfig().isVotePartyGiveOnlinePlayersOnly() || user.isOnline()) {
+					giveReward(user, forceBungee);
+				}
+
 			}
 		}
 		reset(false);
@@ -206,13 +212,6 @@ public class VoteParty implements Listener {
 		}
 	}
 
-	@EventHandler
-	public void onWeekChange(WeekChangeEvent event) {
-		if (plugin.getSpecialRewardsConfig().getVotePartyResetWeekly()) {
-			reset(true);
-		}
-	}
-
 	@EventHandler
 	public void onMonthChange(MonthChangeEvent event) {
 		if (plugin.getSpecialRewardsConfig().getVotePartyResetMontly()) {
@@ -224,6 +223,13 @@ public class VoteParty implements Listener {
 		}
 	}
 
+	@EventHandler
+	public void onWeekChange(WeekChangeEvent event) {
+		if (plugin.getSpecialRewardsConfig().getVotePartyResetWeekly()) {
+			reset(true);
+		}
+	}
+
 	public void register() {
 		plugin.getServer().getPluginManager().registerEvents(this, plugin);
 	}