fix kit bug #2 and clean up

JT122406 · May 23, 2022 · 1a91f9b · 1a91f9b
1 parent dead7f7
commit 1a91f9b
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 29 deletions.
diff --git a/src/main/java/tk/shanebee/hg/commands/KitCmd.java b/src/main/java/tk/shanebee/hg/commands/KitCmd.java
@@ -22,7 +22,6 @@ public boolean run() {
 		    return false;
         }
 		if (st == Status.WAITING || st == Status.COUNTDOWN) {
-			player.getInventory().clear();
 			game.getKitManager().setKit(player, args[1]);
 			//Bukkit.getScheduler().runTaskLater(plugin, () -> game.getKitManager().setKit(player, args[1]), 10L);
 		} else {

diff --git a/src/main/java/tk/shanebee/hg/game/Game.java b/src/main/java/tk/shanebee/hg/game/Game.java
@@ -235,9 +235,6 @@ public void startPreGame() {
      * Start the free roam state of the game
      */
     public void startFreeRoam() {
-        for (UUID p : gamePlayerData.getPlayers()) {
-            Objects.requireNonNull(Bukkit.getPlayer(p)).getInventory().clear();
-        }
         gameArenaData.status = Status.BEGINNING;
         gameBlockData.updateLobbyBlock();
         gameArenaData.bound.removeEntities();

diff --git a/src/main/java/tk/shanebee/hg/game/GameBarData.java b/src/main/java/tk/shanebee/hg/game/GameBarData.java
@@ -105,6 +105,8 @@ public void addPlayer(Player player) {
      *
      * @return Associated bossbar
      */
+
+    @Deprecated
     public BossBar getBossBar() {
         return this.bar;
     }

diff --git a/src/main/java/tk/shanebee/hg/game/GameCommandData.java b/src/main/java/tk/shanebee/hg/game/GameCommandData.java
@@ -90,7 +90,7 @@ public enum CommandType {
          */
         JOIN("join");
 
-        String type;
+        final String type;
 
         CommandType(String type) {
             this.type = type;

diff --git a/src/main/java/tk/shanebee/hg/game/GamePlayerData.java b/src/main/java/tk/shanebee/hg/game/GamePlayerData.java
@@ -84,7 +84,7 @@ public SpectatorGUI getSpectatorGUI() {
     // Utility methods
 
     private void kitHelp(Player player) {
-        // Clear the chat a little bit, making this message easier to see
+        // Clear the chat a little, making this message easier to see
         for (int i = 0; i < 20; ++i)
             Util.scm(player, " ");
         String kit = game.kitManager.getKitListString();
@@ -299,16 +299,18 @@ public void join(Player player, boolean command) {
                 kills.put(player, 0);
 
                 if (Config.enableleaveitem){
-                    ItemStack bed = new ItemStack(Material.getMaterial(Config.leaveitemtype), 1);
+                    ItemStack bed = new ItemStack(Objects.requireNonNull(Material.getMaterial(Config.leaveitemtype)), 1);
                     ItemMeta commeta = bed.getItemMeta();
+                    assert commeta != null;
                     commeta.setDisplayName(lang.leave_game);
                     bed.setItemMeta(commeta);
                     player.getInventory().setItem(8, bed);
                 }
 
                 if (Config.enableforcestartitem && player.hasPermission("hg.forcestart")) {
-                    ItemStack start = new ItemStack(Material.getMaterial(Config.forcestartitem), 1);
+                    ItemStack start = new ItemStack(Objects.requireNonNull(Material.getMaterial(Config.forcestartitem)), 1);
                     ItemMeta meta = start.getItemMeta();
+                    assert meta != null;
                     meta.setDisplayName(lang.force_start);
                     start.setItemMeta(meta);
                     player.getInventory().setItem(0, start);
@@ -362,6 +364,7 @@ public void leave(Player player, Boolean death) {
         }
         heal(player);
         PlayerData playerData = playerManager.getPlayerData(uuid);
+        assert playerData != null;
         Location previousLocation = playerData.getPreviousLocation();
 
         playerData.restore(player);
@@ -440,6 +443,7 @@ public void spectate(Player spectator) {
     public void leaveSpectate(Player spectator) {
         UUID uuid = spectator.getUniqueId();
         PlayerData playerData = playerManager.getSpectatorData(uuid);
+        assert playerData != null;
         Location previousLocation = playerData.getPreviousLocation();
 
         playerData.restore(spectator);

diff --git a/src/main/java/tk/shanebee/hg/game/Team.java b/src/main/java/tk/shanebee/hg/game/Team.java
@@ -8,6 +8,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 
 /**
@@ -27,6 +28,7 @@ public Team(Player leader, String name, Game game) {
         this.leader = leader.getUniqueId();
         PlayerData playerData = plugin.getPlayerManager().getPlayerData(leader);
         players.add(leader.getUniqueId());
+        assert playerData != null;
         playerData.setTeam(this);
         playerData.setPendingTeam(null);
 
@@ -49,7 +51,7 @@ public void invite(Player player) {
         Util.scm(player, HG.getPlugin().getLang().team_invite_3);
         Util.scm(player, HG.getPlugin().getLang().team_invite_4);
         pending.add(player.getUniqueId());
-        HG.getPlugin().getPlayerManager().getData(player).setPendingTeam(this);
+        Objects.requireNonNull(HG.getPlugin().getPlayerManager().getData(player)).setPendingTeam(this);
     }
 
     /**
@@ -59,6 +61,7 @@ public void invite(Player player) {
      */
     public void acceptInvite(Player player) {
         PlayerData playerData = HG.getPlugin().getPlayerManager().getPlayerData(player);
+        assert playerData != null;
         playerData.setPendingTeam(null);
         playerData.setTeam(this);
         pending.remove(player.getUniqueId());

diff --git a/src/main/java/tk/shanebee/hg/listeners/GameListener.java b/src/main/java/tk/shanebee/hg/listeners/GameListener.java
@@ -460,8 +460,10 @@ private void onInventoryClick(InventoryClickEvent e) {
 		Status status = game.getGameArenaData().getStatus();
 		if (status != Status.RUNNING && status != Status.BEGINNING) {
 			if (Objects.equals(Objects.requireNonNull(e.getClickedInventory().getItem(e.getSlot())).getType(), Material.getMaterial(Config.leaveitemtype))) {
+				Util.clearInv(player);
 				game.getGamePlayerData().leave(player,false);
 			} else if (Objects.equals(Objects.requireNonNull(e.getClickedInventory().getItem(e.getSlot())).getType(), Material.getMaterial(Config.forcestartitem))) {
+				Util.clearInv(player);
 				game.startGame();
 			}
 		}

diff --git a/src/main/java/tk/shanebee/hg/listeners/McmmoListeners.java b/src/main/java/tk/shanebee/hg/listeners/McmmoListeners.java
@@ -22,7 +22,7 @@
  */
 public class McmmoListeners implements Listener {
 
-	private HG plugin;
+	private final HG plugin;
 	private final PlayerManager playerManager;
 
 	public McmmoListeners(HG plugin) {

diff --git a/src/main/java/tk/shanebee/hg/managers/KillManager.java b/src/main/java/tk/shanebee/hg/managers/KillManager.java
@@ -14,7 +14,7 @@
  */
 public class KillManager {
 
-    private Language lang = HG.getPlugin().getLang();
+    private final Language lang = HG.getPlugin().getLang();
 
     /** Get the death message when a player dies of natural causes (non-entity involved deaths)
      * @param dc Cause of the damage

diff --git a/src/main/java/tk/shanebee/hg/managers/MobManager.java b/src/main/java/tk/shanebee/hg/managers/MobManager.java
@@ -15,6 +15,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Manager for mob spawning in games
@@ -50,8 +51,8 @@ private void loadMobs() {
                 if (getSection(key) != null) {
                     MobEntry entry;
                     // MYTHIC MOB
-                    if (getString(key, "type").startsWith("MM:") && HG.getPlugin().getMmMobManager() != null) {
-                        String mythicMob = getString(key, "type").replace("MM:", "");
+                    if (Objects.requireNonNull(getString(key, "type")).startsWith("MM:") && HG.getPlugin().getMmMobManager() != null) {
+                        String mythicMob = Objects.requireNonNull(getString(key, "type")).replace("MM:", "");
                         entry = new MobEntry(mythicMob, getInt(key, "level"));
                     }
                     // REGULAR MOB

diff --git a/src/main/java/tk/shanebee/hg/managers/Placeholders.java b/src/main/java/tk/shanebee/hg/managers/Placeholders.java
@@ -12,9 +12,9 @@
  */
 public class Placeholders extends PlaceholderExpansion {
 
-    private HG plugin;
-    private Leaderboard leaderboard;
-    private Language lang;
+    private final HG plugin;
+    private final Leaderboard leaderboard;
+    private final Language lang;
 
     public Placeholders(HG plugin) {
         this.plugin = plugin;

diff --git a/src/main/java/tk/shanebee/hg/tasks/StartingTask.java b/src/main/java/tk/shanebee/hg/tasks/StartingTask.java
@@ -42,7 +42,7 @@ public void run() {
         if (timer <= 0) {
             //clear inventory on game start
 
-            if (Config.enableleaveitem || Config.enableforcestartitem)
+            if ((Config.enableleaveitem) || Config.enableforcestartitem)
                 game.getGamePlayerData().getPlayers().forEach(uuid -> {
                     Player player = Bukkit.getPlayer(uuid);
                     assert player != null;
@@ -51,7 +51,6 @@ public void run() {
                     }
                 });
 
-
             stop();
             game.startFreeRoam();
         } else {

diff --git a/src/main/java/tk/shanebee/hg/util/PotionTypeUtils.java b/src/main/java/tk/shanebee/hg/util/PotionTypeUtils.java
@@ -91,15 +91,6 @@ public static PotionType getByBukkit(String bukkit) {
         return PotionType.valueOf(bukkit.toUpperCase());
     }
 
-    /**
-     * Get Bukkit key for PotionType
-     *
-     * @return Bukkit key
-     */
-    public String getBukkitKey() {
-        return bukkit;
-    }
-
     /**
      * Get PotionData from a String
      * <p><b>Formats:</b>

diff --git a/src/main/java/tk/shanebee/hg/util/Vault.java b/src/main/java/tk/shanebee/hg/util/Vault.java
@@ -12,12 +12,11 @@ public class Vault {
 
     public static Economy economy = null;
 
-    public static boolean setupEconomy() {
+    public static void setupEconomy() {
         RegisteredServiceProvider<Economy> economyProvider = Bukkit.getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
         if (economyProvider != null) {
             economy = economyProvider.getProvider();
         }
-        return (economy != null);
     }
 
 }