Update version number

VotingPlugin/Resources/Config.yml

@@ -567,7 +567,7 @@ Shop:
     Permission: ''
     # Limit how many times you can buy this
     #Limit: 3
-    # Rewards to run if player buys succesfully
+    # Rewards to run if player buys successfully
     Rewards:
       Items:
         Diamond:
@@ -887,6 +887,9 @@ AutoDownload: false
 # Whether or not to disable update checks
 DisableUpdateChecking: false
 
+# Allow transfer of vote points
+AllowVotePointTransfers: false
+
 # Disable this on a hub server for example
 # Still processes rewards for offline rewards (just won't give any)
 ProcessRewards: true
@@ -898,6 +901,10 @@ DisableAdvancedTab: false
 # Requires restart to take effect
 LoadCommandAliases: true
 
+# Wait until user is logged in with AuthMe
+# Requires AuthMe
+WaitUntilLoggedIn: true
+
 # ---------------------------------------------------------
 # Mysql cache options
 # Clearing cache forces the plugin to pull from database

VotingPlugin/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.17.5</version>
+	<version>5.18</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -278,5 +278,12 @@
 			<scope>system</scope>
 			<systemPath>${project.basedir}/Jars/SuperbVote-0.5.3.jar</systemPath>
 		</dependency>
+		<dependency>
+			<groupId>be.maximvdw</groupId>
+			<artifactId>MVdWPlaceholderAPI</artifactId>
+			<version>LATEST</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/Jars/MVdWPlaceholderAPI.jar</systemPath>
+		</dependency>
 	</dependencies>
 </project>

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

@@ -1981,6 +1981,34 @@ public class CommandLoader {
 			}
 		});
 
+		if (Config.getInstance().isAllowVotePointTransfers()) {
+			plugin.getVoteCommand()
+					.add(new CommandHandler(new String[] { "GivePoints", "(player)", "(number)" },
+							"VotingPlugin.Commands.Vote.GivePoints|" + playerPerm,
+							"Give someone points from your points", false) {
+
+						@Override
+						public void execute(CommandSender sender, String[] args) {
+							if (Config.getInstance().isAllowVotePointTransfers()) {
+								User cPlayer = UserManager.getInstance().getVotingPluginUser((Player) sender);
+
+								User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+								int pointsToGive = Integer.parseInt(args[2]);
+								if (cPlayer.getPoints() >= pointsToGive) {
+									user.addPoints(pointsToGive);
+									cPlayer.removePoints(pointsToGive);
+									sendMessage(sender,
+											"&c" + pointsToGive + " points given to " + user.getPlayerName());
+									user.sendMessage("&cYou received " + pointsToGive + " points from "
+											+ cPlayer.getPlayerName());
+								} else {
+									sendMessage(sender, "&cNot enough points");
+								}
+							}
+						}
+					});
+		}
+
 		plugin.getVoteCommand().add(
 				new CommandHandler(new String[] {}, "VotingPlugin.Commands.Vote|" + playerPerm, "See voting URLs") {
 

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

@@ -260,6 +260,10 @@ public class Config extends YMLFile {
 	@Getter
 	private String guiVoteTopPlayerItemMaterial = "PAPER";
 
+	@ConfigDataBoolean(path = "AllowVotePointTransfers")
+	@Getter
+	private boolean allowVotePointTransfers = false;
+
 	@Getter
 	private int formatPageSize = 10;
 

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Events/PlayerReceivePointsEvent.java

@@ -0,0 +1,60 @@
+package com.Ben12345rocks.VotingPlugin.Events;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.Ben12345rocks.VotingPlugin.Objects.User;
+
+import lombok.Getter;
+import lombok.Setter;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class PlayerVoteEvent.
+ */
+public class PlayerReceivePointsEvent extends Event {
+
+	/** The Constant handlers. */
+	private static final HandlerList handlers = new HandlerList();
+
+	/**
+	 * Gets the handler list.
+	 *
+	 * @return the handler list
+	 */
+	public static HandlerList getHandlerList() {
+		return handlers;
+	}
+
+	@Getter
+	@Setter
+	private User player;
+
+	@Getter
+	@Setter
+	private int points;
+
+	@Getter
+	@Setter
+	private boolean cancelled;
+
+	@Getter
+	@Setter
+	private String serviceSite = "";
+
+	public PlayerReceivePointsEvent(User user, int points) {
+		super(true);
+		setPlayer(user);
+		setPoints(points);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.bukkit.event.Event#getHandlers()
+	 */
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Listeners/PlayerJoinEvent.java

@@ -4,9 +4,9 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerLoginEvent;
 
 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+import com.Ben12345rocks.AdvancedCore.Listeners.AdvancedCoreLoginEvent;
 import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
@@ -19,6 +19,7 @@ import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 public class PlayerJoinEvent implements Listener {
 
 	/** The plugin. */
+	@SuppressWarnings("unused")
 	private static Main plugin;
 
 	/**
@@ -38,31 +39,22 @@ public class PlayerJoinEvent implements Listener {
 	 *            the event
 	 */
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-	public void onPlayerLogin(PlayerLoginEvent event) {
-		plugin.getServer().getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+	public void onPlayerLogin(AdvancedCoreLoginEvent event) {
+		if (event.getPlayer() == null || (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
+				&& AdvancedCoreHook.getInstance().getMysql() == null)) {
+			return;
+		}
+		Player player = event.getPlayer();
 
-			@Override
-			public void run() {
-				if (event.getPlayer() == null
-						|| (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
-								&& AdvancedCoreHook.getInstance().getMysql() == null)) {
-					return;
-				}
-				Player player = event.getPlayer();
+		User user = UserManager.getInstance().getVotingPluginUser(player);
 
-				if (player != null) {
-					User user = UserManager.getInstance().getVotingPluginUser(player);
+		// run remind
+		user.loginMessage();
 
-					// run remind
-					user.loginMessage();
-
-					if (user.getData().hasData()) {
-						// give offline vote (if they voted offline)
-						user.offVote();
-					}
-				}
-			}
-		}, 20L);
+		if (user.getData().hasData()) {
+			// give offline vote (if they voted offline)
+			user.offVote();
+		}
 
 	}
 }

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

@@ -68,6 +68,7 @@ import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.Updater.CheckUpdate;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+import com.Ben12345rocks.VotingPlugin.Util.PlaceHolders.MVdWPlaceholders;
 import com.Ben12345rocks.VotingPlugin.Util.PlaceHolders.PlaceHolders;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
 import com.Ben12345rocks.VotingPlugin.VoteReminding.VoteReminding;
@@ -756,6 +757,10 @@ public class Main extends JavaPlugin {
 
 		PlaceHolders.getInstance().load();
 
+		if (Bukkit.getPluginManager().isPluginEnabled("MVdWPlaceholderAPI")) {
+			MVdWPlaceholders.getInstance().loadMVdWPlaceholders();
+		}
+
 		// set columns
 		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Objects/User.java

@@ -11,6 +11,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
@@ -23,6 +24,7 @@ import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerReceivePointsEvent;
 import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
@@ -169,7 +171,14 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	 *            the value
 	 */
 	public void addPoints(int value) {
-		setPoints(getPoints() + value);
+		PlayerReceivePointsEvent event = new PlayerReceivePointsEvent(this, value);
+		Bukkit.getPluginManager().callEvent(event);
+
+		if (event.isCancelled()) {
+			return;
+		}
+
+		setPoints(getPoints() + event.getPoints());
 	}
 
 	/**

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

@@ -0,0 +1,86 @@
+package com.Ben12345rocks.VotingPlugin.Util.PlaceHolders;
+
+import org.bukkit.Bukkit;
+
+import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+
+import be.maximvdw.placeholderapi.PlaceholderAPI;
+import be.maximvdw.placeholderapi.PlaceholderReplaceEvent;
+import be.maximvdw.placeholderapi.PlaceholderReplacer;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class PlaceHolders.
+ */
+public class MVdWPlaceholders {
+
+	/** The instance. */
+	static MVdWPlaceholders instance = new MVdWPlaceholders();
+
+	/** The plugin. */
+	static Main plugin = Main.plugin;
+
+	/**
+	 * Gets the single instance of PlaceHolders.
+	 *
+	 * @return single instance of PlaceHolders
+	 */
+	public static MVdWPlaceholders getInstance() {
+		return instance;
+	}
+
+	/**
+	 * Instantiates a new place holders.
+	 */
+	private MVdWPlaceholders() {
+	}
+
+	/**
+	 * Instantiates a new place holders.
+	 *
+	 * @param plugin
+	 *            the plugin
+	 */
+	public MVdWPlaceholders(Main plugin) {
+		MVdWPlaceholders.plugin = plugin;
+	}
+
+	public void loadMVdWPlaceholders() {
+		if (Bukkit.getPluginManager().isPluginEnabled("MVdWPlaceholderAPI")) {
+			// The plugin is enabled
+			for (final PlaceHolder place : PlaceHolders.getInstance().getPlaceholders()) {
+				String str = place.getIdentifier();
+				if (!str.endsWith("_")) {
+					PlaceholderAPI.registerPlaceholder(Main.plugin, "VotingPlugin_" + str, new PlaceholderReplacer() {
+
+						@Override
+						public String onPlaceholderReplace(PlaceholderReplaceEvent event) {
+							return place.placeholderRequest(event.getOfflinePlayer(),
+									UserManager.getInstance().getVotingPluginUser(event.getOfflinePlayer()),
+									event.getPlaceholder().substring("VotingPlugin_".length()));
+						}
+
+					});
+				}
+
+			}
+
+			for (final PlaceHolder place : PlaceHolders.getInstance().getNonPlayerPlaceholders()) {
+				String str = place.getIdentifier();
+				if (!str.endsWith("_")) {
+					PlaceholderAPI.registerPlaceholder(Main.plugin, "VotingPlugin_" + str, new PlaceholderReplacer() {
+
+						@Override
+						public String onPlaceholderReplace(PlaceholderReplaceEvent event) {
+							return place.placeholderRequest(event.getOfflinePlayer(), null,
+									event.getPlaceholder().substring("VotingPlugin_".length()));
+						}
+
+					});
+				}
+
+			}
+		}
+	}
+}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/VotingPluginHooks.java

@@ -7,7 +7,7 @@ import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 public class VotingPluginHooks {
 	private static VotingPluginHooks instance = new VotingPluginHooks();
 
-	public VotingPluginHooks getInstance() {
+	public static VotingPluginHooks getInstance() {
 		return instance;
 	}