From 244ceb4dcc5f0e3f71a39f187679fbc19ebe7633 Mon Sep 17 00:00:00 2001 From: youhavetrouble Date: Wed, 3 May 2023 21:29:07 +0200 Subject: [PATCH] don't send the message if tempting was cancelled --- .../listeners/pets/PetTargettingPlayerListener.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/youhavetrouble/preventstabby/listeners/pets/PetTargettingPlayerListener.java b/src/main/java/me/youhavetrouble/preventstabby/listeners/pets/PetTargettingPlayerListener.java index 1af3aa3..8245b6f 100644 --- a/src/main/java/me/youhavetrouble/preventstabby/listeners/pets/PetTargettingPlayerListener.java +++ b/src/main/java/me/youhavetrouble/preventstabby/listeners/pets/PetTargettingPlayerListener.java @@ -27,8 +27,10 @@ public class PetTargettingPlayerListener implements Listener { UUID damager = entity.getOwner().getUniqueId(); UUID victim = event.getTarget().getUniqueId(); - if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true, false)) { - if (event.getReason().equals(EntityTargetEvent.TargetReason.TEMPT)) { + boolean tempting = event.getReason().equals(EntityTargetEvent.TargetReason.TEMPT); + + if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, !tempting, false)) { + if (tempting) { event.setCancelled(true); return; }