From ada1409f583639def7e46b4b7b48189476f7798c Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 6 Apr 2025 22:13:42 -0400 Subject: [PATCH 1/2] get to Set for Max Hurt Time --- src/api | 2 +- src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java | 2 -- src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/api b/src/api index b3031b2f7..2f31934cf 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit b3031b2f71cd8b0a128633747709db42902259f7 +Subproject commit 2f31934cfc98534fa2c0bb277d37bc899e014654 diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java b/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java index 86ba08dfa..7564562f8 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java @@ -823,8 +823,6 @@ public class ScriptEntity implements IEntity { entity.hurtResistantTime = ticks; } - ; - public void setInvisible(boolean invisible) { entity.setInvisible(invisible); } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java index cf2859b76..edf9d2d29 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java @@ -58,7 +58,7 @@ public class ScriptLivingBase extends ScriptEntity Date: Sun, 6 Apr 2025 22:47:48 -0400 Subject: [PATCH 2/2] Fix Attack Invisible --- src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java b/src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java index 5483f1e3f..4041977d9 100644 --- a/src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java +++ b/src/main/java/noppes/npcs/ai/selector/NPCAttackSelector.java @@ -34,7 +34,7 @@ public class NPCAttackSelector implements IEntitySelector { if (this.npc.ais.directLOS && !this.npc.getEntitySenses().canSee(entity)) return false; - if (!npc.stats.attackInvisible && ((EntityLivingBase) entity).isPotionActive(Potion.invisibility) && npc.getDistanceSqToEntity(entity) < 9) + if (!npc.stats.attackInvisible && ((EntityLivingBase) entity).isPotionActive(Potion.invisibility) && !npc.isInRange(entity, 3.0)) return false; //prevent the npc from going on an endless killing spree