Prevent Passive Factions from taking Damage

This commit is contained in:
Kam committed 2026-02-08 01:46:13 -05:00
1 parent 2387ece1ff
commit d76f5d40a4
3 files changed
+8 -1

No files matched your search

@@ -85,11 +85,13 @@ public class GuiNPCManageFactions extends GuiNPCInterface2 implements IScrollDat
addLabel(new GuiNpcLabel(3, "faction.hidden", guiLeft + 8, y + 5));
this.addButton(new GuiNpcButton(3, guiLeft + 100, y, 45, 20, new String[]{"gui.no", "gui.yes"}, faction.hideFaction ? 1 : 0));
getButton(3).setHoverText("faction.hidden.hover");
y += 23;
addLabel(new GuiNpcLabel(4, "faction.attacked", guiLeft + 8, y + 5));
this.addButton(new GuiNpcButton(4, guiLeft + 100, y, 45, 20, new String[]{"gui.no", "gui.yes"}, faction.getsAttacked ? 1 : 0));
getButton(4).setHoverText("faction.attacked.hover");
y += 23;
@@ -678,6 +678,9 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
if (entity instanceof EntityLivingBase)
attackingEntity = (EntityLivingBase) entity;
if (faction.isPassive)
return false;
if (attackingEntity != null && attackingEntity == getOwner())
return false;
else if (attackingEntity instanceof EntityNPCInterface) {
@@ -639,6 +639,7 @@ faction.friendly=Friendly
faction.points=Points
faction.ondeath=On death
faction.hidden=Hidden
faction.hidden.hover=Hides this faction from the player's faction standings UI
faction.default=Default
faction.attackHostile=Attack hostile factions
faction.defend=Defence faction members
@@ -647,8 +648,9 @@ faction.options=Faction Options
faction.increasepoints=Faction %s increased by %s points
faction.decreasepoints=Faction %s decreased by %s points
faction.attacked=Attacked by mobs
faction.attacked.hover=Whether vanilla mobs will target and attack NPCs in this faction
faction.passive=Is Passive
faction.passive.hover=Passive factions will not queue any attacking tasks [Good for Performance]
faction.passive.hover=Passive faction NPCs cannot be damaged and will not queue any attacking tasks [Good for Performance]
menu.inventory=Inventory
menu.display=Display