Update version number to 6.9.4

VotingPlugin/Resources/Config.yml

@@ -109,6 +109,7 @@ Format:
 
   # Broadcast vote message
   # Set to an empty message to disable
+  # Use %NewLine% for a new line
   BroadcastMsg: '&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %SiteName%'
   # If true uses broadcast setting below for offline votes
   OnlyOneOfflineBroadcast: false
@@ -382,7 +383,7 @@ DisableCoolDownCheck: false
 DisableInteractEvent: false
 
 # Delays login event, delays vote reminding and more
-# In ticks
+# In miliseconds, 1000 = 1 second
 DelayLoginEvent: 0
 
 # If false, votestreaks will be disabled
@@ -440,32 +441,6 @@ PreventRepeatMilestones: false
 # This is to prevent any possible exploits
 CloseInventoryOnVote: true
 
-# When enabled the command /vote setprimaryaccount (playername)
-# will be shown (after restart)
-# Primary account will be used instead of the players account to get
-# placeholder and other data such as vote reminding
-# 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
-
-# Enable auto caching placeholders
-# Generally this works well, but if you need to cache placeholders manually set them below
-AutoCachePlaceholders: false
-
-# Set which placeholders to cache at all times
-# Use for placeholders to are pulled constantly or on the main thread
-# Mainly aimed for scoreboards
-# Placeholders may auto cache in certain conditions
-# Will use additional memory, but not a lot
-# Still in early stages, please report bugs
-# Please remove VotingPlugin_ from the placeholder listed here
-CachedPlaceholders: []
-#- Total_AllTime
-
 # If true, permissions will be handled differently
 MultiplePermissionsCheck: false
 
@@ -487,6 +462,40 @@ CustomCommands:
     # Forces player to run this command
     Commands:
     - tokencommand
+    
+# ---------------------------------------
+# Placeholderapi placeholders settings
+# ---------------------------------------
+
+# When enabled the command /vote setprimaryaccount (playername)
+# will be shown (after restart)
+# Primary account will be used instead of the players account to get
+# placeholder and other data such as vote reminding
+# 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
+
+# Always force placeholders to be processed and return a proper value
+# This has small chance of crashing the server (mainly with mysql and using placeholders on main thread)
+AlwaysProcessPlaceholders: false
+
+# Enable auto caching placeholders
+# Generally this works well, but if you need to cache placeholders manually set them below
+AutoCachePlaceholders: false
+
+# Set which placeholders to cache at all times
+# Use for placeholders to are pulled constantly or on the main thread
+# Mainly aimed for scoreboards
+# Placeholders may auto cache in certain conditions
+# Will use additional memory, but not a lot
+# Still in early stages, please report bugs
+# Please remove VotingPlugin_ from the placeholder listed here
+CachedPlaceholders: []
+#- Total_AllTime
 
 ######################
 # Debug

VotingPlugin/Resources/GUI.yml

@@ -138,6 +138,7 @@ CHEST:
     # %time% = time, using timeformat below
     # %timesince% = time since vote
     Line: '&6%timeSince%'
+    ClickableLinks: true
   VoteNext:
     Name: 'VoteNext: %player%'
     BackButton: true

VotingPlugin/Resources/SpecialRewards.yml

@@ -33,7 +33,7 @@ Cumulative:
   # Can have multiple listed here
   '20':
     Enabled: false
-    # Wether or not votes must be made in same day/week
+    # Whether 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
     # Valid options
@@ -42,6 +42,11 @@ Cumulative:
     # Weekly
     # Daily
     TotalToUse: AllTime
+    # Blacklist recurring votes
+    #BlackList:
+    #- 40
+    # Whether or not to gives cumulative reward for every x number of votes, default: true
+    #Recurring: true
     Rewards: 
       Messages:
         Player: '&aYou got %cumulative% cumulative votes!'

VotingPlugin/Resources/bungeeconfig.yml

@@ -12,6 +12,7 @@ Password: ''
 # Max number of connections
 MaxConnections: 1
 # Table name prefix, for use with mutliple servers
+# Don't use with PLUGINMESSAGING bungee setup
 Prefix: ''
 #UseSSL: true
 #PublicKeyRetrieval: false
@@ -50,10 +51,6 @@ PointsOnVote: 1
 # Recommened to leave true, setting to false setups are currently unsupported
 BungeeManageTotals: true
 
-# Support for redis
-# experimental
-RedisSupport: false
-
 # Tell servers to broadcast
 # Set DisableBroadcast to true on spigot servers (BungeeSettings.yml) as well
 Broadcast: true
@@ -90,4 +87,29 @@ WaitForUserOnline: false
 # ONLY for SOCKET method
 # ----------------------------
 # Options available here:
-# https://github.com/BenCodez/VotingPlugin/wiki/Bungee-Setup-SOCKETS
+# https://github.com/BenCodez/VotingPlugin/wiki/Bungee-Setup-SOCKETS
+
+
+# ----------------------------
+# Redis setup
+# Experimental
+# Primary server for redis needs votifier
+# Set socket host on each proxy and redissockets on primary redis only
+# All servers on pluginmessaging
+# ----------------------------
+
+# Support for redis
+# experimental
+RedisSupport: false
+
+# Enable on primary server with votifier
+PrimaryServer: false
+
+RedisSocketHost:
+  Host: 0.0.0.0
+  Port: 1234
+
+RedisServers:
+  secondproxy:
+    Host: 0.0.0.0
+    Port: 1235

VotingPlugin/Resources/plugin.yml

@@ -16,7 +16,7 @@ softdepend:
 - MVdWPlaceholderAPI
 - AuthMe
 - SuperVanish
-- PremiumVanishs
+- PremiumVanish
 - DiscordSRV
 loadbefore:
 - MCPerks

VotingPlugin/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>votingplugin</artifactId>
-	<version>6.9</version>
+	<version>6.9.4</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -226,7 +226,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.18.2-R0.1-SNAPSHOT</version>
+			<version>1.19.2-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

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

@@ -308,7 +308,13 @@ public class BungeeHandler implements Listener {
 
 			socketHandler = new SocketHandler(plugin.getVersion(), plugin.getBungeeSettings().getSpigotServerHost(),
 					plugin.getBungeeSettings().getSpigotServerPort(), encryptionHandler,
-					plugin.getBungeeSettings().isBungeeDebug());
+					plugin.getBungeeSettings().isBungeeDebug()) {
+
+				@Override
+				public void log(String str) {
+					plugin.getLogger().info(str);
+				}
+			};
 
 			socketHandler.add(new SocketReceiver("bungeevote") {
 

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

@@ -1019,7 +1019,13 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		topVoterHandler.register();
 
-		metrics();
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				metrics();
+			}
+		});
 
 		// javascript api
 		getJavascriptEngineRequests().add(new JavascriptPlaceholderRequest("User") {
@@ -1049,10 +1055,11 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			public String onRewardRequest(Reward reward, com.bencodez.advancedcore.api.user.AdvancedCoreUser user,
 					int num, HashMap<String, String> placeholders) {
 				VotingPluginUser vpUser = UserManager.getInstance().getVotingPluginUser(user);
-				vpUser.addPoints(num);
-				return null;
+				String str = "" + vpUser.addPoints(num);
+				debug("Setting points to " + str);
+				return str;
 			}
-		}.synchronize().addEditButton(
+		}.synchronize().asPlaceholder("newpoints").addEditButton(
 				new EditGUIButton(new ItemBuilder(Material.PAPER), new EditGUIValueNumber("Points", null) {
 
 					@Override

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

@@ -53,6 +53,14 @@ public class Config {
 		return getData().getInt("BungeeServer.Port", 1297);
 	}
 
+	public int getRedisSocketHostPort() {
+		return getData().getInt("RedisSocketHost.Port", 1297);
+	}
+
+	public String getRedisSocketHostHost() {
+		return getData().getString("RedisSocketHost.Host", "");
+	}
+
 	public boolean getDebug() {
 		return getData().getBoolean("Debug", false);
 	}
@@ -73,6 +81,14 @@ public class Config {
 		return getData().getSection("SpigotServers." + s);
 	}
 
+	public Configuration getRedisServersConfiguration(String s) {
+		return getData().getSection("RedisServers." + s);
+	}
+
+	public Collection<String> getRedisServers() {
+		return getData().getSection("RedisServers").getKeys();
+	}
+
 	public Collection<String> getSpigotServers() {
 		return getData().getSection("SpigotServers").getKeys();
 	}
@@ -81,6 +97,10 @@ public class Config {
 		return getData().getBoolean("WaitForUserOnline", false);
 	}
 
+	public boolean getPrimaryServer() {
+		return getData().getBoolean("PrimaryServer", false);
+	}
+
 	public boolean getVotePartyEnabled() {
 		return getData().getBoolean("VoteParty.Enabled", false);
 	}

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

@@ -9,6 +9,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 
+@Deprecated
 public class RedisBungee implements Listener {
 	@Getter
 	private boolean enabled;

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

@@ -26,7 +26,7 @@ public class VoteEventBungee implements net.md_5.bungee.api.plugin.Listener {
 					serviceSite = "Empty";
 				}
 
-				plugin.vote(vote.getUsername(), serviceSite, true);
+				plugin.vote(vote.getUsername(), serviceSite, true, null, null);
 			}
 		});
 

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

@@ -63,6 +63,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 	private HashMap<String, ClientHandler> clientHandles;
 
+	private HashMap<String, ClientHandler> redisClientHandles;
+
 	@Getter
 	private Config config;
 
@@ -78,13 +80,12 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 	private SocketHandler socketHandler;
 
+	private SocketHandler redisSocketHandler;
+
 	private VoteCache voteCacheFile;
 
 	private boolean votifierEnabled = true;
 
-	@Getter
-	private RedisBungee redis;
-
 	@Getter
 	private TimeHandle timeHandle;
 
@@ -338,9 +339,6 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		if (mysql != null) {
 			mysql.shutdown();
 		}
-		if (redis != null) {
-			redis.destroy();
-		}
 		getLogger().info("VotingPlugin disabled");
 	}
 
@@ -363,12 +361,6 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		config = new Config(this);
 		config.load();
 
-		try {
-			redis = new RedisBungee(this);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
 		getProxy().getPluginManager().registerCommand(this, new VotingPluginBungeeCommand(this));
 
 		boolean mysqlLoaded = true;
@@ -473,7 +465,13 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				encryptionHandler = new EncryptionHandler(new File(getDataFolder(), "secretkey.key"));
 
 				socketHandler = new SocketHandler(getDescription().getVersion(), config.getBungeeHost(),
-						config.getBungeePort(), encryptionHandler, config.getDebug());
+						config.getBungeePort(), encryptionHandler, config.getDebug()) {
+
+					@Override
+					public void log(String str) {
+						getLogger().info(str);
+					}
+				};
 
 				socketHandler.add(new SocketReceiver() {
 
@@ -514,11 +512,46 @@ public class VotingPluginBungee extends Plugin implements Listener {
 					}
 				}
 			}
+			currentVotePartyVotesRequired = getConfig().getVotePartyVotesRequired()
+					+ voteCacheFile.getVotePartyInreaseVotesRequired();
+			votePartyVotes = voteCacheFile.getVotePartyCurrentVotes();
 		}
 
-		currentVotePartyVotesRequired = getConfig().getVotePartyVotesRequired()
-				+ voteCacheFile.getVotePartyInreaseVotesRequired();
-		votePartyVotes = voteCacheFile.getVotePartyCurrentVotes();
+		if (getConfig().getRedisSupport()) {
+			redisSocketHandler = new SocketHandler(getDescription().getVersion(), config.getRedisSocketHostHost(),
+					config.getRedisSocketHostPort(), encryptionHandler, config.getDebug()) {
+
+				@Override
+				public void log(String str) {
+					getLogger().info(str);
+				}
+			};
+
+			redisSocketHandler.add(new SocketReceiver() {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 8) {
+						if (data[0].equalsIgnoreCase("Vote")) {
+							// todo
+							// sendRedisServerMessage("Vote", uuid, player, service, "" + votePartyVotes,""
+							// + currentVotePartyVotesRequired, "" + time, "" + realVote, text.toString());
+							vote(data[2], data[3], Boolean.valueOf(data[7]), new BungeeMessageData(data[8]), data[1]);
+						}
+					}
+
+				}
+			});
+
+			clientHandles = new HashMap<String, ClientHandler>();
+			for (
+
+			String s : config.getRedisServers()) {
+				Configuration d = config.getRedisServersConfiguration(s);
+				redisClientHandles.put(s, new ClientHandler(d.getString("Host", ""), d.getInt("Port", 1234),
+						encryptionHandler, config.getDebug()));
+			}
+		}
 
 		BStatsMetricsBungee metrics = new BStatsMetricsBungee(this, 9453);
 
@@ -569,11 +602,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 	public boolean isOnline(ProxiedPlayer p) {
 		if (p != null) {
-			if (redis != null && redis.isEnabled()) {
-				return redis.isOnline(p);
-			} else {
-				return p.isConnected();
-			}
+			return p.isConnected();
 		}
 
 		return false;
@@ -718,6 +747,12 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		}
 	}
 
+	public void sendRedisServerMessage(String... messageData) {
+		for (ClientHandler h : redisClientHandles.values()) {
+			h.sendMessage(messageData);
+		}
+	}
+
 	public void sendServerMessageServer(String server, String... messageData) {
 		if (clientHandles.containsKey(server)) {
 			clientHandles.get(server).sendMessage(messageData);
@@ -778,14 +813,17 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		}
 	}
 
-	public synchronized void vote(String player, String service, boolean realVote) {
+	public synchronized void vote(String player, String service, boolean realVote, BungeeMessageData text,
+			String uuid) {
 		try {
 			if (player == null || player.isEmpty()) {
 				getLogger().info("No name from vote on " + service);
 				return;
 			}
 
-			String uuid = getUUID(player);
+			if (uuid == null) {
+				uuid = getUUID(player);
+			}
 			if (uuid.isEmpty()) {
 				if (config.getAllowUnJoined()) {
 					debug("Fetching UUID online, since allowunjoined is enabled");
@@ -810,43 +848,42 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 			player = getProperName(uuid, player);
 
-			BungeeMessageData text = null;
+			if (!getConfig().getPrimaryServer()) {
+				addVoteParty();
+				if (getConfig().getBungeeManageTotals()) {
 
-			addVoteParty();
+					if (mysql == null) {
+						getLogger().severe("Mysql is not loaded correctly, stopping vote processing");
+						return;
+					}
 
-			if (getConfig().getBungeeManageTotals()) {
+					// one time query to insert player
+					if (!mysql.getUuids().contains(uuid)) {
+						mysql.update(uuid, "PlayerName", new DataValueString(player));
+					}
 
-				if (mysql == null) {
-					getLogger().severe("Mysql is not loaded correctly, stopping vote processing");
-					return;
+					ArrayList<Column> data = mysql.getExactQuery(new Column("uuid", new DataValueString(uuid)));
+
+					int allTimeTotal = getValue(data, "AllTimeTotal", 1);
+					int monthTotal = getValue(data, "MonthTotal", 1);
+					int weeklyTotal = getValue(data, "WeeklyTotal", 1);
+					int dailyTotal = getValue(data, "DailyTotal", 1);
+					int points = getValue(data, "Points", getConfig().getPointsOnVote());
+					int milestoneCount = getValue(data, "MilestoneCount", 1);
+					text = new BungeeMessageData(allTimeTotal, monthTotal, weeklyTotal, dailyTotal, points,
+							milestoneCount, votePartyVotes, currentVotePartyVotesRequired);
+					ArrayList<Column> update = new ArrayList<Column>();
+					update.add(new Column("AllTimeTotal", new DataValueInt(allTimeTotal)));
+					update.add(new Column("MonthTotal", new DataValueInt(monthTotal)));
+					update.add(new Column("WeeklyTotal", new DataValueInt(weeklyTotal)));
+					update.add(new Column("DailyTotal", new DataValueInt(dailyTotal)));
+					update.add(new Column("Points", new DataValueInt(points)));
+					update.add(new Column("MilestoneCount", new DataValueInt(milestoneCount)));
+					debug("Setting totals " + text.toString());
+					mysql.update(uuid, update);
+				} else {
+					text = new BungeeMessageData(0, 0, 0, 0, 0, 0, votePartyVotes, currentVotePartyVotesRequired);
 				}
-
-				// one time query to insert player
-				if (!mysql.getUuids().contains(uuid)) {
-					mysql.update(uuid, "PlayerName", new DataValueString(player));
-				}
-
-				ArrayList<Column> data = mysql.getExactQuery(new Column("uuid", new DataValueString(uuid)));
-
-				int allTimeTotal = getValue(data, "AllTimeTotal", 1);
-				int monthTotal = getValue(data, "MonthTotal", 1);
-				int weeklyTotal = getValue(data, "WeeklyTotal", 1);
-				int dailyTotal = getValue(data, "DailyTotal", 1);
-				int points = getValue(data, "Points", getConfig().getPointsOnVote());
-				int milestoneCount = getValue(data, "MilestoneCount", 1);
-				text = new BungeeMessageData(allTimeTotal, monthTotal, weeklyTotal, dailyTotal, points, milestoneCount,
-						votePartyVotes, currentVotePartyVotesRequired);
-				ArrayList<Column> update = new ArrayList<Column>();
-				update.add(new Column("AllTimeTotal", new DataValueInt(allTimeTotal)));
-				update.add(new Column("MonthTotal", new DataValueInt(monthTotal)));
-				update.add(new Column("WeeklyTotal", new DataValueInt(weeklyTotal)));
-				update.add(new Column("DailyTotal", new DataValueInt(dailyTotal)));
-				update.add(new Column("Points", new DataValueInt(points)));
-				update.add(new Column("MilestoneCount", new DataValueInt(milestoneCount)));
-				debug("Setting totals " + text.toString());
-				mysql.update(uuid, update);
-			} else {
-				text = new BungeeMessageData(0, 0, 0, 0, 0, 0, votePartyVotes, currentVotePartyVotesRequired);
 			}
 
 			long time = LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
@@ -863,6 +900,9 @@ public class VotingPluginBungee extends Plugin implements Listener {
 								forceCache = true;
 								debug("Forcing vote to cache");
 							}
+							if (config.getBroadcast()) {
+								sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
+							}
 							if (info.getPlayers().isEmpty() || forceCache) {
 								// cache
 								if (!cachedVotes.containsKey(s)) {
@@ -881,9 +921,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 										"" + getConfig().getBungeeManageTotals(),
 										"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast());
 							}
-							if (config.getBroadcast()) {
-								sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
-							}
+
 						}
 					}
 				} else {
@@ -906,16 +944,21 @@ public class VotingPluginBungee extends Plugin implements Listener {
 						debug("Caching online vote for " + player + " on " + service);
 					}
 					for (String s : getProxy().getServers().keySet()) {
-						sendPluginMessageServer(s, "VoteUpdate", uuid, "" + votePartyVotes,
-								"" + currentVotePartyVotesRequired);
 						if (config.getBroadcast()) {
 							sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
 						}
+						sendPluginMessageServer(s, "VoteUpdate", uuid, "" + votePartyVotes,
+								"" + currentVotePartyVotesRequired);
+
 					}
 				}
 			} else if (method.equals(BungeeMethod.SOCKETS)) {
 				sendSocketVote(player, service, text);
 			}
+			if (getConfig().getRedisSupport() && getConfig().getPrimaryServer()) {
+				sendRedisServerMessage("Vote", uuid, player, service, "" + votePartyVotes,
+						"" + currentVotePartyVotesRequired, "" + time, "" + realVote, text.toString());
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

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

@@ -18,17 +18,17 @@ public class VotingPluginBungeeCommand extends Command {
 			if (args.length > 0) {
 				if (args[0].equalsIgnoreCase("reload")) {
 					bungee.reload(false);
-					sender.sendMessage(new TextComponent("&aReloading VotingPluginBungee"));
+					sender.sendMessage(new TextComponent("Reloading VotingPluginBungee"));
 				}
 				if (args[0].equalsIgnoreCase("reloadmysql")) {
 					bungee.reload(true);
-					sender.sendMessage(new TextComponent("&aReloading VotingPluginBungee with MySQL"));
+					sender.sendMessage(new TextComponent("Reloading VotingPluginBungee with MySQL"));
 				}
 				if (args[0].equalsIgnoreCase("vote")) {
 					if (args.length >= 2) {
 						String user = args[1];
 						String site = args[2];
-						bungee.vote(user, site, false);
+						bungee.vote(user, site, false, null, null);
 						sender.sendMessage(new TextComponent("Sending vote"));
 					}
 				}

VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/VotingPluginVelocity.java

@@ -142,8 +142,9 @@ public class VotingPluginVelocity {
 							}
 							if (p == null || !p.isActive()) {
 								toSend = false;
-							} else if (p != null && p.isActive() && !p.getCurrentServer().get().getServerInfo()
-									.getName().equals(serverToCheck.getServerInfo().getName())) {
+							} else if (p != null && p.isActive()
+									&& (!p.getCurrentServer().isPresent() || !p.getCurrentServer().get().getServerInfo()
+											.getName().equals(serverToCheck.getServerInfo().getName()))) {
 								toSend = false;
 							}
 
@@ -531,7 +532,13 @@ public class VotingPluginVelocity {
 
 				socketHandler = new SocketHandler(
 						server.getPluginManager().getPlugin("votingplugin").get().getDescription().getVersion().get(),
-						config.getBungeeHost(), config.getBungeePort(), encryptionHandler, config.getDebug());
+						config.getBungeeHost(), config.getBungeePort(), encryptionHandler, config.getDebug()) {
+
+					@Override
+					public void log(String str) {
+						getLogger().info(str);
+					}
+				};
 
 				socketHandler.add(new SocketReceiver() {
 
@@ -572,11 +579,13 @@ public class VotingPluginVelocity {
 					}
 				}
 			}
+			
+			currentVotePartyVotesRequired = getConfig().getVotePartyVotesRequired()
+					+ voteCacheFile.getVotePartyInreaseVotesRequired();
+			votePartyVotes = voteCacheFile.getVotePartyCurrentVotes();
 		}
 
-		currentVotePartyVotesRequired = getConfig().getVotePartyVotesRequired()
-				+ voteCacheFile.getVotePartyInreaseVotesRequired();
-		votePartyVotes = voteCacheFile.getVotePartyCurrentVotes();
+		
 
 		try {
 			getVersionFile();

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

@@ -371,14 +371,14 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						user.cache();
-						int newTotal = 0;
 						synchronized (pointLock) {
+							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+							user.cache();
+							int newTotal = 0;
 							newTotal = user.addPoints(Integer.parseInt(args[3]));
+							sender.sendMessage(StringParser.getInstance().colorize("&cGave " + args[1] + " " + args[3]
+									+ " points" + ", " + args[1] + " now has " + newTotal + " points"));
 						}
-						sender.sendMessage(StringParser.getInstance().colorize("&cGave " + args[1] + " " + args[3]
-								+ " points" + ", " + args[1] + " now has " + newTotal + " points"));
 					}
 				});
 
@@ -909,6 +909,32 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "VoteExact", "(PlayerExact)", "(Sitename)" },
+						"VotingPlugin.Commands.AdminVote.VoteExact|" + adminPerm,
+						"Trigger manual vote with exact player name") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[2], true), args[1],
+								args[2], false);
+						sendMessage(sender, "&cTriggering vote...");
+						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)", },
 				"VotingPlugin.Commands.AdminVote.Vote|" + adminPerm, "Trigger manual vote via GUI", false) {
 
@@ -1254,8 +1280,8 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						plugin.getServerData().setVotePartyExtraRequired(Integer.parseInt(args[1]));
-						sendMessage(sender, "&cSet VotePartyExtraRequired to " + args[1]);
+						plugin.getServerData().setVotePartyExtraRequired(Integer.parseInt(args[2]));
+						sendMessage(sender, "&cSet VotePartyExtraRequired to " + args[2]);
 					}
 				});
 
@@ -2010,7 +2036,7 @@ public class CommandLoader {
 			}
 		});
 
-		if (plugin.getGui().isLastMonthGUI()) {
+		if (plugin.getGui().isLastMonthGUI() || plugin.getOptions().getDebug().equals(DebugLevel.DEV)) {
 			plugin.getVoteCommand()
 					.add(new CommandHandler(new String[] { "LastMonthTop" },
 							"VotingPlugin.Commands.Vote.LastMonthTop|" + playerPerm,

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

@@ -65,6 +65,7 @@ public class AdminGUI {
 							plugin.getConfigVoteSites().generateVoteSite(value);
 							player.sendMessage("Generated site");
 							plugin.reload();
+							openAdminGUIVoteSiteSite(player, plugin.getVoteSite(value, true));
 						}
 					});
 				} else {

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

@@ -15,6 +15,7 @@ import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
+import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteLast extends GUIHandler {
@@ -67,8 +68,24 @@ public class VoteLast extends GUIHandler {
 								.setLore(user.voteCommandLastGUILine(site)).setAmountNone(1), 1000, 1000) {
 
 							@Override
-							public void onClick(ClickEvent clickEvent) {
+							public void onClick(ClickEvent event) {
+								if (plugin.getGui().isChestVoteLastClickableLinks()) {
+									Player player = event.getPlayer();
+									if (player != null) {
+										VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
+										user.sendMessage(
+												StringParser.getInstance()
+														.replacePlaceHolder(
+																StringParser.getInstance().replacePlaceHolder(
+																		StringParser.getInstance()
+																				.replacePlaceHolder(plugin.getGui()
+																						.getChestVoteURLURLText(),
+																						"voteurl", site.getVoteURL()),
+																		"sitename", site.getDisplayName()),
+																"player", player.getName()));
 
+									}
+								}
 							}
 
 							@Override

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

@@ -73,6 +73,10 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean alwaysWaitForCachePlaceholders = false;
 
+	@ConfigDataBoolean(path = "AlwaysProcessPlaceholders")
+	@Getter
+	private boolean alwaysProcessPlaceholders = false;
+
 	@ConfigDataBoolean(path = "AutoCreateVoteSites")
 	@Getter
 	private boolean autoCreateVoteSites = true;
@@ -89,10 +93,6 @@ 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;

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

@@ -130,12 +130,12 @@ public class ConfigVoteSites extends YMLFile {
 	 * @param siteName the site name
 	 * @return the vote delay
 	 */
-	public int getVoteDelay(String siteName) {
-		return getData(siteName).getInt("VoteDelay", 24);
+	public double getVoteDelay(String siteName) {
+		return getData(siteName).getDouble("VoteDelay", 24);
 	}
 
-	public int getVoteDelayMin(String siteName) {
-		return getData(siteName).getInt("VoteDelayMin", 0);
+	public double getVoteDelayMin(String siteName) {
+		return getData(siteName).getDouble("VoteDelayMin", 0);
 	}
 
 	/**
@@ -199,7 +199,9 @@ public class ConfigVoteSites extends YMLFile {
 					if (!siteCheck(site)) {
 						plugin.getLogger().warning("Failed to load site " + site + ", see above");
 					} else {
-						voteSites.add(new VoteSite(plugin, site));
+						VoteSite voteSite = new VoteSite(plugin, site);
+						plugin.debug(voteSite.loadingDebug());
+						voteSites.add(voteSite);
 					}
 				}
 			}
@@ -393,7 +395,7 @@ public class ConfigVoteSites extends YMLFile {
 	 * @param siteName  the site name
 	 * @param voteDelay the vote delay
 	 */
-	public void setVoteDelay(String siteName, int voteDelay) {
+	public void setVoteDelay(String siteName, double voteDelay) {
 		set(siteName, "VoteDelay", voteDelay);
 	}
 

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

@@ -146,6 +146,10 @@ public class GUI extends YMLFile {
 	@Getter
 	private boolean lastMonthGUI = false;
 
+	@ConfigDataBoolean(path = "CHEST.VoteLast.ClickableLinks")
+	@Getter
+	private boolean chestVoteLastClickableLinks = true;
+
 	private VotingPluginMain plugin;
 
 	public GUI(VotingPluginMain plugin) {

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

@@ -3,6 +3,7 @@ package com.bencodez.votingplugin.config;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import com.bencodez.advancedcore.api.yml.YMLFile;
@@ -91,6 +92,14 @@ public class SpecialRewardsConfig extends YMLFile {
 		return "Cumulative." + cumulative + ".Rewards";
 	}
 
+	public List<Integer> getCumulativeBlackList(int cumulative) {
+		return getData().getIntegerList("Cumulative." + cumulative + ".BlackList");
+	}
+
+	public boolean getCumulativeRecurring(int cumulative) {
+		return getData().getBoolean("Cumulative." + cumulative + ".Recurring", true);
+	}
+
 	/**
 	 * Gets the cumulative votes.
 	 *

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

@@ -66,18 +66,7 @@ public class PlayerJoinEvent implements Listener {
 			return;
 		}
 
-		int delay = plugin.getConfigFile().getDelayLoginEvent();
-		if (delay <= 0) {
-			login(event.getPlayer());
-		} else {
-			plugin.getLoginTimer().schedule(new TimerTask() {
-
-				@Override
-				public void run() {
-					login(event.getPlayer());
-				}
-			}, delay);
-		}
+		login(event.getPlayer());
 
 	}
 

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

@@ -3,6 +3,8 @@ package com.bencodez.votingplugin.listeners;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
+import java.util.TimerTask;
+import java.util.UUID;
 
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
@@ -200,9 +202,10 @@ public class PlayerVoteListener implements Listener {
 			plugin.getSpecialRewards().checkCumualativeVotes(user, event.getBungeeTextTotals(), event.isForceBungee());
 			plugin.getSpecialRewards().checkMilestone(user, event.getBungeeTextTotals(), event.isForceBungee());
 
+			final String uuid = user.getUUID();
 			if (plugin.getBungeeSettings().isUseBungeecoord()) {
 				if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.MYSQL)) {
-					final String uuid = user.getUUID();
+
 					Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
 
 						@Override
@@ -214,14 +217,24 @@ public class PlayerVoteListener implements Listener {
 					}, 40);
 				}
 			}
-			if (!user.isOnline()) {
-				user.clearCache();
-			}
-		}
 
-		PlayerPostVoteEvent postVoteEvent = new PlayerPostVoteEvent(voteSite, user, event.isRealVote(),
-				event.isForceBungee());
-		plugin.getServer().getPluginManager().callEvent(postVoteEvent);
+			PlayerPostVoteEvent postVoteEvent = new PlayerPostVoteEvent(voteSite, user, event.isRealVote(),
+					event.isForceBungee());
+			plugin.getServer().getPluginManager().callEvent(postVoteEvent);
+
+			plugin.getTimer().schedule(new TimerTask() {
+
+				@Override
+				public void run() {
+					VotingPluginUser user = plugin.getVotingPluginUserManager()
+							.getVotingPluginUser(UUID.fromString(uuid));
+					if (!user.isOnline()) {
+						user.clearCache();
+					}
+				}
+			}, 1000 * 5);
+
+		}
 
 		plugin.setUpdate(true);
 	}

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

@@ -91,7 +91,7 @@ public class VotiferEvent implements Listener {
 
 				if (plugin.getConfigFile().isAutoCreateVoteSites() && createSite) {
 					plugin.getLogger().warning("VoteSite with service site '" + voteSiteNameStr
-							+ "' does not exist, attempting to generaterate...");
+							+ "' does not exist, attempting to generate...");
 					plugin.getConfigVoteSites().generateVoteSite(voteSiteNameStr);
 
 					plugin.getLogger().info("Current known service sites: "

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

@@ -239,4 +239,19 @@ public class VoteSite {
 		return ArrayUtils.getInstance().containsIgnoreCase(plugin.getServerData().getServiceSites(), getServiceSite());
 	}
 
+	public String loadingDebug() {
+		String str = "Loading votesite key: " + key;
+		str += ", Displayname: " + displayName;
+		str += ", VoteDelay: " + getVoteDelay();
+		str += ", VoteDelayMin: " + getVoteDelayMin();
+		str += ", VoteDelayDaily: " + isVoteDelayDaily();
+		str += ", IsWaitUntilVoteDelay: " + isWaitUntilVoteDelay();
+		str += ", ServiceSite: " + getServiceSite();
+		str += ", TimeOffSet:" + getTimeOffSet();
+		str += ", Url: " + getVoteURL();
+		str += ", IgnoreCanVote: " + isIgnoreCanVote();
+		str += ", Hidden: " + isHidden();
+		return str;
+	}
+
 }

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

@@ -85,7 +85,9 @@ public class PlaceHolders {
 					if (plugin.getConfigFile().isAutoCachePlaceholders()) {
 						placeholdersToSetCacheOn.add(identifier);
 					}
-					return "..";
+					if (!plugin.getConfigFile().isAlwaysProcessPlaceholders()) {
+						return "..";
+					}
 				}
 			}
 		}
@@ -103,7 +105,11 @@ public class PlaceHolders {
 						if (cache.containsKey(p.getUniqueId())) {
 							return cache.get(p.getUniqueId());
 						} else {
-							return "....";
+							if (!plugin.getConfigFile().isAlwaysProcessPlaceholders()) {
+								return "....";
+							} else {
+								return placeholder.placeholderRequest(user, identifier);
+							}
 						}
 					} else {
 						return placeholder.placeholderRequest(user, identifier);
@@ -766,7 +772,7 @@ public class PlaceHolders {
 								for (String ident : placeholder.getCache().keySet()) {
 									placeholder.getCache().get(ident).put(vpUser.getJavaUUID(),
 											placeholder.placeholderRequest(vpUser, ident));
-									plugin.devDebug("Updated cache for " + vpUser.getUUID() + " on " + key);
+									plugin.devDebug("Updated placeholder cache for " + vpUser.getUUID() + " on " + key);
 
 								}
 

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

@@ -2,6 +2,7 @@ package com.bencodez.votingplugin.specialrewards;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 import org.bukkit.Bukkit;
@@ -86,8 +87,25 @@ public class SpecialRewards {
 							}
 						}
 
-						if (total != 0 && total >= votesRequired) {
-							if ((total % votesRequired) == 0) {
+						List<Integer> blackList = plugin.getSpecialRewardsConfig()
+								.getCumulativeBlackList(votesRequired);
+						boolean blackListed = false;
+						for (Integer num : blackList) {
+							if (num.intValue() == total) {
+								blackListed = true;
+								plugin.extraDebug("Not giving cumulative " + votesRequired + " to "
+										+ user.getPlayerName() + " due to blacklist");
+							}
+						}
+
+						if (plugin.getSpecialRewardsConfig().getCumulativeRecurring(votesRequired)) {
+							if (total != 0 && total >= votesRequired) {
+								if ((total % votesRequired) == 0 && !blackListed) {
+									gotCumulative = true;
+								}
+							}
+						} else {
+							if (total == votesRequired) {
 								gotCumulative = true;
 							}
 						}

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

@@ -45,7 +45,7 @@ public class UserManager {
 		manager.addKey(new UserDataKeyInt("DayVoteStreak"));
 		manager.addKey(new UserDataKeyInt("BestDayVoteStreak"));
 		manager.addKey(new UserDataKeyString("DayVoteStreakLastUpdate").setColumnType("MEDIUMTEXT"));
-		manager.addKey(new UserDataKeyString("GottenMileStones").setColumnType("MEDIUMTEXT"));
+		manager.addKey(new UserDataKeyString("GottenMileStones").setColumnType("LONGTEXT"));
 		manager.addKey(new UserDataKeyString("Reminded").setColumnType("VARCHAR(5)"));
 		manager.addKey(new UserDataKeyString("DisableBroadcast").setColumnType("VARCHAR(5)"));
 		manager.addKey(new UserDataKeyInt("WeekVoteStreak"));

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

@@ -170,13 +170,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			voteEvent.setAddTotals(setTotals);
 			voteEvent.setBungeeTextTotals(text);
 			voteEvent.setVotingPluginUser(this);
-			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-				@Override
-				public void run() {
-					plugin.getServer().getPluginManager().callEvent(voteEvent);
-				}
-			});
+			plugin.getServer().getPluginManager().callEvent(voteEvent);
 		}
 	}
 
@@ -191,13 +185,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			voteEvent.setAddTotals(setTotals);
 			voteEvent.setBungeeTextTotals(text);
 			voteEvent.setVotingPluginUser(this);
-			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-				@Override
-				public void run() {
-					plugin.getServer().getPluginManager().callEvent(voteEvent);
-				}
-			});
+			plugin.getServer().getPluginManager().callEvent(voteEvent);
 		}
 	}
 
@@ -216,13 +204,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			voteEvent.setBungeeTextTotals(text);
 			voteEvent.setWasOnline(wasOnline);
 			voteEvent.setBroadcast(broadcast);
-			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-				@Override
-				public void run() {
-					plugin.getServer().getPluginManager().callEvent(voteEvent);
-				}
-			});
+			plugin.getServer().getPluginManager().callEvent(voteEvent);
 		}
 	}
 
@@ -920,7 +902,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	 * @param value the new points
 	 */
 	public void setPoints(int value) {
-		getUserData().setInt(getPointsPath(), value, !plugin.getBungeeSettings().isUseBungeecoord());
+		getUserData().setInt(getPointsPath(), value, false);
 	}
 
 	public void setPrimaryAccount(java.util.UUID uuid) {