enhanced rekit-on-kill settings

Author: rossnoah

CONFIG.md

@@ -336,7 +336,7 @@ feature:
 
 **Kit Loading Features:**
 - **rekit-on-respawn**: Automatically loads the player's last used kit when they respawn after death
-- **rekit-on-kill**: Automatically loads the player's last used kit when they kill another player
+- **rekit-on-kill**: Automatically loads the killer's last used kit when they kill another player. See [Rekit on Kill Configuration](#rekit-on-kill-configuration) for advanced options
 - **broadcast-kit-messages**: Controls whether broadcast messages are sent when players load kits or enderchesets (e.g., "Player loaded a kit"). When set to `false`, these specific kit-loading broadcast messages are suppressed
 
 **Action Broadcast Features:**
@@ -351,3 +351,70 @@ feature:
 - **feed-on-enderchest-load**: Sets player hunger to full when loading an enderchest
 - **set-saturation-on-enderchest-load**: Sets player saturation to full when loading an enderchest
 - **remove-potion-effects-on-enderchest-load**: Removes all potion effects when loading an enderchest
+
+---
+
+### **Rekit on Kill Configuration**
+
+The `rekit-on-kill` feature automatically loads the killer's last used kit when they kill another player. This feature supports world-based filtering to control where it activates, based on the killer's current world.
+
+```yaml
+feature:
+  rekit-on-kill:
+    enabled: false
+    # World filtering based on killer's current world
+    # If world-whitelist is not empty, rekit-on-kill only works in those worlds
+    # If world-whitelist is empty and world-blacklist is not empty, rekit-on-kill works everywhere except those worlds
+    # If both are empty, rekit-on-kill works in all worlds
+    world-whitelist: []
+    world-blacklist: []
+```
+
+#### Configuration Options:
+
+- **enabled**: Set to `true` to enable the rekit-on-kill feature
+- **world-whitelist**: List of world names where rekit-on-kill is allowed. If this list is not empty, the feature only works in these worlds
+- **world-blacklist**: List of world names where rekit-on-kill is disabled. Only used if `world-whitelist` is empty
+
+#### World Filtering Logic:
+
+1. If `world-whitelist` contains worlds → only allow rekit-on-kill in those worlds
+2. If `world-whitelist` is empty but `world-blacklist` contains worlds → allow rekit-on-kill everywhere except those worlds
+3. If both lists are empty → allow rekit-on-kill in all worlds
+
+#### Example Configurations:
+
+**Enable globally (all worlds):**
+```yaml
+feature:
+  rekit-on-kill:
+    enabled: true
+    world-whitelist: []
+    world-blacklist: []
+```
+
+**Only enable in specific arena worlds:**
+```yaml
+feature:
+  rekit-on-kill:
+    enabled: true
+    world-whitelist:
+      - "pvp_arena"
+      - "duel_world"
+    world-blacklist: []
+```
+
+**Enable everywhere except spawn/lobby:**
+```yaml
+feature:
+  rekit-on-kill:
+    enabled: true
+    world-whitelist: []
+    world-blacklist:
+      - "spawn"
+      - "lobby"
+```
+
+#### Backwards Compatibility:
+
+Existing configurations using the old boolean format (`rekit-on-kill: false` or `rekit-on-kill: true`) will continue to work. When the plugin updates, it will automatically add the new configuration keys with default values. No manual changes are required.

src/main/java/dev/noah/perplayerkit/listeners/AutoRekitListener.java

@@ -19,13 +19,16 @@
 package dev.noah.perplayerkit.listeners;
 
 import dev.noah.perplayerkit.KitManager;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.plugin.Plugin;
 
+import java.util.List;
+
 public class AutoRekitListener implements Listener {
 
     private final Plugin plugin;
@@ -37,7 +40,6 @@ public AutoRekitListener(Plugin plugin) {
     @EventHandler
     public void onRespawn(PlayerRespawnEvent e) {
 
-
         if (!plugin.getConfig().getBoolean("feature.rekit-on-respawn", true)) {
             return;
         }
@@ -47,14 +49,12 @@ public void onRespawn(PlayerRespawnEvent e) {
         }
 
         KitManager.get().loadLastKit(e.getPlayer());
-
     }
 
     @EventHandler
     public void onPlayerKill(PlayerDeathEvent e) {
 
-
-        if (!plugin.getConfig().getBoolean("feature.rekit-on-kill", false)) {
+        if (!isRekitOnKillEnabled()) {
             return;
         }
 
@@ -67,8 +67,50 @@ public void onPlayerKill(PlayerDeathEvent e) {
             return;
         }
 
-        KitManager.get().loadLastKit(killer);
+        String killerWorld = killer.getWorld().getName();
+        if (isWorldAllowedForRekitOnKill(killerWorld)) {
+            KitManager.get().loadLastKit(killer);
+        }
+    }
+
+    /**
+     * Checks if rekit-on-kill is enabled, supporting both old boolean format and new section format.
+     */
+    private boolean isRekitOnKillEnabled() {
+        // Check if it's a section (new format)
+        ConfigurationSection section = plugin.getConfig().getConfigurationSection("feature.rekit-on-kill");
+        if (section != null) {
+            return section.getBoolean("enabled", false);
+        }
+        // Fall back to old boolean format for backwards compatibility
+        return plugin.getConfig().getBoolean("feature.rekit-on-kill", false);
+    }
+
+    /**
+     * Checks if a world is allowed for rekit-on-kill based on whitelist/blacklist settings.
+     */
+    private boolean isWorldAllowedForRekitOnKill(String worldName) {
+        ConfigurationSection section = plugin.getConfig().getConfigurationSection("feature.rekit-on-kill");
+        if (section == null) {
+            // Old format - no world filtering, allow all
+            return true;
+        }
+
+        List<String> whitelist = section.getStringList("world-whitelist");
+        List<String> blacklist = section.getStringList("world-blacklist");
+
+        // If whitelist is not empty, only allow worlds in the whitelist
+        if (whitelist != null && !whitelist.isEmpty()) {
+            return whitelist.contains(worldName);
+        }
+
+        // If blacklist is not empty, allow all worlds except those in the blacklist
+        if (blacklist != null && !blacklist.isEmpty()) {
+            return !blacklist.contains(worldName);
+        }
 
+        // Both empty - allow all worlds
+        return true;
     }
 
 }

src/main/resources/config.yml

@@ -184,7 +184,14 @@ feature:
   heal-remove-effects: false #makes the /heal command remove potion effects in addition to healing
 
   rekit-on-respawn: true
-  rekit-on-kill: false
+  rekit-on-kill:
+    enabled: false
+    # World filtering based on killer's current world
+    # If world-whitelist is not empty, rekit-on-kill only works in those worlds
+    # If world-whitelist is empty and world-blacklist is not empty, rekit-on-kill works everywhere except those worlds
+    # If both are empty, rekit-on-kill works in all worlds
+    world-whitelist: []
+    world-blacklist: []
 
   broadcast-kit-messages: true #broadcasts when a player loads a kit (applies to both kits and enderchesets)