From 23fc50ac46506676e35291e7af3165b41b4af628 Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Wed, 14 May 2025 17:11:40 +0200 Subject: [PATCH] fix exception raised with no worldguard enabled --- .../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 6171e74..d578408 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() && !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() && !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;