From 81033e5a9cb3015fde5ab54c63a1c5c227c67203 Mon Sep 17 00:00:00 2001 From: 1whohears <1whohears28@gmail.com> Date: Thu, 26 May 2022 20:47:46 -0500 Subject: [PATCH] renamed getFactionEnemies to getEnemyFactionIds IFaction[] getFactionEnemies(); I think this should be implemented in PR #50 because IFaction is setup better there --- src/main/java/noppes/npcs/scripted/ScriptFaction.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/scripted/ScriptFaction.java b/src/main/java/noppes/npcs/scripted/ScriptFaction.java index 3c637f994..d2aa114f4 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptFaction.java +++ b/src/main/java/noppes/npcs/scripted/ScriptFaction.java @@ -99,14 +99,14 @@ public class ScriptFaction { return faction.isAggressiveToNpc(npc.npc); } - public Integer[] getFactionEnemies() { + public Integer[] getEnemyFactionIds() { if (faction.attackFactions == null) return new Integer[0]; return faction.attackFactions.toArray(new Integer[faction.attackFactions.size()]); } public boolean isEnemyFaction(int id) { if (faction.attackFactions == null) return false; - Integer[] enemies = getFactionEnemies(); + Integer[] enemies = getEnemyFactionIds(); for (int i = 0; i < enemies.length; ++i) { if (enemies[i] == id) return true; } @@ -120,4 +120,5 @@ public class ScriptFaction { public void removeFactionEnemy(int id) { faction.attackFactions.remove(id); } + }