Small fixes

pvpmanager/src/main/java/me/NoChance/PvPManager/Commands/PM.java

@@ -277,7 +277,7 @@ public List<String> onTabComplete(final CommandSender sender, final Command comm
 		if (args.length == 1)
 			return ChatUtils.getMatchingEntries(args[0], Lists.newArrayList("cleanup", "convert", "debug", "reload", "update", "locale"));
 		if (args.length == 2 && args[0].equalsIgnoreCase("convert"))
-			return ChatUtils.getMatchingEntries(args[1], Lists.newArrayList("SQLITE", "MYSQL", "MARIADB"));
+			return ChatUtils.getMatchingEntries(args[1], Lists.newArrayList("SQLITE", "MYSQL"));
 		if (args.length == 2 && args[0].equalsIgnoreCase("debug"))
 			return ChatUtils.getMatchingEntries(args[1], Lists.newArrayList("toggle", "damagedebug", "tag", "ct", "newbie", "attack"));
 		if (args.length == 2 && args[0].equalsIgnoreCase("locale"))

pvpmanager/src/main/java/me/NoChance/PvPManager/Events/PlayerUntagEvent.java

@@ -1,7 +1,6 @@
 package me.NoChance.PvPManager.Events;
 
 import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
@@ -10,14 +9,11 @@
 /**
  * This event is called before a player is set as no longer in combat.
  * <br>
- * Canceling the event will keep the player in combat indefinitely.
- * <br>
  * This event may be called by different threads, it is up to the developer to make their code thread safe
  */
-public final class PlayerUntagEvent extends Event implements Cancellable {
+public final class PlayerUntagEvent extends Event {
 
 	private static final HandlerList handlers = new HandlerList();
-	private boolean cancelled;
 	private final Player player;
 	private final PvPlayer pvplayer;
 
@@ -44,16 +40,6 @@ public final PvPlayer getPvPlayer() {
 		return pvplayer;
 	}
 
-	@Override
-	public boolean isCancelled() {
-		return cancelled;
-	}
-
-	@Override
-	public void setCancelled(final boolean cancel) {
-		cancelled = cancel;
-	}
-
 	@Override
 	public HandlerList getHandlers() {
 		return handlers;

pvpmanager/src/main/java/me/NoChance/PvPManager/Libraries/Updater/Updater.java

@@ -22,7 +22,7 @@ public enum UpdateResult {
 	protected String versionType;
 	protected String versionGameVersion;
 
-	private static final String[] TAGS = { "-DEV", "-PRE", "-SNAPSHOT" };
+	private static final String[] TAGS = { "-DEV", "-PRE", "-SNAPSHOT", "-BETA" };
 	private UpdateResult result = UpdateResult.SUCCESS;
 	private final Thread thread;
 	private final Plugin plugin;

pvpmanager/src/main/java/me/NoChance/PvPManager/Listeners/PlayerListener.java

@@ -100,18 +100,7 @@ public final void onPlayerDeath(final PlayerDeathEvent event) {
 		// Player died in combat, process that
 		if (killer != null && !killer.equals(player)) {
 			final PvPlayer pKiller = ph.get(killer);
-			if (Settings.isKillAbuseEnabled() && !killer.hasPermission("pvpmanager.nokillabuse")) {
-				pKiller.addVictim(player);
-			}
-			if (wg == null || !wg.containsRegionsAt(killer.getLocation(), Settings.getKillsWGExclusions())) {
-				if (Settings.getMoneyReward() > 0) {
-					pKiller.giveReward(pvPlayer);
-				}
-				if (Settings.getMoneyPenalty() > 0) {
-					pvPlayer.applyPenalty();
-				}
-				CombatUtils.executeCommands(Settings.getCommandsOnKill(), killer, killer.getName(), player.getName());
-			}
+			handlePvPDeath(player, pvPlayer, killer, pKiller);
 		}
 
 		if (pvPlayer.isInCombat()) {
@@ -131,6 +120,21 @@ public final void onPlayerDeath(final PlayerDeathEvent event) {
 		ph.handlePlayerDrops(event, player, killer);
 	}
 
+	private void handlePvPDeath(final Player player, final PvPlayer pvPlayer, final Player killer, final PvPlayer pKiller) {
+		if (Settings.isKillAbuseEnabled() && !killer.hasPermission("pvpmanager.nokillabuse")) {
+			pKiller.addVictim(player);
+		}
+		if (wg == null || !wg.containsRegionsAt(killer.getLocation(), Settings.getKillsWGExclusions())) {
+			if (Settings.getMoneyReward() > 0) {
+				pKiller.giveReward(pvPlayer);
+			}
+			if (Settings.getMoneyPenalty() > 0) {
+				pvPlayer.applyPenalty();
+			}
+			CombatUtils.executeCommands(Settings.getCommandsOnKill(), killer, killer.getName(), player.getName());
+		}
+	}
+
 	@EventHandler
 	public final void onPlayerUseSoup(final PlayerInteractEvent e) {
 		final Player player = e.getPlayer();

pvpmanager/src/main/java/me/NoChance/PvPManager/PvPManager.java

@@ -49,7 +49,7 @@ public void onEnable() {
 		Log.setup(getLogger());
 		ScheduleUtils.setupExecutor();
 		if (ScheduleUtils.checkFolia()) {
-			Log.info("Running on Folia. Support for Folia is still experimental");
+			Log.infoColor(ChatColor.AQUA + "Running on Folia. Support for Folia is still experimental");
 		}
 		loadFiles();
 		updateManager = new UpdateManager(this);
@@ -61,7 +61,8 @@ public void onEnable() {
 		registerCommands();
 		startMetrics();
 		checkJavaVersion();
-		Log.infoColor(ChatColor.GREEN + "PvPManager Enabled " + ChatColor.GRAY + "(" + (System.currentTimeMillis() - start) + " ms)");
+		Log.infoColor(ChatColor.GREEN + getDescription().getFullName() + " Enabled " + ChatColor.GRAY + "(" + (System.currentTimeMillis() - start)
+				+ " ms)");
 	}
 
 	@Override

pvpmanager/src/main/java/me/NoChance/PvPManager/PvPlayer.java

@@ -151,8 +151,6 @@ public final void setTagged(final boolean attacker, final PvPlayer tagger) {
 	public final void unTag() {
 		final PlayerUntagEvent event = new PlayerUntagEvent(getPlayer(), this);
 		Bukkit.getPluginManager().callEvent(event);
-		if (event.isCancelled())
-			return;
 
 		if (isOnline()) {
 			if (nametag != null && Settings.useNameTag()) {
@@ -258,7 +256,7 @@ public final long getNewbieTimeLeft() {
 	}
 
 	public long getTagTimeLeft() {
-		return tagged ? taggedTime + Settings.getTimeInCombat() * 1000 - System.currentTimeMillis() : 0;
+		return Math.max(taggedTime + Settings.getTimeInCombat() * 1000 - System.currentTimeMillis(), 0);
 	}
 
 	private synchronized void loadData() {