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

Fixed NPC Target and TargetLost events firing redundantly

Browse Source
This commit is contained in:
bigguy345 committed 2025-07-05 11:44:29 +03:00
1 parent 7786d8e271
commit f100fb0ab1
1 file changed
+14 -11
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/noppes/npcs/entity/EntityNPCInterface.java
+14 -11
View File
@@ -644,18 +644,21 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
if (entity instanceof EntityPlayer && DBCAddon.instance.isKO(this, (EntityPlayer) entity))
return;
if (!isRemote()) {
if (getAttackTarget() != entity && entity != null) {
NpcEvent.TargetEvent event = new NpcEvent.TargetEvent(wrappedNPC, entity);
if (EventHooks.onNPCTarget(this, event))
return;
if (getAttackTarget() != entity) {
if (entity != null) {
NpcEvent.TargetEvent event = new NpcEvent.TargetEvent(wrappedNPC, entity);
if (EventHooks.onNPCTarget(this, event))
return;
if (event.getTarget() == null)
entity = null;
else
entity = event.getTarget().getMCEntity();
} else {
if (EventHooks.onNPCTargetLost(this, getAttackTarget(), entity))
return;
if (event.getTarget() == null)
entity = null;
else
entity = event.getTarget().getMCEntity();
}
if (getAttackTarget() != null) {
if (EventHooks.onNPCTargetLost(this, getAttackTarget(), entity))
return;
}
}
if (entity != null && entity != this && ais.onAttack != 3 && !isAttacking()) {
Line line = advanced.getAttackLine();