bump version

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.youhavetrouble.preventstabby</groupId>
     <artifactId>PreventStabby</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.2</version>
     <packaging>jar</packaging>
 
     <name>PreventStabby</name>

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

@@ -44,13 +44,13 @@ 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_announce) {
-            PluginMessages.broadcastMessage(player, PreventStabby.getPlugin().getConfigCache().punish_for_combat_logout_message);
-        }
-        if (!PreventStabby.getPlugin().getConfigCache().punish_for_combat_logout_kill) 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);
     }
 

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

@@ -175,7 +175,7 @@ public class PlayerManager {
             }
         }
 
-        if (!attackerPlayerData.isPvpEnabled() && (PreventStabby.worldGuardHookEnabled() && !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 +185,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() || (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;