From 9c78eec897b1b687f1ab3668482e4e1176e17ed7 Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 7 Mar 2024 22:23:44 -0500 Subject: [PATCH] Fix Friendly Fire not Working --- .../java/noppes/npcs/ServerEventsHandler.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index 9830c27df..3add6c5f5 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -142,14 +142,16 @@ 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; - - 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)) { - event.setCanceled(true); - } + + // 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()) + event.setCanceled(true); + } } @SubscribeEvent