upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 00:17:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Friendly Fire not Working

Browse Source
This commit is contained in:
Kam committed 2024-03-07 22:23:44 -05:00
1 parent dd7a0b7f12
commit 9c78eec897
1 file changed
+10 -8
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/noppes/npcs/ServerEventsHandler.java
+10 -8
View File
@@ -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