Update to 4.0.1

Author: ChanceSD

pom.xml

@@ -11,7 +11,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<sonar.organization>chancesd</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
-		<revision>4.0</revision>
+		<revision>4.0.1</revision>
 	</properties>
 
 	<distributionManagement>

pvpmanager/pom.xml

@@ -335,7 +335,7 @@
 		<dependency>
 			<groupId>me.chancesd.sdutils</groupId>
 			<artifactId>sdutils</artifactId>
-			<version>1.3-SNAPSHOT</version>
+			<version>1.4-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>

pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/DeathHandler.java

@@ -6,12 +6,12 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.inventory.ItemStack;
-
 import me.chancesd.pvpmanager.integration.Hook;
 import me.chancesd.pvpmanager.integration.type.WorldGuardDependency;
 import me.chancesd.pvpmanager.player.CombatPlayer;
 import me.chancesd.pvpmanager.player.UntagReason;
 import me.chancesd.pvpmanager.setting.Conf;
+import me.chancesd.pvpmanager.setting.Conf.DropMode;
 import me.chancesd.pvpmanager.setting.Lang;
 import me.chancesd.pvpmanager.setting.Permissions;
 import me.chancesd.pvpmanager.utils.CombatUtils;
@@ -99,7 +99,12 @@ public void handleCombatLogDrops(final PlayerDeathEvent event, final Player play
 	public void handlePlayerDrops(final PlayerDeathEvent event, final Player player, final Player killer) {
 		if (player.equals(killer))
 			return;
-		switch (Conf.PLAYER_DROP_MODE.asEnum(Conf.DropMode.class)) {
+		final DropMode dropMode = Conf.PLAYER_DROP_MODE.asEnum(Conf.DropMode.class);
+		if (dropMode == null) {
+			Conf.PLAYER_DROP_MODE.set(DropMode.ALWAYS);
+			return;
+		}
+		switch (dropMode) {
 		case DROP:
 			if (killer == null) {
 				keepInv(event);

pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/DependencyManager.java

@@ -60,7 +60,7 @@ public class DependencyManager {
 	private final ArrayList<AFKDependency> afkChecks = new ArrayList<>();
 
 	public void onLoadSetup() {
-		if (Hook.WORLDGUARD.getPlugin() != null)
+		if (Hook.WORLDGUARD.getPlugin() != null && Utils.isVersionAtLeast(Utils.stripTags(Hook.WORLDGUARD.getVersion()), "7.0"))
 			WorldGuardFlagHandler.initializeFlags();
 	}
 
@@ -89,7 +89,7 @@ public void onEnableSetup() {
 	}
 
 	public void onDisableCleanup() {
-		if (Hook.WORLDGUARD.isEnabled())
+		if (Hook.WORLDGUARD.isEnabled() && Utils.isVersionAtLeast(Utils.stripTags(Hook.WORLDGUARD.getVersion()), "7.0"))
 			WorldGuardFlagHandler.shutdown();
 	}
 

pvpmanager/src/main/java/me/chancesd/pvpmanager/manager/UpdateManager.java

@@ -15,7 +15,6 @@
 import me.chancesd.sdutils.updater.Updater.UpdateResult;
 import me.chancesd.sdutils.updater.Updater.UpdateType;
 import me.chancesd.sdutils.utils.Log;
-import me.chancesd.sdutils.utils.Utils;
 
 public class UpdateManager {
 
@@ -49,15 +48,7 @@ public void checkForUpdates() {
 					+ getCurrentversion();
 			Lang.queueAdminMsg(updateMsg);
 			Bukkit.broadcast(updateMsg, Permissions.ADMIN.getPermission());
-			if (Conf.AUTO_UPDATE.asBool() && Utils.isVersionAtLeast(getNewVersion(), "4.0")
-					&& !Utils.isVersionAtLeast(getNewVersion(), "4.1")) {
-				final String v4message = Lang.PREFIX
-						+ " §aSince §b§lv4.0 is a huge update§a, it changes a lot of the config and messages file. "
-						+ "This makes it unable to be automatically updated. "
-						+ "Please §b§lmanually download the update§a from the links below and copy any settings you need from the old config.";
-						Lang.queueAdminMsg(v4message);
-				Bukkit.broadcast(v4message, Permissions.ADMIN.getPermission());
-			} else if (Conf.AUTO_UPDATE.asBool()) {
+			if (Conf.AUTO_UPDATE.asBool()) {
 				if (updater.downloadFile()) {
 					Lang.queueAdminMsg(Lang.PREFIX + " §aUpdate downloaded, it will be applied automatically on the next server restart");
 					Bukkit.broadcast(

pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Conf.java

@@ -19,6 +19,7 @@
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import me.chancesd.pvpmanager.PvPManager;
 import me.chancesd.pvpmanager.setting.conf.ConfSection;
@@ -291,7 +292,7 @@ public Set<String> asSet() {
 		return stringSet;
 	}
 
-	@NotNull
+	@Nullable
 	public <E extends Enum<E>> E asEnum(final Class<E> en) {
 		return en.cast(enumValue);
 	}
@@ -310,6 +311,11 @@ public void set(final boolean booleanValue) {
 		this.boolValue = booleanValue;
 	}
 
+	@SuppressWarnings("java:S3066") // Public setters needed
+	public void set(final Enum<?> enumValue) {
+		this.enumValue = enumValue;
+	}
+
 	public void disable() {
 		if (clazz == Boolean.class) {
 			boolValue = false;

pvpmanager/src/main/java/me/chancesd/pvpmanager/tasks/TagTask.java

@@ -27,12 +27,12 @@ public class TagTask implements Listener {
 
 	private final Map<CombatPlayer, CountdownData> taggedCountdowns = new ConcurrentHashMap<>();
 	private final DisplayManager display;
-	private final BossBarBuilder bossBar;
+	private BossBarBuilder bossBar;
 
 	public TagTask(final DisplayManager display) {
 		this.display = display;
-		this.bossBar = BossBarBuilder.create().barColor(Conf.BOSS_BAR_COLOR.asEnum(BarColor.class))
-				.barStyle(Conf.BOSS_BAR_STYLE.asEnum(BarStyle.class));
+		if (Conf.BOSS_BAR_ENABLED.asBool())
+			this.bossBar = BossBarBuilder.create().barColor(Conf.BOSS_BAR_COLOR.asEnum(BarColor.class)).barStyle(Conf.BOSS_BAR_STYLE.asEnum(BarStyle.class));
 	}
 
 	public final boolean cancel() {
@@ -46,7 +46,7 @@ public final boolean cancel() {
 		return false;
 	}
 
-	@EventHandler (ignoreCancelled = true, priority = EventPriority.MONITOR)
+	@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
 	public final void onPlayerTag(final PlayerTagEvent event) {
 		startTracking(event.getCombatPlayer());
 	}