From bd9ecc09aeffa690e713d166de09c412f46a0d7a Mon Sep 17 00:00:00 2001
From: YouHaveTrouble <youhavetrouble@youhavetrouble.me>
Date: Tue, 17 Jun 2025 16:02:31 +0200
Subject: [PATCH] do not announce combat quit when player is not in combat when
 quitting

---
 .../youhavetrouble/preventstabby/data/PlayerListener.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/me/youhavetrouble/preventstabby/data/PlayerListener.java b/src/main/java/me/youhavetrouble/preventstabby/data/PlayerListener.java
index 3bd1d70..cbdb40c 100644
--- a/src/main/java/me/youhavetrouble/preventstabby/data/PlayerListener.java
+++ b/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();
+        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;
-        PlayerData playerData = PreventStabby.getPlugin().getPlayerManager().getPlayer(player.getUniqueId());
-        if (playerData == null) return;
-        if (!playerData.isInCombat()) return;
         player.setHealth(0);
     }