Fix leak when running /newbie add on already protected players

#725

Author: ChanceSD

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Newbie.java

@@ -126,6 +126,10 @@ public AddNewbieCommand(final PlayerManager ph) {
 		public void execute(final CommandSender sender, final String label, final List<CommandArgument> args) {
 			final Player targetPlayer = getArgument(args, ARG_PLAYER).getAsPlayer();
 			final CombatPlayer target = ph.get(targetPlayer);
+			if (target.isNewbie()) {
+				sender.sendMessage(ChatUtils.colorize(Lang.PREFIX + " &#FFFF55" + target.getName() + " &#FFAAAAalready has newbie protection"));
+				return;
+			}
 			target.setNewbie(true);
 			sender.sendMessage(ChatUtils.colorize(Lang.PREFIX + " Added newbie protection to &#FFFF55" + target.getName()));
 		}
@@ -147,6 +151,10 @@ public RemoveNewbieCommand(final PlayerManager ph) {
 		public void execute(final CommandSender sender, final String label, final List<CommandArgument> args) {
 			final Player targetPlayer = getArgument(args, ARG_PLAYER).getAsPlayer();
 			final CombatPlayer target = ph.get(targetPlayer);
+			if (!target.isNewbie()) {
+				sender.sendMessage(ChatUtils.colorize(Lang.PREFIX + " &#FFFF55" + target.getName() + " &#FFAAAAdoesn't have newbie protection"));
+				return;
+			}
 			target.setNewbie(false);
 			sender.sendMessage(ChatUtils.colorize(Lang.PREFIX + " Removed newbie protection from &#FFFF55" + target.getName()));
 		}

pvpmanager/src/main/java/me/chancesd/pvpmanager/player/CombatPlayer.java

@@ -129,12 +129,13 @@ public final void setNewbie(final boolean newbie) {
 	}
 
 	public final void setNewbie(final boolean newbie, final long time) {
-		if (newbie) {
-			this.newbieTask = new NewbieTask(this, time);
-		} else if (this.newbie && newbieTask != null) {
+		if (newbieTask != null) {
 			newbieTask.cancel();
 			this.newbieTask = null;
 		}
+		if (newbie) {
+			this.newbieTask = new NewbieTask(this, time);
+		}
 
 		// Fire event if the newbie state actually changed
 		if (this.newbie != newbie) {