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

Implemented friendly fire.

Browse Source
This commit is contained in:
luisc committed 2024-01-22 12:04:09 -06:00
1 parent 3637c9bfda
commit cea054560f
1 file changed
+14
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/noppes/npcs/ServerEventsHandler.java
+14
View File
@@ -21,6 +21,7 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.StatCollector;
import net.minecraft.village.MerchantRecipeList;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import net.minecraftforge.event.entity.living.LivingAttackEvent;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingHurtEvent;
import net.minecraftforge.event.entity.player.EntityInteractEvent;
@@ -135,7 +136,20 @@ public class ServerEventsHandler {
}
}
}
}
@SubscribeEvent
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);
}
}
@SubscribeEvent