remove the test suffix from version

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.youhavetrouble.preventstabby</groupId>
     <artifactId>PreventStabby</artifactId>
-    <version>2.1.2</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>
 

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());
+                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
-                    playerData.getRelatedEntities().removeIf( uuid -> {
-                        Entity entity = Bukkit.getEntity(uuid);
-                        return entity == null;
-                    });
                     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,14 @@ public class PlayerManager {
             }
         }
 
-        if (!attackerPlayerData.isPvpEnabled() || (PreventStabby.worldGuardHookEnabled() && !WorldGuardHook.isPlayerForcedToPvp(Bukkit.getPlayer(attackerId)))) {
+        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;
@@ -185,7 +193,7 @@ public class PlayerManager {
             return new DamageCheckResult(false, attackerId, victimId, message, victimClassifier.equals(Target.EntityClassifier.PLAYER));
         }
 
-        if (!victimPlayerData.isPvpEnabled() || (PreventStabby.worldGuardHookEnabled() && !WorldGuardHook.isPlayerForcedToPvp(Bukkit.getPlayer(victimId)))) {
+        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;

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

@@ -51,7 +51,7 @@ 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();
@@ -60,7 +60,11 @@ public class WorldGuardHook {
         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);