Update version number to 6.11.1

VotingPlugin/Resources/Config.yml

@@ -379,6 +379,10 @@ StoreTopVoters:
 # Requires restart
 PerSiteCoolDownEvents: false
 
+# Queue votes during a time change (doesn't apply to bungee voting)
+# Votes will be given when time change is completed
+QueueVotesDuringTimeChange: false
+
 # If true vanished players are treated as if they are offline
 TreatVanishAsOffline: false
 

VotingPlugin/pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>votingplugin</artifactId>
-	<version>6.11</version>
+	<version>6.11.1</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>

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

@@ -211,7 +211,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	private boolean ymlError = false;
 
 	@Getter
-	private ScheduledExecutorService voteTimer = Executors.newScheduledThreadPool(1);
+	private ScheduledExecutorService voteTimer = Executors.newSingleThreadScheduledExecutor();
 
 	@Getter
 	private UserManager votingPluginUserManager;

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

@@ -119,7 +119,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 							boolean toSend = true;
 							if (getConfig().getWaitForUserOnline()) {
 								ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(cache.getUuid()));
-								if (isOnline(p)) {
+								if (!isOnline(p)) {
 									toSend = false;
 								} else if (p != null && p.isConnected()
 										&& !p.getServer().getInfo().getName().equals(server)) {
@@ -924,20 +924,21 @@ public class VotingPluginBungee extends Plugin implements Listener {
 	}
 
 	public void login(ProxiedPlayer p) {
-		if (isOnline(p)) {
-			if (p.getServer() != null && p.getServer().getInfo() != null) {
-				final String server = p.getServer().getInfo().getName();
-				final ProxiedPlayer proixedPlayer = p;
-				getProxy().getScheduler().runAsync(this, new Runnable() {
+		if (p.getServer() != null && p.getServer().getInfo() != null) {
+			final String server = p.getServer().getInfo().getName();
+			final ProxiedPlayer proixedPlayer = p;
+			getProxy().getScheduler().schedule(this, new Runnable() {
 
-					@Override
-					public void run() {
+				@Override
+				public void run() {
+					if (isOnline(p)) {
 						checkCachedVotes(server);
 						checkOnlineVotes(proixedPlayer, proixedPlayer.getUniqueId().toString(), server);
 					}
-				});
-			}
+				}
+			}, 1, TimeUnit.SECONDS);
 		}
+
 	}
 
 	@EventHandler
@@ -970,7 +971,12 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				return;
 			} else if (subchannel.equalsIgnoreCase("login")) {
 				String player = in.readUTF();
-				debug("Login: " + player);
+				String uuid = in.readUTF();
+				String server = "";
+				if (size > 2) {
+					server = in.readUTF();
+				}
+				debug("Login: " + player + "/" + uuid + " " + server);
 				ProxiedPlayer p = getProxy().getPlayer(player);
 				login(p);
 				return;

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

@@ -475,7 +475,8 @@ public class VotingPluginVelocity {
 				} else if (subchannel.equalsIgnoreCase("login")) {
 					String player = in.readUTF();
 					debug("Login: " + player);
-					if (server.getPlayer(player).isPresent() && !getGlobalDataHandler().isTimeChangedHappened()) {
+					if (server.getPlayer(player).isPresent()
+							&& (getGlobalDataHandler() == null || !getGlobalDataHandler().isTimeChangedHappened())) {
 						Player p = server.getPlayer(player).get();
 						if (p.getCurrentServer().isPresent()) {
 							final RegisteredServer server = p.getCurrentServer().get().getServer();
@@ -778,7 +779,7 @@ public class VotingPluginVelocity {
 				voteCacheFile.clearData();
 
 				server.getScheduler().buildTask(this, () -> {
-					if (!getGlobalDataHandler().isTimeChangedHappened()) {
+					if (getGlobalDataHandler() == null || !getGlobalDataHandler().isTimeChangedHappened()) {
 						for (RegisteredServer server : cachedVotes.keySet()) {
 							checkCachedVotes(server);
 						}
@@ -1210,7 +1211,8 @@ public class VotingPluginVelocity {
 								p = server.getPlayer(UUID.fromString(uuid)).get();
 							}
 							if (((p == null || !p.isActive()) && getConfig().getWaitForUserOnline())
-									|| getGlobalDataHandler().isTimeChangedHappened()) {
+									|| (getGlobalDataHandler() != null
+											&& getGlobalDataHandler().isTimeChangedHappened())) {
 								forceCache = true;
 								debug("Forcing vote to cache");
 							}
@@ -1245,7 +1247,7 @@ public class VotingPluginVelocity {
 					if (p != null && p.isActive()
 							&& !config.getBlockedServers()
 									.contains(p.getCurrentServer().get().getServerInfo().getName())
-							&& !getGlobalDataHandler().isTimeChangedHappened()) {
+							&& (getGlobalDataHandler() != null || !getGlobalDataHandler().isTimeChangedHappened())) {
 						sendPluginMessageServer(p.getCurrentServer().get().getServer(), "VoteOnline", player, uuid,
 								service, "" + time, Boolean.TRUE.toString(), "" + realVote, text.toString(),
 								"" + getConfig().getBungeeManageTotals(), "" + BungeeVersion.getPluginMessageVersion(),

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

@@ -1258,7 +1258,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						plugin.getVoteParty().giveRewards(plugin.getBungeeSettings().isUseBungeecoord());
+						plugin.getVoteParty().giveRewards(null, plugin.getBungeeSettings().isUseBungeecoord());
 					}
 				});
 

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

@@ -37,6 +37,10 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean perSiteCoolDownEvents = false;
 
+	@ConfigDataBoolean(path = "QueueVotesDuringTimeChange")
+	@Getter
+	private boolean queueVotesDuringTimeChange = false;
+
 	@ConfigDataBoolean(path = "AllowUnjoined")
 	@Getter
 	private boolean allowUnjoined = false;

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

@@ -49,7 +49,8 @@ public class PlayerJoinEvent implements Listener {
 
 		if (plugin.getBungeeSettings().isUseBungeecoord()
 				&& plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
-			plugin.getPluginMessaging().sendPluginMessage("Login", user.getPlayerName(), user.getUUID());
+			plugin.getPluginMessaging().sendPluginMessage("Login", user.getPlayerName(), user.getUUID(),
+					plugin.getBungeeSettings().getServer());
 		}
 	}
 

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

@@ -76,6 +76,8 @@ public class PlayerVoteListener implements Listener {
 			}
 		}
 
+		plugin.debug("Processing PlayerVoteEvent: " + playerName + "/" + event.getServiceSite());
+
 		VoteSite voteSite = event.getVoteSite();
 
 		if (voteSite == null) {
@@ -116,6 +118,7 @@ public class PlayerVoteListener implements Listener {
 
 		synchronized (object) {
 			if (!plugin.isEnabled()) {
+				plugin.getLogger().warning("Plugin disabled, ignoring vote");
 				return;
 			}
 			// reupdate cache

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

@@ -2,6 +2,7 @@ package com.bencodez.votingplugin.listeners;
 
 import java.util.ArrayList;
 
+import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -64,56 +65,62 @@ public class VotiferEvent implements Listener {
 		plugin.debug("VoteSite: " + voteSite);
 		plugin.debug("IP: " + IP);
 
-		plugin.getVoteTimer().execute(new Runnable() {
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 			@Override
 			public void run() {
-				plugin.getServerData().addServiceSite(voteSite);
-				if (plugin.getBungeeSettings().isUseBungeecoord() && !plugin.getBungeeSettings().isVotifierBypass()
-						&& (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)
-								|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.SOCKETS))) {
-					plugin.getLogger().severe(
-							"Ignoring vote from votifier since pluginmessaging or socket bungee method is enabled, this means you aren't setup correctly for those methods, please check: https://github.com/BenCodez/VotingPlugin/wiki/Bungeecord-Setups");
-					return;
-				}
-				String voteSiteNameStr = plugin.getVoteSiteName(false, voteSite);
+				try {
+					plugin.getServerData().addServiceSite(voteSite);
+					if (plugin.getBungeeSettings().isUseBungeecoord() && !plugin.getBungeeSettings().isVotifierBypass()
+							&& (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)
+									|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.SOCKETS))) {
+						plugin.getLogger().severe(
+								"Ignoring vote from votifier since pluginmessaging or socket bungee method is enabled, this means you aren't setup correctly for those methods, please check: https://github.com/BenCodez/VotingPlugin/wiki/Bungeecord-Setups");
+						return;
+					}
+					String voteSiteNameStr = plugin.getVoteSiteName(false, voteSite);
 
-				ArrayList<String> sites = plugin.getConfigVoteSites().getVoteSitesNames(false);
-				boolean createSite = false;
-				if (sites != null) {
-					if (!ArrayUtils.getInstance().containsIgnoreCase(sites, voteSiteNameStr)) {
+					ArrayList<String> sites = plugin.getConfigVoteSites().getVoteSitesNames(false);
+					boolean createSite = false;
+					if (sites != null) {
+						if (!ArrayUtils.getInstance().containsIgnoreCase(sites, voteSiteNameStr)) {
+							createSite = true;
+						}
+					} else {
 						createSite = true;
 					}
-				} else {
-					createSite = true;
-				}
 
-				if (plugin.getConfigFile().isAutoCreateVoteSites() && createSite) {
-					plugin.getLogger().warning("VoteSite with service site '" + voteSiteNameStr
-							+ "' does not exist, attempting to generate...");
-					plugin.getConfigVoteSites().generateVoteSite(voteSiteNameStr);
+					if (plugin.getConfigFile().isAutoCreateVoteSites() && createSite) {
+						plugin.getLogger().warning("VoteSite with service site '" + voteSiteNameStr
+								+ "' does not exist, attempting to generate...");
+						plugin.getConfigVoteSites().generateVoteSite(voteSiteNameStr);
 
-					plugin.getLogger().info("Current known service sites: "
-							+ ArrayUtils.getInstance().makeStringList(plugin.getServerData().getServiceSites()));
-				}
+						plugin.getLogger().info("Current known service sites: "
+								+ ArrayUtils.getInstance().makeStringList(plugin.getServerData().getServiceSites()));
+					}
 
-				if (plugin.getTimeChecker().isProcessing()) {
-					// time change in progress
-					plugin.debug("Adding vote to time queue " + voteUsername + "/" + voteSite);
-					plugin.getTimeQueueHandler().addVote(voteUsername, voteSite);
+					if (plugin.getTimeChecker().isActiveProcessing()
+							&& plugin.getConfigFile().isQueueVotesDuringTimeChange()) {
+						// time change in progress
+						plugin.debug("Adding vote to time queue " + voteUsername + "/" + voteSite);
+						plugin.getTimeQueueHandler().addVote(voteUsername, voteSite);
 
-					return;
-				}
+						return;
+					}
 
-				String voteSiteName = plugin.getVoteSiteName(true, voteSite);
+					String voteSiteName = plugin.getVoteSiteName(true, voteSite);
 
-				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName, true), voteUsername,
-						voteSite, true);
-				plugin.getServer().getPluginManager().callEvent(voteEvent);
+					PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName, true),
+							voteUsername, voteSite, true);
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
 
-				if (voteEvent.isCancelled()) {
-					plugin.debug("Vote cancelled");
-					return;
+					if (voteEvent.isCancelled()) {
+						plugin.debug("Vote cancelled");
+						return;
+					}
+				} catch (Exception e) {
+					plugin.getLogger().severe("Error occured during vote processing");
+					e.printStackTrace();
 				}
 
 			}

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

@@ -172,7 +172,8 @@ public class VoteSite {
 	}
 
 	public String getVoteURL(boolean json) {
-		if (!plugin.getConfigFile().isFormatCommandsVoteForceLinks() || !json) {
+		if (!plugin.getConfigFile().isFormatCommandsVoteForceLinks() || !json
+				|| StringParser.getInstance().containsJson(voteURL)) {
 			return voteURL;
 		} else {
 			if (!voteURL.startsWith("http")) {

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

@@ -59,7 +59,7 @@ public class VoteParty implements Listener {
 		}
 	}
 
-	public void check(boolean forceBungee) {
+	public void check(VotingPluginUser user, boolean forceBungee) {
 		if (getTotalVotes() < getVotesRequired()) {
 			return;
 		}
@@ -81,7 +81,7 @@ public class VoteParty implements Listener {
 			return;
 		}
 
-		giveRewards(forceBungee);
+		giveRewards(user, forceBungee);
 
 		if (plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRquired() > 0) {
 			plugin.getServerData().setVotePartyExtraRequired(plugin.getServerData().getVotePartyExtraRequired()
@@ -186,7 +186,7 @@ public class VoteParty implements Listener {
 				.setServer(useBungee).send(user);
 	}
 
-	public void giveRewards(boolean forceBungee) {
+	public void giveRewards(VotingPluginUser orgUser, boolean forceBungee) {
 		MiscUtils.getInstance().broadcast(plugin.getSpecialRewardsConfig().getVotePartyBroadcast());
 
 		for (final String cmd : plugin.getSpecialRewardsConfig().getVotePartyCommands()) {
@@ -204,8 +204,14 @@ public class VoteParty implements Listener {
 			plugin.debug("Trying to give all players vote party");
 			ArrayList<String> alreadyGotten = new ArrayList<String>();
 			for (Player p : Bukkit.getOnlinePlayers()) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(p);
-				user.dontCache();
+				VotingPluginUser user;
+				if (orgUser != null && orgUser.getJavaUUID().equals(p.getUniqueId())) {
+					user = orgUser;
+				} else {
+					user = UserManager.getInstance().getVotingPluginUser(p);
+					user.dontCache();
+				}
+
 				if (!plugin.getSpecialRewardsConfig().isVotePartyGiveOnlinePlayersOnly() || user.isOnline()) {
 					giveReward(user, forceBungee);
 				}
@@ -213,8 +219,14 @@ public class VoteParty implements Listener {
 			}
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				if (!alreadyGotten.contains(uuid)) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-					user.dontCache();
+					VotingPluginUser user;
+					if (orgUser != null && orgUser.getJavaUUID().toString().equals(uuid)) {
+						user = orgUser;
+					} else {
+						user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+						user.dontCache();
+					}
+
 					if (!plugin.getSpecialRewardsConfig().isVotePartyGiveOnlinePlayersOnly() || user.isOnline()) {
 						giveReward(user, forceBungee);
 					}
@@ -224,8 +236,13 @@ public class VoteParty implements Listener {
 			plugin.debug("Trying to give all voted players vote party");
 			plugin.debug(ArrayUtils.getInstance().makeStringList(getVotedUsers()));
 			for (String uuid : getVotedUsers()) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-				user.dontCache();
+				VotingPluginUser user;
+				if (orgUser != null && orgUser.getJavaUUID().toString().equals(uuid)) {
+					user = orgUser;
+				} else {
+					user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					user.dontCache();
+				}
 				if (!plugin.getSpecialRewardsConfig().isVotePartyGiveOnlinePlayersOnly() || user.isOnline()) {
 					giveReward(user, forceBungee);
 				}
@@ -303,7 +320,7 @@ public class VoteParty implements Listener {
 				if (plugin.getSpecialRewardsConfig().getVotePartyCountOfflineVotes() || user.isOnline()) {
 					addTotal(user);
 					addVotePlayer(user);
-					check(forceBungee);
+					check(user, forceBungee);
 				}
 			}
 		}