Update version number

VotingPlugin/.settings/org.eclipse.jdt.core.prefs

@@ -1,13 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
@@ -17,40 +8,14 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
@@ -59,65 +24,4 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=info
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
-org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.8

VotingPlugin/Resources/Config.yml

@@ -442,6 +442,11 @@ GUI:
     # Number of topvoters to display on page +9
     # 9 Slots on the botton are used for page buttons
     Size: 27
+    # If true, /vote top will show player heads
+    UseSkull: true
+    # Item for player in GUI if use skull is false
+    PlayerItem:
+      Material: 'PAPER'
   VoteTotal:
     Name: 'VoteTotal: %player%'
     BackButton: true
@@ -562,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:
@@ -793,6 +798,13 @@ PointsOnVote: 1
 # Not really recommended
 AddTotals: true
 
+# Click sound when using gui
+# Set to none for no sound
+ClickSound: 
+  Sound: 'UI_BUTTON_CLICK'
+  Volume: 1.0
+  Pitch: 1.0
+
 # Debug
 Debug: false
 
@@ -875,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
@@ -886,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/Resources/plugin.yml

@@ -108,18 +108,9 @@ commands:
   adminvotevote:
     description: Command Alias
     aliases: [avvote, fakevote]
-  adminvotesetpoints:
-    description: Command Alias
-    aliases: avsetpoints
-  adminvoteaddpoints:
-    description: Command Alias
-    aliases: avaddpoints
   adminvotegui:
     description: Command Alias
     aliases: avgui
-  votesetrequestmethod:
-    description: Command Alias
-    aliases: [vsetrequestmethod, setrequesetmethod]
   adminvotegivereward:
     description: Command Alias
     aliases: avgivereward
@@ -140,9 +131,6 @@ commands:
   adminvoteConvertFrom:
     description: Command Alias
     aliases: avConvertFrom
-  adminvoteRemovePoints:
-    description: Command Alias
-    aliases: avRemovePoints
   adminvoteServiceSites:
     description: Command Alias
     aliases: avServiceSites
@@ -191,39 +179,18 @@ commands:
   adminvoteDownloadJenkins:
     description: Command Alias
     aliases: avDownloadJenkins
-  adminvoteAddTotal:
-    description: Command Alias
-    aliases: avTotal
-  adminvoteAddMilestoneCount:
-    description: Command Alias
-    aliases: avAddMilestoneCount
-  adminvoteSetMilestoneCount:
-    description: Command Alias
-    aliases: avSetMilestoneCount
   adminvoteForceVoteParty:
     description: Command Alias
     aliases: avForceVoteParty
-  adminvoteForceMilestone:
-    description: Command Alias
-    aliases: avForceMilestone
-  adminvoteForceCummulative:
-    description: Command Alias
-    aliases: avForceCummulative
-  adminvoteForceAllSites:
-    description: Command Alias
-    aliases: avForceAllSites
-  adminvoteForceFirstVote:
-    description: Command Alias
-    aliases: avForceFirstVote
-  adminvoteForceVoteStreak:
-    description: Command Alias
-    aliases: avForceVoteStreak
   adminvoteUserEditValue:
     description: Command Alias
     aliases: avUserEditValue
   adminvoteSetRequestMethod:
     description: Command Alias
     aliases: avSetRequestMethod
+  adminvoteUser:
+    description: Command Alias
+    aliases: avUser
 permissions:
   VotingPlugin.Player:
     description: Allows basic access player commands

VotingPlugin/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.17.1</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

@@ -264,7 +264,6 @@ public class CommandLoader {
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ConvertFrom", "VoteRoulette" },
 				"VotingPlugin.Commands.AdminVote.ConvertFrom.GAL|" + adminPerm, "Convert from VoteRoulette") {
 
-			@SuppressWarnings("static-access")
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				if (Bukkit.getServer().getPluginManager().getPlugin("VoteRoulette") != null) {
@@ -308,16 +307,18 @@ public class CommandLoader {
 			}
 		});
 
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "SetPoints", "(player)", "(number)" },
-				"VotingPlugin.Commands.AdminVote.SetPoints|" + adminPerm, "Set players voting points") {
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(player)", "SetPoints", "(number)" },
+						"VotingPlugin.Commands.AdminVote.SetPoints|" + adminPerm, "Set players voting points") {
 
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-				user.setPoints(Integer.parseInt(args[2]));
-				sender.sendMessage(StringUtils.getInstance().colorize("&cSet " + args[1] + " points to " + args[2]));
-			}
-		});
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						user.setPoints(Integer.parseInt(args[3]));
+						sender.sendMessage(
+								StringUtils.getInstance().colorize("&cSet " + args[1] + " points to " + args[3]));
+					}
+				});
 
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ResyncMilestones" },
 				"VotingPlugin.Commands.AdminVote.SetResyncMilestones|" + adminPerm, "Resync Milestones") {
@@ -334,29 +335,31 @@ public class CommandLoader {
 			}
 		});
 
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "AddPoints", "(player)", "(number)" },
-				"VotingPlugin.Commands.AdminVote.AddPoints|" + adminPerm, "Add to players voting points") {
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(player)", "AddPoints", "(number)" },
+						"VotingPlugin.Commands.AdminVote.AddPoints|" + adminPerm, "Add to players voting points") {
 
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-				user.addPoints(Integer.parseInt(args[2]));
-				sender.sendMessage(StringUtils.getInstance().colorize("&cGave " + args[1] + " " + args[2] + " points"
-						+ ", " + args[1] + " now has " + user.getPoints() + " points"));
-			}
-		});
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						user.addPoints(Integer.parseInt(args[3]));
+						sender.sendMessage(StringUtils.getInstance().colorize("&cGave " + args[1] + " " + args[3]
+								+ " points" + ", " + args[1] + " now has " + user.getPoints() + " points"));
+					}
+				});
 
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "RemovePoints", "(player)", "(number)" },
-				"VotingPlugin.Commands.AdminVote.RemovePoints|" + adminPerm, "Remove voting points") {
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(player)", "RemovePoints", "(number)" },
+						"VotingPlugin.Commands.AdminVote.RemovePoints|" + adminPerm, "Remove voting points") {
 
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-				user.removePoints(Integer.parseInt(args[2]));
-				sender.sendMessage(StringUtils.getInstance().colorize("&cRemoved " + args[2] + " points from " + args[1]
-						+ ", " + args[1] + " now has " + user.getPoints() + " points"));
-			}
-		});
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						user.removePoints(Integer.parseInt(args[3]));
+						sender.sendMessage(StringUtils.getInstance().colorize("&cRemoved " + args[3] + " points from "
+								+ args[1] + ", " + args[1] + " now has " + user.getPoints() + " points"));
+					}
+				});
 
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Help&?" },
 				"VotingPlugin.Commands.AdminVote.Help|" + adminPerm, "See this page") {
@@ -611,58 +614,37 @@ public class CommandLoader {
 					}
 				});
 
-		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "SetTotal", "Month", "(player)", "(number)" },
-						"VotingPlugin.Commands.AdminVote.SetTotal.Month|" + adminPerm, "Set month totals for player") {
+		for (final TopVoter top : TopVoter.values()) {
+			plugin.getAdminVoteCommand()
+					.add(new CommandHandler(new String[] { "User", "(player)", "SetTotal", top.toString(), "(number)" },
+							"VotingPlugin.Commands.AdminVote.SetTotal." + top.toString() + "|" + adminPerm,
+							"Set " + top.toString() + " totals for player") {
 
-					@Override
-					public void execute(CommandSender sender, String[] args) {
-						UserManager.getInstance().getVotingPluginUser(args[2]).setTotal(TopVoter.Monthly,
-								Integer.parseInt(args[3]));
-						sender.sendMessage(StringUtils.getInstance()
-								.colorize("&cSet month total for '" + args[2] + "' to " + args[3]));
-					}
-				});
+						@Override
+						public void execute(CommandSender sender, String[] args) {
+							UserManager.getInstance().getVotingPluginUser(args[1]).setTotal(top,
+									Integer.parseInt(args[4]));
+							sender.sendMessage(StringUtils.getInstance().colorize(
+									"&cSet " + top.toString() + " total for '" + args[1] + "' to " + args[4]));
+						}
+					});
 
-		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "SetTotal", "AllTime", "(player)", "(number)" },
-						"VotingPlugin.Commands.AdminVote.SetTotal.AllTime|" + adminPerm,
-						"Set alltime totals for player") {
+			plugin.getAdminVoteCommand()
+					.add(new CommandHandler(new String[] { "User", "(player)", "AddTotal", top.toString(), "(number)" },
+							"VotingPlugin.Commands.AdminVote.AddTotal." + top.toString() + "|" + adminPerm,
+							"Add " + top.toString() + " totals for player") {
 
-					@Override
-					public void execute(CommandSender sender, String[] args) {
-						UserManager.getInstance().getVotingPluginUser(args[2]).setTotal(TopVoter.AllTime,
-								Integer.parseInt(args[3]));
-						sender.sendMessage(StringUtils.getInstance()
-								.colorize("&cSet alltime total for '" + args[2] + "' to " + args[3]));
-					}
-				});
+						@Override
+						public void execute(CommandSender sender, String[] args) {
+							User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+							user.setTotal(top, user.getTotal(top) + Integer.parseInt(args[4]));
+							sender.sendMessage(StringUtils.getInstance()
+									.colorize("&cAdded " + top.toString() + " total for " + args[1]));
+						}
+					});
+		}
 
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "SetTotal", "Week", "(player)", "(number)" },
-				"VotingPlugin.Commands.AdminVote.SetTotal.Week|" + adminPerm, "Set week totals for player") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				UserManager.getInstance().getVotingPluginUser(args[2]).setTotal(TopVoter.Weekly,
-						Integer.parseInt(args[3]));
-				sender.sendMessage(
-						StringUtils.getInstance().colorize("&cSet week total for '" + args[2] + "' to " + args[3]));
-			}
-		});
-
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "SetTotal", "Day", "(player)", "(number)" },
-				"VotingPlugin.Commands.AdminVote.SetTotal.Day|" + adminPerm, "Set day totals for player") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				UserManager.getInstance().getVotingPluginUser(args[2]).setTotal(TopVoter.Daily,
-						Integer.parseInt(args[3]));
-				sender.sendMessage(
-						StringUtils.getInstance().colorize("&cSet day total for '" + args[2] + "' to " + args[3]));
-			}
-		});
-
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ClearTotal", "(player)" },
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "User", "(player)", "ClearTotal" },
 				"VotingPlugin.Commands.AdminVote.ClearTotal|" + adminPerm, "Clear Totals for player") {
 
 			@Override
@@ -674,75 +656,42 @@ public class CommandLoader {
 		});
 
 		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "AddTotal", "Month", "(player)", "(number)" },
-						"VotingPlugin.Commands.AdminVote.AddTotal.Month|" + adminPerm, "Add month totals for player") {
-
-					@Override
-					public void execute(CommandSender sender, String[] args) {
-						User user = UserManager.getInstance().getVotingPluginUser(args[2]);
-						user.setTotal(TopVoter.Monthly, user.getTotal(TopVoter.Monthly) + Integer.parseInt(args[3]));
-						sender.sendMessage(StringUtils.getInstance().colorize("&cAdded month total for " + args[2]));
-					}
-				});
-
-		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "AddTotal", "AllTime", "(player)", "(number)" },
-						"VotingPlugin.Commands.AdminVote.AddTotal.AllTime|" + adminPerm,
-						"Add alltime totals for player") {
-
-					@Override
-					public void execute(CommandSender sender, String[] args) {
-						User user = UserManager.getInstance().getVotingPluginUser(args[2]);
-						user.setTotal(TopVoter.AllTime, user.getTotal(TopVoter.AllTime) + Integer.parseInt(args[3]));
-						sender.sendMessage(StringUtils.getInstance().colorize("&cAdded alltime total for " + args[2]));
-					}
-				});
-
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "AddTotal", "Week", "(player)", "(number)" },
-				"VotingPlugin.Commands.AdminVote.AddTotal.Week|" + adminPerm, "Add week totals for player") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				User user = UserManager.getInstance().getVotingPluginUser(args[2]);
-				user.setTotal(TopVoter.Weekly, user.getTotal(TopVoter.Weekly) + Integer.parseInt(args[3]));
-				sender.sendMessage(StringUtils.getInstance().colorize("&cAdded week total for " + args[2]));
-			}
-		});
-
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "AddTotal", "Day", "(player)", "(number)" },
-				"VotingPlugin.Commands.AdminVote.AddTotal.Day|" + adminPerm, "Add day totals for player") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				User user = UserManager.getInstance().getVotingPluginUser(args[2]);
-				user.setTotal(TopVoter.Daily, user.getTotal(TopVoter.Daily) + Integer.parseInt(args[3]));
-				sender.sendMessage(StringUtils.getInstance().colorize("&cAdded day total for " + args[2]));
-			}
-		});
-
-		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "AddMilestoneCount", "(player)", "(number)" },
+				.add(new CommandHandler(new String[] { "User", "(player)", "AddMilestoneCount", "(number)" },
 						"VotingPlugin.Commands.AdminVote.AddMilestoneCount|" + adminPerm, "Add milestonecount") {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						user.setMilestoneCount(user.getMilestoneCount() + Integer.parseInt(args[2]));
+						user.setMilestoneCount(user.getMilestoneCount() + Integer.parseInt(args[3]));
 						SpecialRewards.getInstance().checkMilestone(user);
 						sender.sendMessage(StringUtils.getInstance().colorize("&cAdded milestonecount for " + args[1]));
 					}
 				});
 
 		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "SetMilestoneCount", "(player)", "(number)" },
+				.add(new CommandHandler(new String[] { "User", "(player)", "SetMilestoneCount", "(number)" },
 						"VotingPlugin.Commands.AdminVote.SetMilestoneCount|" + adminPerm, "Set milestonecount") {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						user.setMilestoneCount(Integer.parseInt(args[2]));
+						user.setMilestoneCount(Integer.parseInt(args[3]));
 						SpecialRewards.getInstance().checkMilestone(user);
-						sender.sendMessage(StringUtils.getInstance().colorize("&cAdded milestonecount for " + args[1]));
+						sender.sendMessage(StringUtils.getInstance()
+								.colorize("&cSet milestonecount for " + args[1] + " to " + args[3]));
+					}
+				});
+
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(player)", "SetData", "(Text)", "(text)" },
+						"VotingPlugin.Commands.AdminVote.SetData|" + adminPerm, "Set data") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						user.getData().setString(args[3], args[4]);
+						sender.sendMessage(StringUtils.getInstance()
+								.colorize("&cSet " + args[3] + " for " + args[1] + " to " + args[4]));
 					}
 				});
 
@@ -764,6 +713,39 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "User", "(Player)", "ViewData" },
+				"VotingPlugin.Commands.AdminVote.ViewData|" + adminPerm, "View playerdata") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				for (String key : user.getData().getKeys()) {
+					user.sendMessage("&c&l" + key + " &c" + user.getData().getString(key));
+				}
+			}
+		});
+
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(Player)", "ForceVote", "(Sitename)" },
+						"VotingPlugin.Commands.AdminVote.Vote|" + adminPerm, "Trigger manual vote") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[3]), args[1], args[3],
+								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);
+
+					}
+				});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "VoteSite", "(sitename)", "Create" },
 				"VotingPlugin.Commands.AdminVote.VoteSite.Edit|" + adminPerm, "Create VoteSite") {
 
@@ -1027,27 +1009,29 @@ public class CommandLoader {
 					}
 				});
 
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ForceMilestone", "(Number)", "(Player)" },
-				"VotingPlugin.Commands.AdminVote.ForceMilestone|" + adminPerm, "Force a milestone") {
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(player)", "ForceMilestone", "(Number)" },
+						"VotingPlugin.Commands.AdminVote.ForceMilestone|" + adminPerm, "Force a milestone") {
 
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				User user = UserManager.getInstance().getVotingPluginUser(args[2]);
-				SpecialRewards.getInstance().giveMilestoneVoteReward(user, user.isOnline(), parseInt(args[1]));
-			}
-		});
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						SpecialRewards.getInstance().giveMilestoneVoteReward(user, user.isOnline(), parseInt(args[3]));
+					}
+				});
 
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ForceCummulative", "(Number)", "(Player)" },
-				"VotingPlugin.Commands.AdminVote.ForceCummulative|" + adminPerm, "Force a cummulative reward") {
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(player)", "ForceCummulative", "(Number)" },
+						"VotingPlugin.Commands.AdminVote.ForceCummulative|" + adminPerm, "Force a cummulative reward") {
 
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				User user = UserManager.getInstance().getVotingPluginUser(args[2]);
-				SpecialRewards.getInstance().giveCumulativeVoteReward(user, user.isOnline(), parseInt(args[1]));
-			}
-		});
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						SpecialRewards.getInstance().giveCumulativeVoteReward(user, user.isOnline(), parseInt(args[3]));
+					}
+				});
 
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ForceAllSites", "(Player)" },
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "User", "(player)", "ForceAllSites" },
 				"VotingPlugin.Commands.AdminVote.ForceAllSites|" + adminPerm, "Force a allsites reward") {
 
 			@Override
@@ -1057,7 +1041,7 @@ public class CommandLoader {
 			}
 		});
 
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ForceFirstVote", "(Player)" },
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "User", "(player)", "ForceFirstVote" },
 				"VotingPlugin.Commands.AdminVote.ForceFirstVote|" + adminPerm, "Force a firstvote reward") {
 
 			@Override
@@ -1068,14 +1052,14 @@ public class CommandLoader {
 		});
 
 		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "ForceVoteStreak", "(Text)", "(Number)", "(Player)" },
+				.add(new CommandHandler(new String[] { "User", "(player)", "ForceVoteStreak", "(Text)", "(Number)" },
 						"VotingPlugin.Commands.AdminVote.ForceVoteStreak|" + adminPerm, "Force a votestreak reward") {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						User user = UserManager.getInstance().getVotingPluginUser(args[3]);
-						SpecialRewards.getInstance().giveVoteStreakReward(user, user.isOnline(), args[1], args[2],
-								parseInt(args[2]));
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						SpecialRewards.getInstance().giveVoteStreakReward(user, user.isOnline(), args[3], args[4],
+								parseInt(args[4]));
 					}
 				});
 
@@ -1111,14 +1095,14 @@ public class CommandLoader {
 					}
 				});
 
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "" },
-				"VotingPlugin.Commands.AdminVote|" + adminPerm, "Base command") {
+		plugin.getAdminVoteCommand().add(
+				new CommandHandler(new String[] {}, "VotingPlugin.Commands.AdminVote|" + adminPerm, "Base command") {
 
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				sendMessage(sender, "&cInvalid command, see /adminvote help");
-			}
-		});
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						sendMessage(sender, "&cInvalid command, see /adminvote help");
+					}
+				});
 
 		ArrayList<CommandHandler> avCommands = com.Ben12345rocks.AdvancedCore.Commands.CommandLoader.getInstance()
 				.getBasicAdminCommands("VotingPlugin");
@@ -1997,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/Commands/GUI/PlayerGUIs.java

@@ -1,10 +1,12 @@
 package com.Ben12345rocks.VotingPlugin.Commands.GUI;
 
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
@@ -161,30 +163,36 @@ public class PlayerGUIs {
 
 				@Override
 				public void onClick(ClickEvent event) {
-					Player player = event.getWhoClicked();
-					String cmd = Config.getInstance().getVoteGUISlotCommand(slot);
-					User user = getSelectedPlayer(player);
-					if (!cmd.equals("")) {
-						player.performCommand(cmd);
-					} else {
-						if (slot.equalsIgnoreCase("url")) {
-							openVoteURL(player);
-						} else if (slot.equalsIgnoreCase("next")) {
-							openVoteNext(player, user);
-						} else if (slot.equalsIgnoreCase("last")) {
-							openVoteLast(player, user);
-						} else if (slot.equalsIgnoreCase("total")) {
-							openVoteTotal(player, user);
-						} else if (slot.equalsIgnoreCase("top")) {
-							openVoteTop(player, null);
-						} else if (slot.equalsIgnoreCase("today")) {
-							openVoteToday(player);
-						} else if (slot.equalsIgnoreCase("help")) {
-							player.performCommand("vote help");
-						} else if (slot.equalsIgnoreCase("shop")) {
-							openVoteShop(player);
+					Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+						@Override
+						public void run() {
+							Player player = event.getWhoClicked();
+							String cmd = Config.getInstance().getVoteGUISlotCommand(slot);
+							User user = getSelectedPlayer(player);
+							if (!cmd.equals("")) {
+								player.performCommand(cmd);
+							} else {
+								if (slot.equalsIgnoreCase("url")) {
+									openVoteURL(player);
+								} else if (slot.equalsIgnoreCase("next")) {
+									openVoteNext(player, user);
+								} else if (slot.equalsIgnoreCase("last")) {
+									openVoteLast(player, user);
+								} else if (slot.equalsIgnoreCase("total")) {
+									openVoteTotal(player, user);
+								} else if (slot.equalsIgnoreCase("top")) {
+									openVoteTop(player, null);
+								} else if (slot.equalsIgnoreCase("today")) {
+									openVoteToday(player);
+								} else if (slot.equalsIgnoreCase("help")) {
+									player.performCommand("vote help");
+								} else if (slot.equalsIgnoreCase("shop")) {
+									openVoteShop(player);
+								}
+							}
 						}
-					}
+					});
 
 				}
 			});
@@ -471,25 +479,27 @@ public class PlayerGUIs {
 
 		int pos = 1;
 		for (Entry<User, Integer> entry : users) {
+			ItemBuilder playerItem;
 
-			inv.addButton(new BInventoryButton(
-					new ItemBuilder(MiscUtils.getInstance().setSkullOwner(entry.getKey().getOfflinePlayer()))
-							.setName(Config.getInstance().getGUIVoteTopItemName())
-							.addLoreLine(Config.getInstance().getGUIVoteTopItemLore())
-							.addPlaceholder("position", "" + pos)
-							.addPlaceholder("player", entry.getKey().getPlayerName())
-							.addPlaceholder("votes", "" + entry.getValue())) {
+			if (Config.getInstance().isGuiVoteTopUseSkull()) {
+				playerItem = new ItemBuilder(entry.getKey().getPlayerHead());
+			} else {
+				playerItem = new ItemBuilder(Material.valueOf(Config.getInstance().getGuiVoteTopPlayerItemMaterial()));
+			}
+
+			playerItem.setLore(new ArrayList<String>());
+
+			inv.addButton(new BInventoryButton(playerItem.setName(Config.getInstance().getGUIVoteTopItemName())
+					.addLoreLine(Config.getInstance().getGUIVoteTopItemLore()).addPlaceholder("position", "" + pos)
+					.addPlaceholder("player", entry.getKey().getPlayerName())
+					.addPlaceholder("votes", "" + entry.getValue())) {
 
 				@Override
 				public void onClick(ClickEvent clickEvent) {
-					// ItemBuilder item = new ItemBuilder(clickEvent.getClickedItem());
-					// String name = ChatColor.stripColor(item.getName()).split(":")[1].trim();
-					String name = (String) clickEvent.getButton().getData("player");
-
-					User user = UserManager.getInstance().getVotingPluginUser(name);
+					User user = (User) getData("User");
 					openVoteGUI(player, user);
 				}
-			}.addData("player", entry.getKey().getPlayerName()));
+			}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
 			pos++;
 		}
 

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

@@ -252,6 +252,18 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean loadCommandAliases = true;
 
+	@ConfigDataBoolean(path = "GUI.VoteTop.UseSkull")
+	@Getter
+	private boolean guiVoteTopUseSkull = true;
+
+	@ConfigDataString(path = "GUI.VoteTop.PlayerItem.Material")
+	@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/Listeners/PlayerVoteListener.java

@@ -138,6 +138,8 @@ public class PlayerVoteListener implements Listener {
 				user.addPoints();
 			}
 
+			user.checkDayVoteStreak();
+
 			// other rewards
 			SpecialRewards.getInstance().checkAllSites(user);
 			SpecialRewards.getInstance().checkCumualativeVotes(user);

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)");
@@ -763,7 +768,7 @@ public class Main extends JavaPlugin {
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("Reminded", "VARCHAR(5)");
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("DisableBroadcast", "VARCHAR(5)");
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("LastOnline", "VARCHAR(20)");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("PlayerName", "VARCHAR(20)");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("PlayerName", "VARCHAR(30)");
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("DailyTotal", "INT DEFAULT '0'");
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("WeeklyTotal", "INT DEFAULT '0'");
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("DayVoteStreak", "INT DEFAULT '0'");

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;
@@ -125,6 +127,33 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		}
 	}
 
+	public void checkDayVoteStreak() {
+		if (!voteStreakUpdatedToday(LocalDateTime.now())) {
+			if (!Config.getInstance().isVoteStreakRequirementUsePercentage()
+					|| hasPercentageTotal(TopVoter.Daily, Config.getInstance().getVoteStreakRequirementDay(), null)) {
+				addDayVoteStreak();
+				SpecialRewards.getInstance().checkVoteStreak(this, "Day");
+				setDayVoteStreakLastUpdate(System.currentTimeMillis());
+			}
+		}
+	}
+
+	public boolean voteStreakUpdatedToday(LocalDateTime time) {
+		return MiscUtils.getInstance().getTime(getDayVoteStreakLastUpdate()).getDayOfYear() == time.getDayOfYear();
+	}
+
+	public long getDayVoteStreakLastUpdate() {
+		String str = getData().getString("DayVoteStreakLastUpdate");
+		if (str.isEmpty()) {
+			return 0;
+		}
+		return Long.parseLong(str);
+	}
+
+	public void setDayVoteStreakLastUpdate(long time) {
+		getData().setString("DayVoteStreakLastUpdate", "" + time);
+	}
+
 	/**
 	 * Adds the points.
 	 */
@@ -142,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());
 	}
 
 	/**
@@ -431,6 +467,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				return getData().getInt("MonthTotal");
 			case Weekly:
 				return getUserData().getInt("WeeklyTotal");
+			default:
+				break;
 		}
 		return 0;
 	}
@@ -454,12 +492,14 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	public void giveDailyTopVoterAward(int place, String path) {
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getDailyAwardRewardsPath(path))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Daily").send(this);
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Daily").setOnline(isOnline())
+				.send(this);
 	}
 
 	public void giveMonthlyTopVoterAward(int place, String path) {
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMonthlyAwardRewardsPath(path))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly").send(this);
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly").setOnline(isOnline())
+				.send(this);
 	}
 
 	public void giveOfflineOtherRewards() {
@@ -514,7 +554,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	public void giveWeeklyTopVoterAward(int place, String path) {
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getWeeklyAwardRewardsPath(path))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Weekly").send(this);
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Weekly").setOnline(isOnline())
+				.send(this);
 	}
 
 	/**

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/TopVoter/TopVoterHandler.java

@@ -107,13 +107,9 @@ public class TopVoterHandler implements Listener {
 	public void onDayChange(DayChangeEvent event) {
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getTotal(TopVoter.Daily) == 0 && user.getDayVoteStreak() != 0) {
-				user.setDayVoteStreak(0);
-			} else {
-				if (!Config.getInstance().isVoteStreakRequirementUsePercentage() || user
-						.hasPercentageTotal(TopVoter.Daily, Config.getInstance().getVoteStreakRequirementDay(), null)) {
-					user.addDayVoteStreak();
-					SpecialRewards.getInstance().checkVoteStreak(user, "Day");
+			if (!user.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
+				if (user.getDayVoteStreak() != 0) {
+					user.setDayVoteStreak(0);
 				}
 			}
 

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

@@ -0,0 +1,26 @@
+package com.Ben12345rocks.VotingPlugin;
+
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.Injected.RewardInject;
+import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+
+public class VotingPluginHooks {
+	private static VotingPluginHooks instance = new VotingPluginHooks();
+
+	public static VotingPluginHooks getInstance() {
+		return instance;
+	}
+
+	public Main getMainClass() {
+		return Main.plugin;
+	}
+
+	public void addCustomReward(RewardInject inject) {
+		RewardHandler.getInstance().getInjectedRewards().add(inject);
+	}
+
+	public UserManager getUserManager() {
+		return UserManager.getInstance();
+	}
+
+}