From 636ccf516ce8b2e9fb4474a43f00f9157f3335df Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Tue, 17 Jun 2025 16:11:27 +0200 Subject: [PATCH] fix broken pvp state check --- .../me/youhavetrouble/preventstabby/data/PlayerManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/youhavetrouble/preventstabby/data/PlayerManager.java b/src/main/java/me/youhavetrouble/preventstabby/data/PlayerManager.java index d578408..4ee68d1 100644 --- a/src/main/java/me/youhavetrouble/preventstabby/data/PlayerManager.java +++ b/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;