remove the test suffix from version

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-pre-5</version>
+    <version>2.1.4</version>
     <packaging>jar</packaging>
 
     <name>PreventStabby</name>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.21-R0.1-SNAPSHOT</version>
+            <version>1.21.11-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -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/PreventStabby.java

@@ -11,11 +11,16 @@ import me.youhavetrouble.preventstabby.listeners.PvpListener;
 import me.youhavetrouble.preventstabby.listeners.UtilListener;
 import me.youhavetrouble.preventstabby.util.*;
 import org.bstats.bukkit.Metrics;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Tameable;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
+import java.util.UUID;
 
 public final class PreventStabby extends JavaPlugin {
 
@@ -57,17 +62,37 @@ public final class PreventStabby extends JavaPlugin {
         }
 
         Metrics metrics = new Metrics(this, 14074);
+
+        getServer().getOnlinePlayers().forEach(player -> playerManager.getPlayerData(player.getUniqueId()));
+        getServer().getWorlds().forEach(world -> {
+            for (Chunk chunk : world.getLoadedChunks()) {
+                if (!chunk.isEntitiesLoaded()) continue;
+                Bukkit.getRegionScheduler().run(plugin, chunk.getWorld(), chunk.getX(), chunk.getZ(), (task)  -> {
+                    for (Entity entity : chunk.getEntities()) {
+                        if (!(entity instanceof Tameable tameable)) continue;
+                        UUID ownerId = tameable.getOwnerUniqueId();
+                        if (ownerId == null) continue;
+                        getPlayerManager().getPlayerData(ownerId).thenAccept(playerData -> {
+                            if (playerData == null) return;
+                            playerData.addRelatedEntity(entity.getUniqueId());
+                        });
+                    }
+                });
+            }
+        });
     }
 
     @Override
     public void onLoad() {
         if (getServer().getPluginManager().getPlugin("WorldGuard") != null) {
             try {
-                WorldGuardHook.init();
+                WorldGuardHook.init(this.getLogger());
                 worldGuardHook = true;
             } catch (NoClassDefFoundError e) {
                 worldGuardHook = false;
             }
+        } else {
+            worldGuardHook = false;
         }
     }
 

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;
-        config.set(path, def);
+        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;
-        config.set(path, def);
+        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;
-        config.set(path, def);
+        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;
-        config.set(path, def);
+        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;
-        config.set(path, def);
+        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/PlayerData.java

@@ -1,7 +1,10 @@
 package me.youhavetrouble.preventstabby.data;
 
 import me.youhavetrouble.preventstabby.PreventStabby;
+import org.jetbrains.annotations.Nullable;
 
+import java.util.HashSet;
+import java.util.Set;
 import java.util.UUID;
 
 /**
@@ -13,6 +16,7 @@ public class PlayerData {
     private long lastAccessTimestamp;
     private Long combatStartTimestamp, teleportTimestamp, loginTimestamp;
     private boolean pvpEnabled, lastCombatCheck;
+    private final Set<UUID> relatedEntities = new HashSet<>();
 
     public PlayerData(UUID playerUuid, boolean pvpEnabled) {
         this.playerUuid = playerUuid;
@@ -106,6 +110,7 @@ public class PlayerData {
      * Retrieves the login timestamp for the player.
      * @return The login timestamp for the player.
      */
+    @Nullable
     public Long getLoginTimestamp() {
         return loginTimestamp;
     }
@@ -162,4 +167,28 @@ public class PlayerData {
     public boolean isProtected() {
         return  hasLoginProtection() || hasTeleportProtection();
     }
+
+    /**
+     * Get the list of entities related to the player that should keep player's data loaded
+     * @return The list of entities related to the player that should keep player's data loaded
+     */
+    public Set<UUID> getRelatedEntities() {
+        return relatedEntities;
+    }
+
+    /**
+     * @see #getRelatedEntities()
+     * @param entity The entity id to add to the list of related entities
+     */
+    public void addRelatedEntity(UUID entity) {
+        relatedEntities.add(entity);
+    }
+
+    /**
+     * @see #getRelatedEntities()
+     * @param entity The entity id to remove from the list of related entities
+     */
+    public void removeRelatedEntity(UUID entity) {
+        relatedEntities.remove(entity);
+    }
 }

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

@@ -44,13 +44,14 @@ 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;
+        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);
-        if (!PreventStabby.getPlugin().getConfigCache().punish_for_combat_logout_announce) return;
-        PluginMessages.broadcastMessage(player, PreventStabby.getPlugin().getConfigCache().punish_for_combat_logout_message);
     }
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
@@ -78,7 +79,10 @@ public class PlayerListener implements Listener {
         if (!(entity instanceof Tameable tameable)) return;
         UUID ownerId = tameable.getOwnerUniqueId();
         if (ownerId == null) return;
-        PreventStabby.getPlugin().getPlayerManager().getPlayerData(ownerId);
+        PreventStabby.getPlugin().getPlayerManager().getPlayerData(ownerId).thenAccept(playerData -> {
+            if (playerData == null) return;
+            playerData.addRelatedEntity(entity.getUniqueId());
+        });
     }
 
 }

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

@@ -3,14 +3,16 @@ package me.youhavetrouble.preventstabby.data;
 import me.youhavetrouble.preventstabby.PreventStabby;
 import me.youhavetrouble.preventstabby.api.event.PlayerEnterCombatEvent;
 import me.youhavetrouble.preventstabby.api.event.PlayerLeaveCombatEvent;
+import me.youhavetrouble.preventstabby.hooks.WorldGuardHook;
 import me.youhavetrouble.preventstabby.util.PluginMessages;
 import me.youhavetrouble.preventstabby.util.PvpState;
 import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Tameable;
 import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
@@ -29,26 +31,31 @@ public class PlayerManager {
             playerList.values().removeIf(PlayerData::isCacheExpired);
         }, 250, 250, TimeUnit.MILLISECONDS);
 
-        Bukkit.getGlobalRegionScheduler().runAtFixedRate(plugin, (task) -> Bukkit.getWorlds().forEach((world -> {
+        Bukkit.getAsyncScheduler().runAtFixedRate(plugin, (task) -> {
-            for (Chunk chunk : world.getLoadedChunks()) {
+            Collection<? extends Player> players = new ArrayList<>(Bukkit.getOnlinePlayers());
-                if (!chunk.isEntitiesLoaded()) continue;
+            // Load data for all online players as a failsafe
-                Bukkit.getRegionScheduler().run(plugin, chunk.getWorld(), chunk.getX(), chunk.getZ(), (task1)  -> {
+            CompletableFuture.allOf(players.stream().map(player -> getPlayerData(player.getUniqueId())).toArray(CompletableFuture[]::new)).join();
-                    for (Entity entity : chunk.getEntities()) {
+            // Refresh cache time for all players
-                        if (!(entity instanceof Tameable tameable)) continue;
+            for (PlayerData playerData : playerList.values()) {
-                        UUID ownerId = tameable.getOwnerUniqueId();
+                if (playerData == null) continue;
-                        if (ownerId == null) continue;
+                playerData.refreshCacheTime();
-                        getPlayerData(ownerId);
-                    }
-                });
             }
-        })), 5, 20 * 15);
+        }, 1, 1, TimeUnit.SECONDS);
 
         Bukkit.getGlobalRegionScheduler().runAtFixedRate(plugin, (task) -> {
             for (PlayerData playerData : playerList.values()) {
                 if (playerData == null) continue;
                 Player player = Bukkit.getPlayer(playerData.getPlayerUuid());
-                if (player == null || !player.isOnline()) continue;
+                playerData.getRelatedEntities().removeIf( uuid -> {
-                playerData.refreshCacheTime(); // Refresh cache timer if player is online
+                    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();
+                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;
@@ -169,7 +176,14 @@ public class PlayerManager {
             }
         }
 
-        if (!attackerPlayerData.isPvpEnabled()) {
+        Boolean attackerForcedPvpState = null;
+        Boolean victimForcedPvpState = null;
+        if (PreventStabby.worldGuardHookEnabled()) {
+            attackerForcedPvpState = WorldGuardHook.isPlayerForcedToPvp(Bukkit.getPlayer(attackerId));
+            victimForcedPvpState = WorldGuardHook.isPlayerForcedToPvp(Bukkit.getPlayer(victimId));
+        }
+
+        if (!attackerPlayerData.isPvpEnabled() || Boolean.FALSE.equals(attackerForcedPvpState)) {
             String message = switch (victimClassifier) {
                 case PLAYER -> plugin.getConfigCache().cannot_attack_attacker;
                 case PET -> plugin.getConfigCache().cannot_attack_pets_victim;
@@ -179,7 +193,7 @@ public class PlayerManager {
             return new DamageCheckResult(false, attackerId, victimId, message, victimClassifier.equals(Target.EntityClassifier.PLAYER));
         }
 
-        if (!victimPlayerData.isPvpEnabled()) {
+        if (!victimPlayerData.isPvpEnabled() || Boolean.FALSE.equals(victimForcedPvpState)) {
             String message = switch (victimClassifier) {
                 case PLAYER -> plugin.getConfigCache().cannot_attack_victim;
                 case PET -> plugin.getConfigCache().cannot_attack_pets_attacker;
@@ -238,13 +252,15 @@ public class PlayerManager {
         });
     }
 
-    public void setPlayerPvpState(UUID uuid, boolean state) {
+    public CompletableFuture<Void> setPlayerPvpState(UUID uuid, boolean state) {
         // If player is in cache update that
         if (getPlayer(uuid) != null) {
             getPlayer(uuid).setPvpEnabled(state);
         }
-        // Update the database aswell
+        return CompletableFuture.runAsync(() -> {
-        plugin.getSqLite().updatePlayerInfo(uuid, new PlayerData(uuid, state));
+            // Update the database aswell
+            plugin.getSqLite().updatePlayerInfo(uuid, new PlayerData(uuid, state));
+        });
     }
 
     public CompletableFuture<Boolean> togglePlayerPvpState(UUID uuid) {

src/main/java/me/youhavetrouble/preventstabby/hooks/WorldGuardHook.java

@@ -15,17 +15,19 @@ import com.sk89q.worldguard.protection.regions.RegionQuery;
 import me.youhavetrouble.preventstabby.PreventStabby;
 import org.bukkit.entity.Player;
 
+import java.util.logging.Logger;
+
 public class WorldGuardHook {
 
     private static FlagRegistry flagRegistry;
     public static StateFlag FORCE_PVP_FLAG;
 
-    public static void init() {
+    public static void init(Logger logger) {
         try {
             Class.forName("com.sk89q.worldguard.protection.flags.registry.FlagRegistry");
             WorldGuardPlugin worldGuardPlugin = WorldGuardPlugin.inst();
             if (WorldGuard.getInstance() == null || worldGuardPlugin == null) return;
-            PreventStabby.getPlugin().getLogger().info("[PreventStabby] Hooking into WorldGuard");
+            logger.info("Hooking into WorldGuard");
             flagRegistry = WorldGuard.getInstance().getFlagRegistry();
             createForcePvpFlag();
         } catch (NoClassDefFoundError | ClassNotFoundException ignored) {
@@ -49,14 +51,20 @@ public class WorldGuardHook {
         }
     }
 
-    public static boolean isPlayerForcedToPvp(Player player) {
+    public static Boolean isPlayerForcedToPvp(Player player) {
+        if (player == null) return false;
+        if (!PreventStabby.worldGuardHookEnabled()) return false;
         RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
         RegionQuery query = container.createQuery();
         org.bukkit.Location loc = player.getLocation();
         if (loc.getWorld() == null) return false;
         LocalPlayer localPlayer = WorldGuardPlugin.inst().wrapPlayer(player);
         ApplicableRegionSet set = query.getApplicableRegions(new Location(BukkitAdapter.adapt(loc.getWorld()), loc.getX(), loc.getY(), loc.getZ()));
-        return set.testState(localPlayer, FORCE_PVP_FLAG);
+        return switch (set.queryState(localPlayer, FORCE_PVP_FLAG)) {
+            case ALLOW -> true;
+            case DENY -> false;
+            case null-> null;
+        };
     }
 
 }

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);