Update version number to 6.9.2

VotingPlugin/Resources/Config.yml

@@ -383,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

VotingPlugin/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>votingplugin</artifactId>
-	<version>6.9.1</version>
+	<version>6.9.2</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-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/bungee/VotingPluginBungee.java

@@ -473,7 +473,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() {
 
@@ -862,6 +868,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)) {
@@ -880,9 +889,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 										"" + getConfig().getBungeeManageTotals(),
 										"" + BungeeVersion.getPluginMessageVersion(), "" + config.getBroadcast());
 							}
-							if (config.getBroadcast()) {
-								sendPluginMessageServer(s, "VoteBroadcast", uuid, player, service);
-							}
+
 						}
 					}
 				} else {
@@ -905,11 +912,12 @@ 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)) {

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

@@ -18,11 +18,11 @@ 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) {

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

@@ -531,7 +531,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() {
 

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

@@ -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) {
 

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/config/Config.java

@@ -89,10 +89,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/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/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);
 		}
 	}