Fix NPE in division placeholder and fix hotbar items in crafting slots

Author: mallusrgreatv2

Plugin/src/main/java/dev/lrxh/neptune/feature/hotbar/listener/ItemListener.java

@@ -14,6 +14,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerSwapHandItemsEvent;
 import org.bukkit.inventory.ItemStack;
@@ -52,12 +53,15 @@ public void onInventoryClick(InventoryClickEvent event) {
         }
         if (profile.hasState(ProfileState.IN_CUSTOM, ProfileState.IN_KIT_EDITOR)) return;
         if (player.getGameMode().equals(GameMode.CREATIVE)) return;
-        if (event.getClickedInventory() != event.getWhoClicked().getInventory()) return;
+        if (event.getClickedInventory().getType() != InventoryType.CRAFTING && event.getClickedInventory() != event.getWhoClicked().getInventory()) return;
         event.setCancelled(true);
-        if (event.getCurrentItem() == null) return;
-        if (event.getCurrentItem().getType().equals(Material.AIR)) return;
+        if (event.getCurrentItem() != null && event.getCursor() != null && event.getCurrentItem().getType() == Material.AIR && event.getCursor().getType() == Material.AIR)
+            return;
+        ItemStack item = event.getCurrentItem() == null || event.getCurrentItem().getType() == Material.AIR ? event.getCursor() : event.getCurrentItem();
+        if (item == null) return;
+        if (item.getType().equals(Material.AIR)) return;
 
-        handleAction(profile, event.getCurrentItem());
+        handleAction(profile, item);
     }
 
     @EventHandler

Plugin/src/main/java/dev/lrxh/neptune/providers/placeholder/PlaceholderUtil.java

@@ -2,6 +2,7 @@
 
 import dev.lrxh.neptune.API;
 import dev.lrxh.neptune.Neptune;
+import dev.lrxh.neptune.feature.divisions.impl.Division;
 import dev.lrxh.neptune.feature.party.Party;
 import dev.lrxh.neptune.feature.queue.QueueEntry;
 import dev.lrxh.neptune.feature.queue.QueueService;
@@ -78,8 +79,9 @@ public String format(String line, Player player) {
             line = line.replaceAll("<kit>", queueEntry.getKit().getDisplayName());
             line = line.replaceAll("<maxPing>", String.valueOf(profile.getSettingData().getMaxPing()));
             line = line.replaceAll("<time>", String.valueOf(queueEntry.getTime().formatTime()));
-            line = line.replaceAll("<kit_division>",
-                    profile.getGameData().get(queueEntry.getKit()).getDivision().getDisplayName());
+            Division kitDivision = profile.getGameData().get(queueEntry.getKit()).getDivision();
+            if (kitDivision != null) line = line.replaceAll("<kit_division>",
+                    kitDivision.getDisplayName());
         }
 
         if (state.equals(ProfileState.IN_KIT_EDITOR)) {