Little bug fix

VotingPlugin/Resources/Config.yml

@@ -575,6 +575,7 @@ VoteShopLimitReached: '&aYou reached your limit'
 Shop:
   # Identifier
   # Used in placeholders for formats
+  # Do not have spaces in the identifier
   Diamond:
     # Item
     Material: 'DIAMOND'
@@ -948,9 +949,27 @@ LoadSkulls: true
 # May not work on some plugins
 UseVaultPermissions: false
 
+# List of disabled commands from /vote
+# List the specific permission
+# E.g:
+# - PERMISSION
+DisabledCommands: []
+
+# Enable to true for extra player checks
+ExtraBackgroundUpdate: false
+
+# --------------------------
+# Bungee Setup 
+# Only if using votingplugin bungee to send votes
+# REQUIRES RESTART FOR CHANGES TO TAKE EFFECT
+# --------------------------
+
 # Plugin using bungee, requires plugin on bungee server
 UseBungeecoord: false
 
+# Get the plugin to broadcast to all servers
+BungeeBroadcast: false
+
 # What server this is in bungee (must match)
 # Also can be applied to rewards
 Server: PleaseSet
@@ -963,16 +982,7 @@ BungeeServer:
 # Bungee communication, add this to bungee server
 SpigotServer:
   Host: '127.0.0.1'
-  POrt: 1298
-
-# Get the plugin to broadcast to all servers
-BungeeBroadcast: false
-
-# List of disabled commands from /vote
-# List the specific permission
-# E.g:
-# - PERMISSION
-DisabledCommands: []
+  Port: 1298
 
 # ---------------------------------------------------------
 # Mysql cache options

VotingPlugin/Resources/plugin.yml

@@ -4,7 +4,7 @@ main: com.Ben12345rocks.VotingPlugin.Main
 description: Highly Customizable Voting Listener!
 website: https://www.spigotmc.org/resources/votingplugin.15358/
 author: Ben12345rocks
-softdepend: [MVdWPlaceholders, Votifier, CMI, Vault, PlaceholderAPI]
+softdepend: [MVdWPlaceholders, Votifier, CMI, Vault, PlaceholderAPI, ProtocolLib]
 api-version: 1.13
 commands:
   vote:

VotingPlugin/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.20.7</version>
+	<version>5.21</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Commands/CommandLoader.java

@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -21,6 +22,8 @@ import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
 import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandle;
 import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
 import com.Ben12345rocks.AdvancedCore.Commands.GUI.UserGUI;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
 import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
@@ -340,6 +343,19 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ResyncMilestones", "(player)" },
+				"VotingPlugin.Commands.AdminVote.SetResyncMilestones|" + adminPerm, "Resync Milestones") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				user.setMilestoneCount(user.getTotal(TopVoter.AllTime));
+
+				sendMessage(sender, "&cResynced milestones for " + args[1]);
+
+			}
+		});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "User", "(player)", "AddPoints", "(number)" },
 						"VotingPlugin.Commands.AdminVote.AddPoints|" + adminPerm, "Add to players voting points") {
@@ -509,6 +525,8 @@ public class CommandLoader {
 					});
 
 				}
+				sendMessage(sender,
+						"Using AdvancedCore " + plugin.getVersion() + "' built on '" + plugin.getBuildTime());
 			}
 		});
 
@@ -1085,6 +1103,7 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 						SpecialRewards.getInstance().giveMilestoneVoteReward(user, user.isOnline(), parseInt(args[3]));
+						sendMessage(sender, "&cMilestone " + args[3] + " forced");
 					}
 				});
 
@@ -1096,6 +1115,7 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 						SpecialRewards.getInstance().giveCumulativeVoteReward(user, user.isOnline(), parseInt(args[3]));
+						sendMessage(sender, "&cCummulative " + args[3] + " forced");
 					}
 				});
 
@@ -1106,6 +1126,7 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 				SpecialRewards.getInstance().giveAllSitesRewards(user, user.isOnline());
+				sendMessage(sender, "&cAllSites forced");
 			}
 		});
 
@@ -1116,6 +1137,7 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 				SpecialRewards.getInstance().giveFirstVoteRewards(user, user.isOnline());
+				sendMessage(sender, "&cFirstVote forced");
 			}
 		});
 
@@ -1128,6 +1150,7 @@ public class CommandLoader {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 						SpecialRewards.getInstance().giveVoteStreakReward(user, user.isOnline(), args[3], args[4],
 								parseInt(args[4]));
+						sendMessage(sender, "&cVoteStreak " + args[3] + " " + args[4] + " forced");
 					}
 				});
 
@@ -1408,6 +1431,83 @@ public class CommandLoader {
 					PlayerGUIs.getInstance().openVoteShop((Player) sender);
 				}
 			});
+			plugin.getVoteCommand().add(new CommandHandler(new String[] { "Shop", "(Text)" },
+					"VotingPlugin.Commands.Vote.Shop|" + playerPerm, "Open VoteShop GUI", false) {
+
+				@Override
+				public void execute(CommandSender sender, String[] args) {
+					if (!Config.getInstance().getVoteShopEnabled()) {
+						sender.sendMessage(StringParser.getInstance().colorize("&cVote shop disabled"));
+						return;
+					}
+
+					String identifier = args[1];
+					Set<String> identifiers = Config.getInstance().getIdentifiers();
+					if (ArrayUtils.getInstance().containsIgnoreCase(identifiers, identifier)) {
+						for (String ident : identifiers) {
+							if (ident.equalsIgnoreCase(args[1])) {
+								identifier = ident;
+							}
+						}
+
+						String perm = Config.getInstance().getVoteShopPermission(identifier);
+						boolean hasPerm = false;
+						if (perm.isEmpty()) {
+							hasPerm = true;
+						} else {
+							hasPerm = sender.hasPermission(perm);
+						}
+
+						int limit = Config.getInstance().getIdentifierLimit(identifier);
+
+						User user = UserManager.getInstance().getVotingPluginUser(sender.getName());
+						boolean limitPass = true;
+						if (limit > 0) {
+
+							if (user.getVoteShopIdentifierLimit(identifier) >= limit) {
+								limitPass = false;
+							}
+						}
+
+						if (!Config.getInstance().getVoteShopNotBuyable(identifier)) {
+							if (hasPerm) {
+								user.clearCache();
+								int points = Config.getInstance().getIdentifierCost(identifier);
+								if (identifier != null) {
+
+									if (limitPass) {
+										HashMap<String, String> placeholders = new HashMap<String, String>();
+										placeholders.put("identifier", identifier);
+										placeholders.put("points", "" + points);
+										placeholders.put("limit", "" + limit);
+										if (user.removePoints(points)) {
+
+											RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
+													Config.getInstance().getIdentifierRewardsPath(identifier),
+													new RewardOptions().setPlaceholders(placeholders));
+
+											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+													Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
+											if (limit > 0) {
+												user.setVoteShopIdentifierLimit(identifier,
+														user.getVoteShopIdentifierLimit(identifier) + 1);
+											}
+										} else {
+											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+													Config.getInstance().getFormatShopFailedMsg(), placeholders));
+										}
+									} else {
+										user.sendMessage(Config.getInstance().getVoteShopLimitReached());
+									}
+								}
+
+							}
+						}
+					} else {
+						sendMessage(sender, "&cWrong voteshop item");
+					}
+				}
+			});
 		}
 
 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "URL" },

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Config/Config.java

@@ -56,6 +56,10 @@ public class Config extends YMLFile {
 	@ConfigDataBoolean(path = "Commands.VoteRewardFromVoteURL")
 	@Getter
 	private boolean commandsVoteRewardFromVoteURL = false;
+	
+	@ConfigDataBoolean(path = "ExtraBackgroundUpdate")
+	@Getter
+	private boolean extraBackgroundUpdate = false;
 
 	@ConfigDataString(path = "Format.Commands.Vote.Last.TimeFormat", defaultValue = "%amount% %TimeType%")
 	@Getter

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Main.java

@@ -137,6 +137,8 @@ public class Main extends AdvancedCorePlugin {
 	@Getter
 	private boolean ymlError = false;
 
+	private boolean votifierLoaded = true;
+
 	/**
 	 * Check votifier.
 	 */
@@ -150,6 +152,7 @@ public class Main extends AdvancedCorePlugin {
 			} else {
 				plugin.debug("No VotifierEvent found, but usebungeecoord enabled");
 			}
+			votifierLoaded = false;
 		}
 	}
 
@@ -421,6 +424,18 @@ public class Main extends AdvancedCorePlugin {
 					}
 				}, 1000 * 60 * 10, 1000 * 60 * 5);
 
+				getTimer().schedule(new TimerTask() {
+
+					@Override
+					public void run() {
+						if (plugin != null && Config.getInstance().isExtraBackgroundUpdate()) {
+							basicBungeeUpdate();
+						} else {
+							cancel();
+						}
+					}
+				}, 1000, 1000 * 30);
+
 			}
 		}, 40L);
 
@@ -771,8 +786,8 @@ public class Main extends AdvancedCorePlugin {
 		}
 
 		registerCommands();
-		registerEvents();
 		checkVotifier();
+		registerEvents();
 		CheckUpdate.getInstance().startUp();
 		VoteReminding.getInstance().loadRemindChecking();
 		plugin.signs = new ArrayList<SignHandler>();
@@ -1010,7 +1025,11 @@ public class Main extends AdvancedCorePlugin {
 		}, 0);
 		HandlerList.unregisterAll(plugin);
 		if (Config.getInstance().isUseBungeeCoord()) {
-			BungeeHandler.getInstance().close();
+			try {
+				BungeeHandler.getInstance().close();
+			} catch (Exception e) {
+				debug(e);
+			}
 		}
 		plugin = null;
 	}
@@ -1055,7 +1074,9 @@ public class Main extends AdvancedCorePlugin {
 		PluginManager pm = getServer().getPluginManager();
 
 		pm.registerEvents(new PlayerJoinEvent(this), this);
-		pm.registerEvents(new VotiferEvent(this), this);
+		if (votifierLoaded) {
+			pm.registerEvents(new VotiferEvent(this), this);
+		}
 		pm.registerEvents(new PlayerVoteListener(this), this);
 		pm.registerEvents(new SignChange(this), this);
 		pm.registerEvents(new BlockBreak(this), this);
@@ -1154,9 +1175,11 @@ public class Main extends AdvancedCorePlugin {
 							ServerData.getInstance().updateValues();
 							Signs.getInstance().updateSigns();
 
-							for (Player player : Bukkit.getOnlinePlayers()) {
-								User user = UserManager.getInstance().getVotingPluginUser(player);
-								user.offVote();
+							if (!Config.getInstance().isExtraBackgroundUpdate()) {
+								for (Player player : Bukkit.getOnlinePlayers()) {
+									User user = UserManager.getInstance().getVotingPluginUser(player);
+									user.offVote();
+								}
 							}
 							time1 = ((System.currentTimeMillis() - time) / 1000);
 							plugin.debug("Background task finished in " + time1 + " seconds");
@@ -1172,6 +1195,15 @@ public class Main extends AdvancedCorePlugin {
 		}
 	}
 
+	public void basicBungeeUpdate() {
+		for (Player player : Bukkit.getOnlinePlayers()) {
+			User user = UserManager.getInstance().getVotingPluginUser(player);
+			user.clearCache();
+			user.offVote();
+			user.checkOfflineRewards();
+		}
+	}
+
 	public void updateAdvancedCoreHook() {
 		getJavascriptEngine().put("VotingPlugin", this);
 		allowDownloadingFromSpigot(15358);

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Util/PlaceHolders/PlaceHolders.java

@@ -1,6 +1,8 @@
 package com.Ben12345rocks.VotingPlugin.Util.PlaceHolders;
 
+import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.Locale;
 import java.util.Map.Entry;
 
 import org.bukkit.OfflinePlayer;
@@ -236,6 +238,15 @@ public class PlaceHolders {
 			}
 		}.withDescription("User points"));
 
+		placeholders.add(new PlaceHolder<User>("Points_Format") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);
+				return numberFormat.format(user.getPoints());
+			}
+		}.withDescription("User points"));
+
 		placeholders.add(new PlaceHolder<User>("CanVote") {
 
 			@Override

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/Bungee.java

@@ -15,6 +15,7 @@ import lombok.Getter;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.config.Configuration;
+import net.md_5.bungee.event.EventHandler;
 
 public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listener {
 
@@ -96,10 +97,11 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 		config.load();
 	}
 
+	@EventHandler
 	public void onVote(VotifierEvent event) {
 		Vote vote = event.getVote();
-		saveVote(vote.getUsername(), vote.getServiceName());
 		getLogger().info("Vote received " + vote.getUsername() + " from service site " + vote.getServiceName());
+		saveVote(vote.getUsername(), vote.getServiceName());
 	}
 
 	public String getUUID(String playerName) {
@@ -130,10 +132,10 @@ public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listene
 				ProxiedPlayer p = getProxy().getPlayer(name);
 
 				String server = "";
-				if (p.isConnected()) {
+				if (p != null && p.isConnected()) {
 					server = p.getServer().getInfo().getName();
 				} else {
-					server = p.getReconnectServer().getName();
+					server = config.getFallBack();
 				}
 				if (config.getBlockedServers().contains(server)) {
 					server = config.getFallBack();

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/Config.java

@@ -56,7 +56,7 @@ public class Config {
 	}
 
 	public boolean getSendToOnlineServer() {
-		return getData().getBoolean("SendVotesToAllServers");
+		return getData().getBoolean("SendToOnlineServer");
 	}
 
 	public String getBungeeHost() {

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/VotingPluginBungeeCommand.java

@@ -25,6 +25,7 @@ public class VotingPluginBungeeCommand extends Command {
 						String user = args[1];
 						String site = args[2];
 						bungee.saveVote(user, site);
+						sender.sendMessage(new TextComponent("Sending vote"));
 					}
 				}
 			}