This commit is contained in:
Kam committed 2024-03-07 22:24:00 -05:00
1 parent 9c78eec897
commit f2e324b10a
1 file changed
+2 -2
@@ -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);
}
}