diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Commands/PvPList.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Commands/PvPList.java index 15deea4e1..d09417147 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Commands/PvPList.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Commands/PvPList.java @@ -32,7 +32,7 @@ private String pvpList(final Player sender, final boolean enabled, final boolean final StringBuilder list = new StringBuilder(); for (final PvPlayer p : ph.getPlayers().values()) { final Player player = p.getPlayer(); - if (enabled == p.hasPvPEnabled() && player != null && (console || sender.canSee(player))) { + if (enabled == p.hasPvPEnabled() && (console || sender.canSee(player))) { list.append(p.getName()).append(", "); } } diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Libraries/Config/ConfigUpdater.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Libraries/Config/ConfigUpdater.java index 33e2d0449..69f8685e8 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Libraries/Config/ConfigUpdater.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Libraries/Config/ConfigUpdater.java @@ -34,6 +34,9 @@ @SuppressWarnings("unused") public class ConfigUpdater { + private ConfigUpdater() { + } + /** * Update a yaml file from a resource inside your plugin jar * diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/DependencyManager.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/DependencyManager.java index 5fb254770..bdcaed69b 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/DependencyManager.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/DependencyManager.java @@ -31,7 +31,6 @@ import me.NoChance.PvPManager.Dependencies.Interfaces.GodDependency; import me.NoChance.PvPManager.Dependencies.Interfaces.PvPDependency; import me.NoChance.PvPManager.Dependencies.Interfaces.RegionDependency; -import me.NoChance.PvPManager.Dependencies.Interfaces.WarDependency; import me.NoChance.PvPManager.Dependencies.Interfaces.WorldGuardDependency; import me.NoChance.PvPManager.Listeners.MoveListener; import me.NoChance.PvPManager.Listeners.MoveListener1_9; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/PlayerHandler.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/PlayerHandler.java index be7133a7a..b58b927ad 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/PlayerHandler.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Managers/PlayerHandler.java @@ -18,8 +18,6 @@ import me.NoChance.PvPManager.PvPManager; import me.NoChance.PvPManager.PvPlayer; -import me.NoChance.PvPManager.Dependencies.Hook; -import me.NoChance.PvPManager.Dependencies.Interfaces.WorldGuardDependency; import me.NoChance.PvPManager.Events.PlayerCombatLogEvent; import me.NoChance.PvPManager.Player.ProtectionResult; import me.NoChance.PvPManager.Settings.Settings; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/PvPlayer.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/PvPlayer.java index 7154f2512..7df55fc3d 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/PvPlayer.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/PvPlayer.java @@ -1,5 +1,6 @@ package me.NoChance.PvPManager; +import java.util.EnumMap; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutorService; @@ -42,8 +43,8 @@ public class PvPlayer extends EcoPlayer { private long taggedTime; private NewbieTask newbieTask; private PvPlayer enemy; - private final HashMap victim = new HashMap<>(); - private final HashMap itemCooldown = new HashMap<>(); + private final Map victim = new HashMap<>(); + private final Map itemCooldown = new EnumMap<>(Material.class); private final PvPManager plugin; private NameTag nametag; private static ExecutorService executor; diff --git a/pvpmanager/src/main/java/me/NoChance/PvPManager/Settings/Settings.java b/pvpmanager/src/main/java/me/NoChance/PvPManager/Settings/Settings.java index 5a870cd54..10f48cb62 100644 --- a/pvpmanager/src/main/java/me/NoChance/PvPManager/Settings/Settings.java +++ b/pvpmanager/src/main/java/me/NoChance/PvPManager/Settings/Settings.java @@ -109,7 +109,6 @@ public enum DropMode { private static boolean blockInteractInCombat; private static boolean untagEnemy; private static boolean killAbuseWarn; - private static ChatColor teamColor; private static String actionBarMessage; private static String actionBarSymbol; private static int actionBarTotalBars; diff --git a/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/BukkitNameTag.java b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/BukkitNameTag.java index 1bc39e619..c360bd109 100644 --- a/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/BukkitNameTag.java +++ b/pvpmanager/src/main/java/me/chancesd/pvpmanager/player/nametag/BukkitNameTag.java @@ -16,8 +16,8 @@ public class BukkitNameTag extends NameTag { private Team inCombat; - private Team pvpOn; - private Team pvpOff; + private Team pvpOnTeam; + private Team pvpOffTeam; private Team previousTeam; private String previousTeamName; private final String combatTeamID; @@ -54,30 +54,30 @@ private void setup() { if (Settings.isToggleNametagsEnabled()) { if (!pvpOnPrefix.isEmpty()) { if (scoreboard.getTeam(PVPON) != null) { - pvpOn = scoreboard.getTeam(PVPON); + pvpOnTeam = scoreboard.getTeam(PVPON); } else { - pvpOn = scoreboard.registerNewTeam(PVPON); - pvpOn.setCanSeeFriendlyInvisibles(false); - pvpOn.setPrefix(pvpOnPrefix); + pvpOnTeam = scoreboard.registerNewTeam(PVPON); + pvpOnTeam.setCanSeeFriendlyInvisibles(false); + pvpOnTeam.setPrefix(pvpOnPrefix); if (MCVersion.isAtLeast(MCVersion.V1_13)) { final ChatColor nameColor = getLastColor(pvpOnPrefix); if (nameColor != null) { - pvpOn.setColor(nameColor); + pvpOnTeam.setColor(nameColor); } } } } if (!pvpOffPrefix.isEmpty()) { if (scoreboard.getTeam(PVPOFF) != null) { - pvpOff = scoreboard.getTeam(PVPOFF); + pvpOffTeam = scoreboard.getTeam(PVPOFF); } else { - pvpOff = scoreboard.registerNewTeam(PVPOFF); - pvpOff.setCanSeeFriendlyInvisibles(false); - pvpOff.setPrefix(pvpOffPrefix); + pvpOffTeam = scoreboard.registerNewTeam(PVPOFF); + pvpOffTeam.setCanSeeFriendlyInvisibles(false); + pvpOffTeam.setPrefix(pvpOffPrefix); if (MCVersion.isAtLeast(MCVersion.V1_13)) { final ChatColor nameColor = getLastColor(pvpOffPrefix); if (nameColor != null) { - pvpOff.setColor(nameColor); + pvpOffTeam.setColor(nameColor); } } } @@ -160,15 +160,15 @@ public final void restoreNametag() { @Override public final void setPvP(final boolean state) { if (state) { - if (pvpOn == null) { + if (pvpOnTeam == null) { restoreNametag(); } else { - pvpOn.addEntry(pvPlayer.getName()); + pvpOnTeam.addEntry(pvPlayer.getName()); } - } else if (pvpOff == null) { + } else if (pvpOffTeam == null) { restoreNametag(); } else { - pvpOff.addEntry(pvPlayer.getName()); + pvpOffTeam.addEntry(pvPlayer.getName()); } }