prevent null players being forwarded to events and message sending logic edge case

Announce player's combat logging and then (maybe) kill afterwards

pom.xml

@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>me.youhavetrouble</groupId>
+    <groupId>me.youhavetrouble.preventstabby</groupId>
     <artifactId>PreventStabby</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.3</version>
     <packaging>jar</packaging>
 
     <name>PreventStabby</name>
@@ -104,7 +104,7 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.1</version>
+            <version>2.11.6</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

src/main/java/me/youhavetrouble/preventstabby/config/ConfigCache.java

@@ -16,7 +16,7 @@ public class ConfigCache {
             bucket_stopper_enabled,
             fire_stopper_enabled,
             block_stopper_enabled,
-            punish_for_combat_logout,
+            punish_for_combat_logout_kill,
             punish_for_combat_logout_announce,
             block_teleports_in_combat,
             allow_fishing_rod_pull;
@@ -42,6 +42,10 @@ public class ConfigCache {
         plugin.reloadConfig();
         config = plugin.getConfig();
 
+        migrate("settings.punish_for_combat_logout.enabled",
+                "settings.punish_for_combat_logout.kill",
+                true);
+
         // Settings
         this.pvp_enabled_by_default = getBoolean(
                 "settings.pvp_enabled_by_default",
@@ -54,15 +58,16 @@ public class ConfigCache {
                 25,
                 List.of("How long in seconds should combat last since the last hit")
         );
-        this.punish_for_combat_logout = getBoolean(
-                "settings.punish_for_combat_logout.enabled",
+
+        this.punish_for_combat_logout_kill = getBoolean(
+                "settings.punish_for_combat_logout.kill",
                 true,
                 List.of("Should players be killed if they log out during combat?")
         );
         this.punish_for_combat_logout_announce = getBoolean(
                 "settings.punish_for_combat_logout.announce",
                 true,
-                List.of("Should killing of a player that logged out of combat be announced?")
+                List.of("Should we announce that player logged out of combat?")
         );
 
         List<String> commandsBlockedInCombat = getList(
@@ -199,43 +204,74 @@ public class ConfigCache {
     }
 
     private String getString(String path, @NotNull String def, @Nullable List<String> comments) {
-        if (config.isSet(path)) return config.getString(path, def);
+        String value;
+        if (config.isSet(path)) {
+            value = config.getString(path, def);
+        } else {
             config.set(path, def);
+            value = def;
+        }
         if (comments != null) config.setComments(path, comments);
-        return def;
+        return value;
     }
 
     private boolean getBoolean(String path, boolean def, @Nullable List<String> comments) {
-        if (config.isSet(path)) return config.getBoolean(path, def);
+        boolean value;
+        if (config.isSet(path)) {
+            value = config.getBoolean(path, def);
+        } else {
             config.set(path, def);
+            value = def;
+        }
         if (comments != null) config.setComments(path, comments);
-        return def;
+        return value;
     }
 
     private double getDouble(String path, double def, @Nullable List<String> comments) {
-        if (config.isSet(path)) return config.getDouble(path, def);
+        double value;
+        if (config.isSet(path)) {
+            value = config.getDouble(path, def);
+        } else {
             config.set(path, def);
+            value = def;
+        }
         if (comments != null) config.setComments(path, comments);
-        return def;
+        return value;
     }
 
     private long getLong(String path, long def, @Nullable List<String> comments) {
-        if (config.isSet(path)) return config.getLong(path, def);
+        long value;
+        if (config.isSet(path)) {
+            value = config.getLong(path, def);
+        } else {
             config.set(path, def);
+            value = def;
+        }
         if (comments != null) config.setComments(path, comments);
-        return def;
+        return value;
     }
 
     private List<String> getList(String path, List<String> def, @Nullable List<String> comments) {
-        if (config.isSet(path)) return config.getStringList(path);
+        List<String> value;
+        if (config.isSet(path)) {
+            value = config.getStringList(path);
+        } else {
             config.set(path, def);
+            value = def;
+        }
         if (comments != null) config.setComments(path, comments);
-        return def;
+        return value;
     }
 
     private List<String> getList(String path, List<String> def) {
         return getList(path, def, null);
     }
 
-
+    private void migrate(String oldPath, String newPath, @Nullable Object defaultValue) {
+        if (config.isSet(oldPath) && !config.isSet(newPath)) {
+            Object value = config.get(oldPath);
+            config.set(newPath, value != null ? value : defaultValue);
+            config.set(oldPath, null);
+        }
+    }
 }

src/main/java/me/youhavetrouble/preventstabby/data/PlayerListener.java

@@ -44,14 +44,15 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPlayerLeave(PlayerQuitEvent event) {
         Player player = event.getPlayer();
-        if (!PreventStabby.getPlugin().getConfigCache().punish_for_combat_logout) return;
         PlayerData playerData = PreventStabby.getPlugin().getPlayerManager().getPlayer(player.getUniqueId());
         if (playerData == null) return;
         if (!playerData.isInCombat()) return;
-        player.setHealth(0);
-        if (!PreventStabby.getPlugin().getConfigCache().punish_for_combat_logout_announce) return;
+        if (PreventStabby.getPlugin().getConfigCache().punish_for_combat_logout_announce) {
             PluginMessages.broadcastMessage(player, PreventStabby.getPlugin().getConfigCache().punish_for_combat_logout_message);
         }
+        if (!PreventStabby.getPlugin().getConfigCache().punish_for_combat_logout_kill) return;
+        player.setHealth(0);
+    }
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onPlayerTeleport(PlayerTeleportEvent event) {

src/main/java/me/youhavetrouble/preventstabby/data/PlayerManager.java

@@ -46,15 +46,16 @@ public class PlayerManager {
             for (PlayerData playerData : playerList.values()) {
                 if (playerData == null) continue;
                 Player player = Bukkit.getPlayer(playerData.getPlayerUuid());
-                if (player == null || !player.isOnline()) {
-                    // player not online, so check for related entities
                 playerData.getRelatedEntities().removeIf( uuid -> {
                     Entity entity = Bukkit.getEntity(uuid);
                     return entity == null;
                 });
+                if (player == null || !player.isOnline()) {
+                    // player not online, so check for related entities
                     if (playerData.getRelatedEntities().isEmpty()) continue;
                 }
-                playerData.refreshCacheTime(); // Refresh cache timer if player is online
+                playerData.refreshCacheTime();
+                if (player == null || !player.isOnline()) continue; // If player is offline, skip the rest of the logic
                 // leaving combat logic
                 if (playerData.getLastCombatCheckState() && !playerData.isInCombat()) {
                     PlayerLeaveCombatEvent leaveCombatEvent = null;
@@ -175,7 +176,7 @@ public class PlayerManager {
             }
         }
 
-        if (!attackerPlayerData.isPvpEnabled() && !WorldGuardHook.isPlayerForcedToPvp(Bukkit.getPlayer(attackerId))) {
+        if (!attackerPlayerData.isPvpEnabled() || (PreventStabby.worldGuardHookEnabled() && !WorldGuardHook.isPlayerForcedToPvp(Bukkit.getPlayer(attackerId)))) {
             String message = switch (victimClassifier) {
                 case PLAYER -> plugin.getConfigCache().cannot_attack_attacker;
                 case PET -> plugin.getConfigCache().cannot_attack_pets_victim;
@@ -185,7 +186,7 @@ public class PlayerManager {
             return new DamageCheckResult(false, attackerId, victimId, message, victimClassifier.equals(Target.EntityClassifier.PLAYER));
         }
 
-        if (!victimPlayerData.isPvpEnabled() && !WorldGuardHook.isPlayerForcedToPvp(Bukkit.getPlayer(victimId))) {
+        if (!victimPlayerData.isPvpEnabled() || (PreventStabby.worldGuardHookEnabled() && !WorldGuardHook.isPlayerForcedToPvp(Bukkit.getPlayer(victimId)))) {
             String message = switch (victimClassifier) {
                 case PLAYER -> plugin.getConfigCache().cannot_attack_victim;
                 case PET -> plugin.getConfigCache().cannot_attack_pets_attacker;

src/main/java/me/youhavetrouble/preventstabby/util/PluginMessages.java

@@ -9,6 +9,7 @@ import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
 
@@ -33,12 +34,12 @@ public class PluginMessages {
         return PreventStabby.getPlugin().getServer().getPluginManager().getPlugin("PlaceholderAPI") != null;
     }
 
-    public static void sendMessage(CommandSender sender, String message) {
+    public static void sendMessage(@NotNull CommandSender sender, String message) {
         if ("".equals(message)) return;
         sender.sendMessage(parseMessage(sender, message));
     }
 
-    public static void sendActionBar(Player player, String message) {
+    public static void sendActionBar(@NotNull Player player, String message) {
         if ("".equals(message)) return;
         Component parsedMessage = parseMessage(player, message);
         player.sendActionBar(parsedMessage);