From f2e324b10adbb5866605a6d4db29a57063f13faa Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 7 Mar 2024 22:24:00 -0500 Subject: [PATCH] Invert --- src/main/java/noppes/npcs/ServerEventsHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index 3add6c5f5..b09c79494 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -142,14 +142,14 @@ public class ServerEventsHandler { public void invoke(LivingAttackEvent event) { if(!(event.source != null && event.source.getEntity() instanceof EntityPlayer) || !(event.entityLiving instanceof EntityPlayer) || FMLCommonHandler.instance().getEffectiveSide().isClient()) return; - + // Check for Friendly Fire EntityPlayer sourcePlayer = (EntityPlayer) event.source.getEntity(); PlayerData playerData = PlayerDataController.Instance.getPlayerData(sourcePlayer); PlayerData targetData = PlayerDataController.Instance.getPlayerData((EntityPlayer) event.entityLiving); if (playerData.partyUUID != null && playerData.partyUUID.equals(targetData.partyUUID)) { Party party = PartyController.Instance().getParty(playerData.partyUUID); - if(party != null && party.friendlyFire()) + if(party != null && !party.friendlyFire()) event.setCanceled(true); } }