Remove unneeded maven dependency

VotingPlugin/Resources/Config.yml

@@ -365,8 +365,8 @@ MaxiumNumberOfTopVotersToLoad: -1
 
 # When top voter awards are given (even if there are none listed) it will store top voters
 # Files will created in TopVoters folder.
+# Monthly top voters are always saved by default now
 StoreTopVoters:
-  Monthly: true
   Weekly: false
   Daily: false
     
@@ -375,6 +375,16 @@ StoreTopVoters:
 # Most of these values can be left untouched for most setups
 # ------------------------------------------------
 
+# If true vanished players are treated as if they are offline
+TreatVanishAsOffline: false
+
+# If true, cooldown check is disabled
+DisableCoolDownCheck: false
+
+# Delays login event, delays vote reminding and more
+# In ticks
+DelayLoginEvent: 0
+
 # If false, votestreaks will be disabled
 UseVoteStreaks: true
 

VotingPlugin/Resources/GUI.yml

@@ -87,6 +87,7 @@ CHEST:
     Name: '&cVoteURL'
     BackButton: true
     SiteName: '&c%Name%'
+    SiteNameCanVote: '&a%Name%'
     SeeURL: '&cClick to see URL'
     NextVote: '&cCan Vote In: %Info%'
     #Start slot for specific site buttons
@@ -147,9 +148,12 @@ CHEST:
   VoteTop:
     Name: 'VoteTop %topvoter%'
     BackButton: false
+    # Item of top voter (change material below)
     Item:
       Name: '&3&l%position%: &3%player%'
       Lore: '&3&lVotes: &3%votes%'
+    # Opens main GUI of the specific player that gets clicked
+    OpenMainGUIOnClick: true
     SwitchItem:
       Name: '&3Switch TopVoter'
       Lore: '&bCurrently: %Top%'
@@ -158,8 +162,7 @@ CHEST:
       # 8 Slots over from the bottom left
       # Bottom of GUI
       Slot: 7
-    # Number of topvoters to display on each GUI page
-    # 9 Slots on the botton are used for page buttons (added on top)
+    # Number of topvoters to display on each GUI page, must be a multiple of 9
     Size: 27
     # If true, /vote top will show player heads
     UseSkull: true
@@ -263,6 +266,8 @@ CHEST:
     Data: 0
     Amount: 1
     Name: '&8Back to VoteGUI'
+    # If true, clicking back button will open VoteURL
+    OpenVoteURL: false
 
   VoteShopBackButton: true
   VoteShopEnabled: true
@@ -281,7 +286,6 @@ CHEST:
       Identifier_Name: 'Diamond'
       # Item
       Material: 'DIAMOND'
-      Data: 0
       Amount: 1
       Name: '&4Buy A Diamond'
       # You can set skulls of the player using the following

VotingPlugin/Resources/SpecialRewards.yml

@@ -137,6 +137,7 @@ VoteStreak:
     Month: 50
     
 # Reward given when vote cooldown ended
+# Using this is a little memory intensive
 VoteCoolDownEndedReward: []
 
 # ONLY USE THIS FOR TITLES/SOUNDS AND OTHER EFFECTS

VotingPlugin/Resources/plugin.yml

@@ -242,6 +242,8 @@ permissions:
     description: Permission to create sign
   VotingPlugin.Admin.GenerateServiceSite:
     description: Permission for generating votesite message
+  VotingPlugin.Login.RemindVotes:
+    description: Permission to allow timed reminders
   VotingPlugin.Login.RemindVotes.Any:
     description: Remind if player can vote on any website, rather than all
     default: false

VotingPlugin/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>6.1.4</version>
+	<version>6.1.7</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -243,9 +243,13 @@
 			<id>bungeecord-repo</id>
 			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
 		</repository>
+		<repository>
+			<id>velocity</id>
+			<url>https://nexus.velocitypowered.com/repository/maven-public/</url>
+		</repository>
 		<repository>
 			<id>bintray-repo</id>
-			<url>https://dl.bintray.com/nuvotifier/maven/</url>
+			<url>https://dl.bintray.com/ichbinjoe/public/</url>
 		</repository>
 	</repositories>
 	<dependencies>
@@ -259,13 +263,6 @@
 			<version>1.16.5-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.vexsoftware</groupId>
-			<artifactId>votifier</artifactId>
-			<version>1.9</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/Jars/Votifier.jar</systemPath>
-		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
@@ -281,7 +278,7 @@
 		<dependency>
 			<groupId>com.vexsoftware</groupId>
 			<artifactId>nuvotifier-universal</artifactId>
-			<version>2.3.4</version>
+			<version>2.6.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

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

@@ -11,6 +11,7 @@ import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
 import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
+import com.bencodez.votingplugin.bungee.BungeeVersion;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -55,40 +56,47 @@ public class BungeeHandler {
 			plugin.getPluginMessaging().add(new PluginMessageHandler("Vote") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					String player = args.get(0);
-					String uuid = args.get(1);
-					String service = args.get(2);
-					long time = Long.parseLong(args.get(3));
-					plugin.debug("pluginmessaging vote received from " + player + " on " + service);
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
-							player);
+					if (args.size() > 8) {
+						int bungeeVersion = Integer.parseInt(args.get(8));
+						if (bungeeVersion != BungeeVersion.getPluginMessageVersion()) {
+							plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
+							return;
+						}
 
-					boolean wasOnline = Boolean.valueOf(args.get(4));
+						String player = args.get(0);
+						String uuid = args.get(1);
+						String service = args.get(2);
+						long time = Long.parseLong(args.get(3));
+						plugin.debug("pluginmessaging vote received from " + player + "/" + uuid + " on " + service);
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
+								player);
 
-					BungeeMessageData text = new BungeeMessageData(args.get(6));
+						boolean wasOnline = Boolean.valueOf(args.get(4));
 
-					boolean setTotals = false;
-					if (args.size() > 7) {
-						setTotals = Boolean.valueOf(args.get(7));
-					}
+						BungeeMessageData text = new BungeeMessageData(args.get(6));
 
-					user.clearCache();
+						boolean setTotals = Boolean.valueOf(args.get(7));
 
-					user.bungeeVotePluginMessaging(service, time, text, !setTotals);
+						user.clearCache();
 
-					if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
-						if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-							VoteSite site = plugin.getVoteSite(service);
-							if (site != null) {
-								site.broadcastVote(user, false);
-							} else {
-								plugin.getLogger().warning("No votesite for " + service);
+						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline);
+
+						if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
+							if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
+								VoteSite site = plugin.getVoteSite(service);
+								if (site != null) {
+									site.broadcastVote(user, false);
+								} else {
+									plugin.getLogger().warning("No votesite for " + service);
+								}
 							}
 						}
-					}
 
-					if (args.size() > 4 && Boolean.valueOf(args.get(5))) {
-						plugin.getServerData().addServiceSite(service);
+						if (Boolean.valueOf(args.get(5))) {
+							plugin.getServerData().addServiceSite(service);
+						}
+					} else {
+						plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
 					}
 
 				}
@@ -97,36 +105,45 @@ public class BungeeHandler {
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteOnline") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					String player = args.get(0);
-					String uuid = args.get(1);
-					String service = args.get(2);
-					long time = Long.parseLong(args.get(3));
-					BungeeMessageData text = new BungeeMessageData(args.get(6));
-					plugin.debug("pluginmessaging voteonline received from " + player + " on " + service);
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
-							player);
-					user.clearCache();
+					if (args.size() > 8) {
+						int bungeeVersion = Integer.parseInt(args.get(8));
+						if (bungeeVersion != BungeeVersion.getPluginMessageVersion()) {
+							plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
+							return;
+						}
+						String player = args.get(0);
+						String uuid = args.get(1);
+						String service = args.get(2);
+						long time = Long.parseLong(args.get(3));
+						BungeeMessageData text = new BungeeMessageData(args.get(6));
+						plugin.debug(
+								"pluginmessaging voteonline received from " + player + "/" + uuid + " on " + service);
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
+								player);
+						user.clearCache();
 
-					boolean setTotals = false;
-					if (args.size() > 7) {
-						setTotals = Boolean.valueOf(args.get(7));
-					}
+						boolean setTotals = Boolean.valueOf(args.get(7));
 
-					user.bungeeVotePluginMessaging(service, time, text, !setTotals);
+						boolean wasOnline = Boolean.valueOf(args.get(4));
 
-					if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
-						if (Boolean.valueOf(args.get(4)) || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-							VoteSite site = plugin.getVoteSite(service);
-							if (site != null) {
-								site.broadcastVote(user, false);
-							} else {
-								plugin.getLogger().warning("No votesite for " + service);
+						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline);
+
+						if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
+							if (Boolean.valueOf(args.get(4)) || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
+								VoteSite site = plugin.getVoteSite(service);
+								if (site != null) {
+									site.broadcastVote(user, false);
+								} else {
+									plugin.getLogger().warning("No votesite for " + service);
+								}
 							}
 						}
-					}
 
-					if (args.size() > 4 && Boolean.valueOf(args.get(5))) {
-						plugin.getServerData().addServiceSite(service);
+						if (Boolean.valueOf(args.get(5))) {
+							plugin.getServerData().addServiceSite(service);
+						}
+					} else {
+						plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
 					}
 				}
 			});

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

@@ -40,7 +40,9 @@ import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.javascript.JavascriptPlaceholderRequest;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
+import com.bencodez.advancedcore.api.rewards.DirectlyDefinedReward;
 import com.bencodez.advancedcore.api.rewards.Reward;
+import com.bencodez.advancedcore.api.rewards.RewardEditData;
 import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardPlaceholderHandle;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInject;
@@ -84,7 +86,6 @@ import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 import com.bencodez.votingplugin.voteparty.VoteParty;
 import com.bencodez.votingplugin.votereminding.VoteReminding;
-import com.vexsoftware.votifier.Votifier;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -223,18 +224,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 	}
 
-	private boolean checkVotifierLoaded() {
-		try {
-			Class.forName("com.vexsoftware.votifier.Votifier");
-			if (Votifier.getInstance().getVoteReceiver() == null) {
-				return false;
-			}
-		} catch (ClassNotFoundException e) {
-			debug("Using NuVotiifer?");
-		}
-		return true;
-	}
-
 	private void checkYMLError() {
 		if (configFile.isFailedToRead() || configVoteSites.isFailedToRead() || specialRewardsConfig.isFailedToRead()
 				|| bungeeSettings.isFailedToRead() || gui.isFailedToRead()) {
@@ -495,17 +484,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					}
 				}, 1000, 1000 * 60 * configFile.getDelayBetweenUpdates());
 
-				getTimer().schedule(new TimerTask() {
-
-					@Override
-					public void run() {
-						if (plugin != null) {
-							coolDownCheck.checkAll();
-						} else {
-							cancel();
-						}
-					}
-				}, 1000 * 60 * 10, 1000 * 60 * 5);
+				coolDownCheck.load();
 
 				getTimer().schedule(new TimerTask() {
 
@@ -588,6 +567,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		registerCommands();
 		checkVotifier();
 		registerEvents();
+		loadDirectlyDefined();
 		checkUpdate = new CheckUpdate(this);
 		checkUpdate.startUp();
 		voteReminding = new VoteReminding(this);
@@ -676,8 +656,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
+			if (getOptions().isPerServerRewards()) {
+				getMysql().alterColumnType("OfflineRewards" + getOptions().getServer(), "MEDIUMTEXT");
+			}
 		}
-
 		// Add rewards
 		RewardHandler.getInstance().addInjectedReward(new RewardInjectInt("Points", 0) {
 
@@ -692,8 +674,8 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 					@Override
 					public void setValue(Player player, Number value) {
-						Reward reward = (Reward) getInv().getData("Reward");
-						reward.getConfig().set("Points", value.intValue());
+						RewardEditData reward = (RewardEditData) getInv().getData("Reward");
+						reward.setValue("Points", value.intValue());
 					}
 				})).validator(new RewardInjectValidator() {
 
@@ -774,16 +756,269 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 				}
 			}, 30l);
 		}
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+	}
+
+	public void loadDirectlyDefined() {
+		RewardHandler.getInstance().getDirectlyDefinedRewards().clear();
+		// AllSites reward
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("AllSites") {
 
 			@Override
-			public void run() {
-				if (!checkVotifierLoaded()) {
-					plugin.getLogger().warning("Detected votifier not loaded properly, check startup for details");
-				}
+			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);
 	}
 
 	/*
@@ -925,10 +1160,11 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		updateAdvancedCoreHook();
 		plugin.loadVoteSites();
+		loadDirectlyDefined();
 		reloadAdvancedCore(userStorage);
 		getOptions().setServer(bungeeSettings.getServer());
 		placeholders.load();
-		coolDownCheck.checkAll();
+
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 			@Override

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

@@ -0,0 +1,7 @@
+package com.bencodez.votingplugin.bungee;
+
+public class BungeeVersion {
+	public static int getPluginMessageVersion() {
+		return 1;
+	}
+}

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

@@ -90,7 +90,8 @@ public class VotingPluginBungee extends Plugin {
 								sendPluginMessageServer(server, "Vote", cache.getPlayerName(), cache.getUuid(),
 										cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
 										"" + cache.isRealVote(), cache.getText(),
-										"" + getConfig().getBungeeManageTotals());
+										"" + getConfig().getBungeeManageTotals(),
+										"" + BungeeVersion.getPluginMessageVersion());
 							} else {
 								debug("Not sending vote because user isn't on server " + server + ": "
 										+ cache.toString());
@@ -116,7 +117,8 @@ public class VotingPluginBungee extends Plugin {
 					for (OfflineBungeeVote cache : c) {
 						sendPluginMessageServer(server, "VoteOnline", cache.getPlayerName(), cache.getUuid(),
 								cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
-								"" + cache.isRealVote(), cache.getText(), "" + getConfig().getBungeeManageTotals());
+								"" + cache.isRealVote(), cache.getText(), "" + getConfig().getBungeeManageTotals(),
+								"" + BungeeVersion.getPluginMessageVersion());
 					}
 					cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
 				}
@@ -578,116 +580,121 @@ public class VotingPluginBungee extends Plugin {
 	}
 
 	public void vote(String player, String service, boolean realVote) {
-		if (player == null || player.isEmpty()) {
-			getLogger().info("No name from vote on " + service);
-			return;
-		}
-
-		String uuid = getUUID(player);
-		if (uuid.isEmpty()) {
-			if (config.getAllowUnJoined()) {
-				UUID u = null;
-				try {
-					u = fetchUUID(player);
-				} catch (Exception e) {
-					if (getConfig().getDebug()) {
-						e.printStackTrace();
-					}
-				}
-				if (u == null) {
-					debug("Failed to get uuid for " + player);
-					return;
-				}
-				uuid = u.toString();
-			} else {
-				getLogger().info("Ignoring vote from " + player);
+		try {
+			if (player == null || player.isEmpty()) {
+				getLogger().info("No name from vote on " + service);
 				return;
 			}
-		}
 
-		player = getProperName(uuid, player);
-
-		BungeeMessageData text = null;
-
-		if (getConfig().getBungeeManageTotals()) {
-
-			if (!mysql.getUuids().contains(uuid)) {
-				mysql.update(uuid, "PlayerName", player, DataType.STRING);
-			}
-
-			ArrayList<Column> data = mysql.getExactQuery(new Column("uuid", uuid, DataType.STRING));
-
-			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, "MilestoneCount", 1));
-		} else {
-			text = new BungeeMessageData(0, 0, 0, 0, 0, 0);
-		}
-
-		/*
-		 * String text = 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,
-		 * "MilestoneCount", 1);
-		 */
-
-		long time = LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
-
-		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-
-			if (config.getSendVotesToAllServers()) {
-				for (String s : getProxy().getServers().keySet()) {
-					if (!config.getBlockedServers().contains(s)) {
-						ServerInfo info = getProxy().getServerInfo(s);
-						boolean forceCache = false;
-						ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
-						if ((p == null || !p.isConnected()) && getConfig().getWaitForUserOnline()) {
-							forceCache = true;
-							debug("Forcing vote to cache");
-						}
-						if (info.getPlayers().isEmpty() || forceCache) {
-							// cache
-							if (!cachedVotes.containsKey(s)) {
-								cachedVotes.put(s, new ArrayList<OfflineBungeeVote>());
-							}
-							ArrayList<OfflineBungeeVote> list = cachedVotes.get(s);
-							list.add(new OfflineBungeeVote(player, uuid, service, time, realVote, text.toString()));
-							cachedVotes.put(s, list);
-
-							debug("Caching vote for " + player + " on " + service + " for " + s);
-
-						} else {
-							// send
-							sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
-									Boolean.TRUE.toString(), "" + realVote, text.toString(),
-									"" + getConfig().getBungeeManageTotals());
+			String uuid = getUUID(player);
+			if (uuid.isEmpty()) {
+				if (config.getAllowUnJoined()) {
+					UUID u = null;
+					try {
+						u = fetchUUID(player);
+					} catch (Exception e) {
+						if (getConfig().getDebug()) {
+							e.printStackTrace();
 						}
 					}
-				}
-			} else {
-				ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
-				if (p != null && p.isConnected()
-						&& !config.getBlockedServers().contains(p.getServer().getInfo().getName())) {
-					sendPluginMessageServer(p.getServer().getInfo().getName(), "VoteOnline", player, uuid, service,
-							"" + time, Boolean.TRUE.toString(), "" + realVote, text.toString(),
-							"" + getConfig().getBungeeManageTotals());
+					if (u == null) {
+						debug("Failed to get uuid for " + player);
+						return;
+					}
+					uuid = u.toString();
 				} else {
-					if (!cachedOnlineVotes.containsKey(uuid)) {
-						cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
-					}
-					ArrayList<OfflineBungeeVote> list = cachedOnlineVotes.get(uuid);
-					if (list == null) {
-						list = new ArrayList<OfflineBungeeVote>();
-					}
-					list.add(new OfflineBungeeVote(player, uuid, service, time, realVote, text.toString()));
-					cachedOnlineVotes.put(uuid, list);
-					debug("Caching online vote for " + player + " on " + service);
+					getLogger().info("Ignoring vote from " + player);
+					return;
 				}
 			}
-		} else if (method.equals(BungeeMethod.SOCKETS)) {
-			sendSocketVote(player, service, text);
+
+			player = getProperName(uuid, player);
+
+			BungeeMessageData text = null;
+
+			if (getConfig().getBungeeManageTotals()) {
+
+				if (!mysql.getUuids().contains(uuid)) {
+					mysql.update(uuid, "PlayerName", player, DataType.STRING);
+				}
+
+				ArrayList<Column> data = mysql.getExactQuery(new Column("uuid", uuid, DataType.STRING));
+
+				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, "MilestoneCount", 1));
+			} else {
+				text = new BungeeMessageData(0, 0, 0, 0, 0, 0);
+			}
+
+			/*
+			 * String text = 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,
+			 * "MilestoneCount", 1);
+			 */
+
+			long time = LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+
+			if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+
+				if (config.getSendVotesToAllServers()) {
+					for (String s : getProxy().getServers().keySet()) {
+						if (!config.getBlockedServers().contains(s)) {
+							ServerInfo info = getProxy().getServerInfo(s);
+							boolean forceCache = false;
+							ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
+							if ((p == null || !p.isConnected()) && getConfig().getWaitForUserOnline()) {
+								forceCache = true;
+								debug("Forcing vote to cache");
+							}
+							if (info.getPlayers().isEmpty() || forceCache) {
+								// cache
+								if (!cachedVotes.containsKey(s)) {
+									cachedVotes.put(s, new ArrayList<OfflineBungeeVote>());
+								}
+								ArrayList<OfflineBungeeVote> list = cachedVotes.get(s);
+								list.add(new OfflineBungeeVote(player, uuid, service, time, realVote, text.toString()));
+								cachedVotes.put(s, list);
+
+								debug("Caching vote for " + player + " on " + service + " for " + s);
+
+							} else {
+								// send
+								sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
+										Boolean.TRUE.toString(), "" + realVote, text.toString(),
+										"" + getConfig().getBungeeManageTotals(),
+										"" + BungeeVersion.getPluginMessageVersion());
+							}
+						}
+					}
+				} else {
+					ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
+					if (p != null && p.isConnected()
+							&& !config.getBlockedServers().contains(p.getServer().getInfo().getName())) {
+						sendPluginMessageServer(p.getServer().getInfo().getName(), "VoteOnline", player, uuid, service,
+								"" + time, Boolean.TRUE.toString(), "" + realVote, text.toString(),
+								"" + getConfig().getBungeeManageTotals(), "" + BungeeVersion.getPluginMessageVersion());
+					} else {
+						if (!cachedOnlineVotes.containsKey(uuid)) {
+							cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
+						}
+						ArrayList<OfflineBungeeVote> list = cachedOnlineVotes.get(uuid);
+						if (list == null) {
+							list = new ArrayList<OfflineBungeeVote>();
+						}
+						list.add(new OfflineBungeeVote(player, uuid, service, time, realVote, text.toString()));
+						cachedOnlineVotes.put(uuid, list);
+						debug("Caching online vote for " + player + " on " + service);
+					}
+				}
+			} else if (method.equals(BungeeMethod.SOCKETS)) {
+				sendSocketVote(player, service, text);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
 
 	}

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

@@ -45,6 +45,7 @@ import com.bencodez.votingplugin.commands.gui.admin.AdminVoteHelp;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVotePerms;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVotePlaceholders;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVotePlaceholdersPlayer;
+import com.bencodez.votingplugin.commands.gui.admin.AdminVoteVoteShop;
 import com.bencodez.votingplugin.commands.gui.player.VoteBest;
 import com.bencodez.votingplugin.commands.gui.player.VoteGUI;
 import com.bencodez.votingplugin.commands.gui.player.VoteHelp;
@@ -99,19 +100,27 @@ public class CommandLoader {
 
 	public BInventoryButton getBackButton(VotingPluginUser user) {
 		ConfigurationSection sec = plugin.getGui().getCHESTBackButton();
+		boolean a = false;
+
 		ItemBuilder item;
 		if (sec != null) {
 			item = new ItemBuilder(sec);
+				a = sec.getBoolean("OpenVoteURL", false);
 		} else {
 			item = new ItemBuilder(Material.BARRIER, 1).setName("&8Back to VoteGUI");
 		}
 
+		final boolean openVoteURL = a;
 		BInventoryButton b = new BInventoryButton(item) {
 
 			@Override
 			public void onClick(ClickEvent event) {
-				new VoteGUI(plugin, event.getWhoClicked(), user)
-						.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
+				if (!openVoteURL) {
+					new VoteGUI(plugin, event.getWhoClicked(), user)
+							.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
+				} else {
+					new VoteURL(plugin, event.getWhoClicked(), user, true).open();
+				}
 			}
 		};
 
@@ -254,6 +263,23 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "ResetMilestoneCount" },
+						"VotingPlugin.Commands.AdminVote.ResetMilestoneCount|" + adminPerm,
+						"Resets milestone count to alltimetotal") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						sendMessage(sender, "&cStarting to clear milestonecounts...");
+						for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+							user.setMilestoneCount(0);
+						}
+						sendMessage(sender, "&cFinished");
+
+					}
+				});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "ResyncMilestonesAlreadyGiven" },
 						"VotingPlugin.Commands.AdminVote.ResyncMilestonesGiven|" + adminPerm,
@@ -309,18 +335,20 @@ public class CommandLoader {
 					}
 				});
 
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ResyncMilestones", "(player)" },
-				"VotingPlugin.Commands.AdminVote.SetResyncMilestones|" + adminPerm, "Resync Milestones") {
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "ResyncMilestones", "(player)" },
+						"VotingPlugin.Commands.AdminVote.SetResyncMilestones|" + adminPerm,
+						"Resync Milestones to alltimetotal for player") {
 
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
-				user.setMilestoneCount(user.getTotal(TopVoter.AllTime));
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						user.setMilestoneCount(user.getTotal(TopVoter.AllTime));
 
-				sendMessage(sender, "&cResynced milestones for " + args[1]);
+						sendMessage(sender, "&cResynced milestones for " + args[1]);
 
-			}
-		});
+					}
+				});
 
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "User", "(player)", "AddPoints", "(number)" },
@@ -356,7 +384,6 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				new AdminVoteHelp(plugin, sender, 1).open();
-				;
 			}
 		});
 
@@ -398,6 +425,15 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "EditVoteShop" },
+				"VotingPlugin.Commands.AdminVote.EditVoteShop", "Edit VoteShop", false) {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				new AdminVoteVoteShop(plugin, sender).open(GUIMethod.CHEST);
+			}
+		});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Perms" },
 				"VotingPlugin.Commands.AdminVote.Perms|" + adminPerm, "List permissions") {
 

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

@@ -8,6 +8,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
+import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
@@ -17,13 +18,17 @@ import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueBo
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueList;
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueNumber;
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.PlayerUtils;
+import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.valuerequest.InputMethod;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 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.AdminVoteVoteShop;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
 import com.bencodez.votingplugin.objects.VoteSite;
 
@@ -65,6 +70,14 @@ public class AdminGUI {
 			}
 		});
 
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.DIAMOND, 1).setName("&cEdit VoteShop")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteVoteShop(plugin, clickEvent.getPlayer()).open(GUIMethod.CHEST);
+			}
+		});
+
 		buttons.add(new BInventoryButton("&cReload Plugin", new String[] {}, new ItemStack(Material.STONE, 1)) {
 
 			@Override
@@ -246,6 +259,15 @@ public class AdminGUI {
 							plugin.reload();
 						}
 					}));
+		} else {
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.DISPENSER, 1).setName("&cRewards")) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(), RewardHandler.getInstance()
+							.getDirectlyDefined("VoteSites." + voteSite.getKey() + ".Rewards"));
+				}
+			});
 		}
 
 		inv.openInventory(player);

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

@@ -43,9 +43,9 @@ public class AdminVotePlaceholders extends GUIHandler {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg = "%VotingPlugin_" + identifier + "% - " + placeholder.getDescription();
+				msg = "VotingPlugin_" + identifier + " - " + placeholder.getDescription();
 			} else {
-				msg = "%VotingPlugin_" + identifier + "%";
+				msg = "VotingPlugin_" + identifier + "";
 			}
 
 			Layout layout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
@@ -61,9 +61,9 @@ public class AdminVotePlaceholders extends GUIHandler {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg = "%VotingPlugin_" + identifier + "% - " + placeholder.getDescription();
+				msg = "VotingPlugin_" + identifier + " - " + placeholder.getDescription();
 			} else {
-				msg = "%VotingPlugin_" + identifier + "%";
+				msg = "VotingPlugin_" + identifier + "";
 			}
 
 			Layout layout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
@@ -87,9 +87,9 @@ public class AdminVotePlaceholders extends GUIHandler {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg.add("%VotingPlugin_" + identifier + "% - " + placeholder.getDescription());
+				msg.add("VotingPlugin_" + identifier + " - " + placeholder.getDescription());
 			} else {
-				msg.add("%VotingPlugin_" + identifier + "%");
+				msg.add("VotingPlugin_" + identifier + "");
 			}
 		}
 
@@ -99,9 +99,9 @@ public class AdminVotePlaceholders extends GUIHandler {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg.add("%VotingPlugin_" + identifier + "% - " + placeholder.getDescription());
+				msg.add("VotingPlugin_" + identifier + " - " + placeholder.getDescription());
 			} else {
-				msg.add("%VotingPlugin_" + identifier + "%");
+				msg.add("VotingPlugin_" + identifier + "");
 			}
 		}
 

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

@@ -82,7 +82,7 @@ public class AdminVotePlaceholdersPlayer extends GUIHandler {
 			if (identifier.endsWith("_")) {
 				identifier += "1";
 			}
-			msg.add("%VotingPlugin_" + identifier + "% = "
+			msg.add("VotingPlugin_" + identifier + " = "
 					+ placeholder.placeholderRequest(user.getOfflinePlayer(), placeholderUser, identifier));
 		}
 
@@ -92,7 +92,7 @@ public class AdminVotePlaceholdersPlayer extends GUIHandler {
 				identifier += "1";
 			}
 
-			msg.add("%VotingPlugin_" + identifier + "% = "
+			msg.add("VotingPlugin_" + identifier + " = "
 					+ placeholder.placeholderRequest(user.getOfflinePlayer(), placeholderUser, identifier));
 		}
 		sendMessage(msg);

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

@@ -0,0 +1,91 @@
+package com.bencodez.votingplugin.commands.gui.admin;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+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.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
+import com.bencodez.advancedcore.api.valuerequest.listeners.StringListener;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+public class AdminVoteVoteShop extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteVoteShop(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) {
+		BInventory inv = new BInventory("Edit VoteShop");
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.DIAMOND).setName("&cEdit existing item")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteVoteShopItems(plugin, clickEvent.getPlayer()).open(GUIMethod.CHEST);
+			}
+		});
+
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.EMERALD_BLOCK).setName("&aAdd voteshop item")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ValueRequest().requestString(player, new StringListener() {
+
+					@Override
+					public void onInput(Player player, String value) {
+						plugin.getGui().createShop(value);
+						plugin.reload();
+					}
+				});
+			}
+		});
+
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.REDSTONE_BLOCK).setName("&cRemove item")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				
+				new ValueRequest().requestString(player, new StringListener() {
+
+					@Override
+					public void onInput(Player player, String value) {
+						plugin.getGui().removeShop(value);
+						plugin.reload();
+					}
+				});
+			}
+		});
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}

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

@@ -0,0 +1,138 @@
+package com.bencodez.votingplugin.commands.gui.admin;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
+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.editgui.EditGUI;
+import com.bencodez.advancedcore.api.inventory.editgui.EditGUIButton;
+import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueList;
+import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueNumber;
+import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.advancedcore.api.rewards.RewardHandler;
+import com.bencodez.advancedcore.command.gui.RewardEditGUI;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+public class AdminVoteVoteShopItem extends GUIHandler {
+
+	private VotingPluginMain plugin;
+	private String identifier;
+
+	public AdminVoteVoteShopItem(VotingPluginMain plugin, CommandSender player, String identifier) {
+		super(player);
+		this.plugin = plugin;
+		this.identifier = identifier;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	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);
+
+		// to add
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueString("Identifier_Name",
+				plugin.getGui().getChestShopIdentifierIdentifierName(identifier)) {
+
+			@Override
+			public void setValue(Player player, String name) {
+				setPathData(getKey(), name);
+			}
+		}));
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.OAK_DOOR, 1),
+				new EditGUIValueString("Permission", plugin.getGui().getChestVoteShopPermission(identifier)) {
+
+					@Override
+					public void setValue(Player player, String name) {
+						setPathData(getKey(), name);
+					}
+				}));
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.EMERALD, 1),
+				new EditGUIValueNumber("Cost", plugin.getGui().getChestShopIdentifierCost(identifier)) {
+
+					@Override
+					public void setValue(Player player, Number num) {
+						setPathData(getKey(), num.intValue());
+					}
+				}));
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.BARRIER, 1),
+				new EditGUIValueNumber("Limit", plugin.getGui().getChestShopIdentifierLimit(identifier)) {
+
+					@Override
+					public void setValue(Player player, Number num) {
+						setPathData(getKey(), num.intValue());
+					}
+				}));
+
+		// display item
+		ConfigurationSection displayItemData = plugin.getGui().getChestShopIdentifierSection(identifier);
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.valueOf(displayItemData.getString("Material")), 1),
+				new EditGUIValueString("Material", displayItemData.getString("Material")) {
+
+					@Override
+					public void setValue(Player player, String name) {
+						setPathData(getKey(), name);
+					}
+				}));
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
+				new EditGUIValueString("Name", displayItemData.getString("Name")) {
+
+					@Override
+					public void setValue(Player player, String name) {
+						setPathData(getKey(), name);
+					}
+				}));
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.BOOK, 1),
+				new EditGUIValueList("Lore", displayItemData.getStringList("Lore")) {
+
+					@Override
+					public void setValue(Player player, ArrayList<String> value) {
+						setPathData(getKey(), value);
+					}
+				}));
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.DISPENSER, 1).setName("&cRewards")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						RewardHandler.getInstance().getDirectlyDefined("CHEST.Shop." + identifier + ".Rewards"));
+			}
+		});
+
+		// implement item reward?
+
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}

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

@@ -0,0 +1,63 @@
+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.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+public class AdminVoteVoteShopItemRemove extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteVoteShopItemRemove(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) {
+		BInventory inv = new BInventory("Edit VoteShop Remove Item");
+
+		for (String identifier : plugin.getGui().getChestShopIdentifiers()) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier))
+							.addLoreLine("&c&lClick to remove")) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							plugin.getGui().removeShop((String) getData("ident"));
+							sendMessage(clickEvent.getPlayer(), "&cRemoved " + (String) (getData("ident")));
+						}
+					}.addData("ident", identifier));
+		}
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}

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

@@ -0,0 +1,64 @@
+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.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+public class AdminVoteVoteShopItems extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteVoteShopItems(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) {
+		BInventory inv = new BInventory("Edit VoteShop Items");
+
+		for (String identifier : plugin.getGui().getChestShopIdentifiers()) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new AdminVoteVoteShopItem(plugin, clickEvent.getPlayer(), (String) getData("ident"))
+									.open(GUIMethod.CHEST);
+							;
+						}
+					}.addData("ident", identifier));
+		}
+
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}

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

@@ -102,9 +102,13 @@ public class VoteTopVoter extends GUIHandler {
 
 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						VotingPluginUser user = (VotingPluginUser) getData("User");
-						new VoteGUI(plugin, player, user)
-								.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
+						if (plugin.getGui().getChestVoteTopOpenMainGUIOnClick()) {
+							VotingPluginUser user = (VotingPluginUser) getData("User");
+							new VoteGUI(plugin, player, user)
+									.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
+						} else {
+							getInv().forceClose(clickEvent.getPlayer());
+						}
 					}
 				}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
 				pos++;

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

@@ -115,14 +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()));
 		} else {
+			builder.setName(plugin.getGui().getChestVoteURLGUISiteName().replace("%Name%", voteSite.getDisplayName()));
 			builder.addLoreLine(
 					plugin.getGui().getChestVoteURLNextVote().replace("%Info%", user.voteCommandNextInfo(voteSite)));
 		}
 
-		builder.setName(plugin.getGui().getChestVoteURLGUISiteName().replace("%Name%", voteSite.getDisplayName()));
+		
 		return builder;
 	}
 

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

@@ -39,7 +39,7 @@ public class Config extends YMLFile {
 	@ConfigDataBoolean(path = "UseVoteGUIMainCommand")
 	@Getter
 	private boolean useVoteGUIMainCommand = false;
-	
+
 	@ConfigDataBoolean(path = "ExtraAllSitesCheck")
 	@Getter
 	private boolean extraAllSitesCheck = false;
@@ -210,6 +210,10 @@ public class Config extends YMLFile {
 	@ConfigDataInt(path = "MaxiumNumberOfTopVotersToLoad")
 	@Getter
 	private int MaxiumNumberOfTopVotersToLoad = -1;
+	
+	@ConfigDataInt(path = "DelayLoginEvent")
+	@Getter
+	private int delayLoginEvent = 0;
 
 	@ConfigDataBoolean(path = "OverrideVersionDisable")
 	@Getter
@@ -230,6 +234,10 @@ public class Config extends YMLFile {
 	@ConfigDataBoolean(path = "UsePrimaryAccountForPlaceholders")
 	@Getter
 	private boolean usePrimaryAccountForPlaceholders = false;
+	
+	@ConfigDataBoolean(path = "DisableCoolDownCheck")
+	@Getter
+	private boolean disableCoolDownCheck = false;
 
 	@ConfigDataListString(path = "VotingBroadcastBlacklist")
 	@Getter
@@ -707,15 +715,6 @@ public class Config extends YMLFile {
 		return getData().getBoolean("StoreTopVoters.Daily");
 	}
 
-	/**
-	 * Gets the store top voters monthly.
-	 *
-	 * @return the store top voters monthly
-	 */
-	public boolean getStoreTopVotersMonthly() {
-		return getData().getBoolean("StoreTopVoters.Monthly");
-	}
-
 	/**
 	 * Gets the store top voters weekly.
 	 *

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

@@ -368,6 +368,10 @@ 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%");
 	}
@@ -476,6 +480,10 @@ public class GUI extends YMLFile {
 		return getData().getString("CHEST.VoteURL.SiteName", "&c%Name%");
 	}
 
+	public String getChestVoteURLGUISiteNameCanVote() {
+		return getData().getString("CHEST.VoteURL.SiteNameCanVote", "&a%Name%");
+	}
+
 	public String getChestVoteURLName() {
 		return getData().getString("CHEST.VoteURL.Name", "&cVoteURL");
 	}
@@ -530,4 +538,25 @@ public class GUI extends YMLFile {
 		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/cooldown/CoolDownCheck.java

@@ -32,27 +32,43 @@ public class CoolDownCheck implements Listener {
 		this.plugin = plugin;
 	}
 
-	public void checkAll() {
-		plugin.getTimer().schedule(new TimerTask() {
+	public void load() {
+		checkAll();
+	}
 
-			@Override
-			public void run() {
-				if (VotingPluginMain.plugin != null) {
-					for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-						if (VotingPluginMain.plugin != null) {
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-							if (user.getUserData().hasData() && user.hasLoggedOnBefore()) {
-								user.checkCoolDownEvents();
+	public void checkAll() {
+		if (!plugin.getConfigFile().isDisableCoolDownCheck() && RewardHandler.getInstance()
+				.hasRewards(plugin.getSpecialRewardsConfig().getData(), "VoteCoolDownEndedReward")) {
+			plugin.getTimer().schedule(new TimerTask() {
+
+				@Override
+				public void run() {
+					if (VotingPluginMain.plugin != null) {
+						if (!plugin.getConfigFile().isDisableCoolDownCheck() && RewardHandler.getInstance()
+								.hasRewards(plugin.getSpecialRewardsConfig().getData(), "VoteCoolDownEndedReward")) {
+							for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+								if (VotingPluginMain.plugin != null) {
+									VotingPluginUser user = UserManager.getInstance()
+											.getVotingPluginUser(new UUID(uuid));
+									if (user.getUserData().hasData() && user.hasLoggedOnBefore()) {
+										user.checkCoolDownEvents();
+									}
+								} else {
+									cancel();
+								}
 							}
 						} else {
+							plugin.debug("Not enabling cooldown check reward");
 							cancel();
 						}
+					} else {
+						cancel();
 					}
-				} else {
-					cancel();
 				}
-			}
-		}, 1000 * 60 * 3);
+			}, 1000 * 60 * 5, 1000 * 60 * 30);
+		} else {
+			plugin.debug("Not enabling cooldown check reward");
+		}
 
 	}
 

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

@@ -71,6 +71,10 @@ public class PlayerVoteEvent extends Event {
 	@Getter
 	@Setter
 	private VotingPluginUser votingPluginUser;
+	
+	@Getter
+	@Setter
+	private boolean wasOnline;
 
 	public PlayerVoteEvent(VoteSite voteSite, String voteUsername, String serviceSite, boolean realVote) {
 		super(true);

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

@@ -42,15 +42,29 @@ public class PlayerJoinEvent implements Listener {
 				&& VotingPluginMain.plugin.getMysql() == null)) {
 			return;
 		}
-		Player player = event.getPlayer();
 
+		int delay = plugin.getConfigFile().getDelayLoginEvent();
+		if (delay <= 0) {
+			login(event.getPlayer());
+		} else {
+			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					login(event.getPlayer());
+				}
+			}, delay);
+		}
+
+	}
+
+	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();
 

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

@@ -143,8 +143,12 @@ public class PlayerVoteListener implements Listener {
 
 			if (((user.isOnline() || voteSite.isGiveOffline())
 					&& VotingPluginMain.plugin.getOptions().isProcessRewards()) || event.isBungee()) {
-				user.playerVote(voteSite, true, false, event.isForceBungee());
-				user.sendVoteEffects(true);
+				boolean online = true;
+				if (event.isBungee()) {
+					online = event.isWasOnline();
+				}
+				user.playerVote(voteSite, online, false, event.isForceBungee());
+				user.sendVoteEffects(online);
 				user.closeInv();
 			} else {
 				user.addOfflineVote(voteSite.getKey());

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

@@ -97,8 +97,8 @@ public class SpecialRewards {
 
 						if (gotCumulative) {
 							gotCumulativeAny = true;
+							plugin.debug(user.getPlayerName() + " got cumulative " + votesRequired + ", current total: " + total);
 							giveCumulativeVoteReward(user, user.isOnline(), votesRequired, forceBungee);
-							plugin.debug(user.getPlayerName() + " got cumulative " + votesRequired);
 						} else {
 							plugin.devDebug(user.getPlayerName() + " not able to get cumulative " + votesRequired);
 						}

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

@@ -216,10 +216,8 @@ public class TopVoterHandler implements Listener {
 				}
 			}
 
-			if (plugin.getConfigFile().getStoreTopVotersMonthly()) {
-				plugin.getLogger().info("Saving TopVoters Monthly");
-				storeTopVoters(TopVoter.Monthly);
-			}
+			plugin.getLogger().info("Saving TopVoters Monthly");
+			storeTopVoters(TopVoter.Monthly);
 
 			try {
 				if (plugin.getSpecialRewardsConfig().isEnableMonthlyAwards()) {
@@ -253,8 +251,6 @@ public class TopVoterHandler implements Listener {
 				e.printStackTrace();
 			}
 
-			resetTotals(TopVoter.Monthly);
-
 			if (plugin.getSpecialRewardsConfig().getResetMilestonesMonthly()) {
 				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
@@ -264,6 +260,8 @@ public class TopVoterHandler implements Listener {
 
 			}
 
+			resetTotals(TopVoter.Monthly);
+
 			if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
 				plugin.getMysql().clearCache();
 			}

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

@@ -193,7 +193,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		}
 	}
 
-	public void bungeeVotePluginMessaging(String service, long time, BungeeMessageData text, boolean setTotals) {
+	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);
 
@@ -205,6 +205,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			voteEvent.setTime(time);
 			voteEvent.setAddTotals(setTotals);
 			voteEvent.setBungeeTextTotals(text);
+			voteEvent.setWasOnline(wasOnline);
 			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 				@Override
@@ -275,13 +276,13 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 
 			if (!voteSite.isVoteDelayDaily()) {
 				double votedelay = voteSite.getVoteDelay();
+				double voteDelayMin = voteSite.getVoteDelayMin();
 
-				if (votedelay == 0) {
+				if (votedelay == 0 && voteDelayMin == 0) {
 					return false;
 				}
 
-				LocalDateTime nextvote = lastVote.plusHours((long) votedelay)
-						.plusMinutes((long) voteSite.getVoteDelayMin());
+				LocalDateTime nextvote = lastVote.plusHours((long) votedelay).plusMinutes((long) voteDelayMin);
 
 				return now.isAfter(nextvote);
 			} else {
@@ -726,7 +727,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			ArrayList<String> offlineVotes = getOfflineVotes();
 			// plugin.debug(ArrayUtils.getInstance().makeStringList(offlineVotes));
 			if (offlineVotes.size() > 0) {
-				sendVoteEffects(true);
+				sendVoteEffects(false);
 				setOfflineVotes(new ArrayList<String>());
 			}