Fix ReplaceToolOnBuy does not work for offhand

Author: MetallicGoat

src/main/java/me/metallicgoat/tweaksaddon/config/ConfigLegacyMigrator.java

@@ -138,8 +138,6 @@ public static void loadOldMain(FileConfiguration config) {
 
     MainConfig.papi_team_you_placeholder = config.getString("Team-You-Placeholder", MainConfig.papi_team_you_placeholder);
 
-    MainConfig.papi_player_arena_running_time = config.getString("Running-Time-Placeholder", MainConfig.papi_player_arena_running_time);
-
     MainConfig.scoreboard_updating_enabled_in_game = config.getBoolean("Force-Scoreboard-Updating.Enabled-In-Game", false);
     MainConfig.scoreboard_updating_enabled_in_lobby = config.getBoolean("Force-Scoreboard-Updating.Enabled-In-Lobby", false);
 

src/main/java/me/metallicgoat/tweaksaddon/tweaks/advancedswords/ReplaceToolOnBuy.java

@@ -8,6 +8,7 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
 
 public class ReplaceToolOnBuy implements Listener {
 
@@ -29,8 +30,11 @@ public void onToolBuy(PlayerBuyInShopEvent event) {
 
   private void clearOld(Material tool, Player p) {
     final boolean isClearingPickaxe = ToolSwordHelper.isPickaxe(tool);
+    final PlayerInventory inv = p.getInventory();
+
+    for (int i = 0; i < p.getInventory().getSize(); i++) {
+      final ItemStack itemStack = inv.getItem(i);
 
-    for (ItemStack itemStack : p.getInventory()) {
       if (itemStack == null ||
           !ToolSwordHelper.isTool(itemStack.getType()) ||
           !ToolSwordHelper.isNotToIgnore(itemStack))
@@ -40,7 +44,7 @@ private void clearOld(Material tool, Player p) {
       final boolean match = (isCheckingPickaxe && isClearingPickaxe) || (!isCheckingPickaxe && !isClearingPickaxe);
 
       if (match && ToolSwordHelper.getSwordToolLevel(tool) > ToolSwordHelper.getSwordToolLevel(itemStack.getType()))
-        p.getInventory().remove(itemStack);
+        inv.setItem(i, null);
     }
   }
 }

src/main/java/me/metallicgoat/tweaksaddon/utils/Util.java

@@ -5,9 +5,14 @@
 import de.marcely.bedwars.api.arena.Team;
 import de.marcely.bedwars.api.arena.picker.ArenaPickerAPI;
 import de.marcely.bedwars.api.game.spawner.DropType;
+import de.marcely.bedwars.tools.NMSHelper;
 import de.marcely.bedwars.tools.location.XYZYP;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -18,6 +23,19 @@
 
 public class Util {
 
+  public static @Nullable ItemStack getItemInOffHand(HumanEntity player) {
+    if (NMSHelper.get().getVersion() == 8)
+      return null;
+
+    try {
+      return (ItemStack) PlayerInventory.class.getDeclaredMethod("getItemInOffHand", null).invoke(player.getInventory());
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+
+    return null;
+  }
+
   public static Collection<Arena> parseArenas(String arenaKey) {
     if (arenaKey.equalsIgnoreCase("ALL-ARENAS")) {
       return GameAPI.get().getArenas();