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

Party Friendly Fire Enable Config

Browse Source
This commit is contained in:
Kam committed 2024-03-17 16:08:19 -04:00
1 parent 3dae540ffe
commit cf0223c827
1 file changed
+9 -7
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/noppes/npcs/ServerEventsHandler.java
+9 -7
View File
@@ -144,13 +144,15 @@ public class ServerEventsHandler {
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())
event.setCanceled(true);
if(ConfigMain.PartyFriendlyFireEnabled){
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);
}
}
}