From da62046ce0b955f439b3a15c9df8f87633d8f28a Mon Sep 17 00:00:00 2001 From: MagicBot Date: Sat, 29 Apr 2023 16:21:02 -0400 Subject: [PATCH] Unused parm in method interface removed. --- src/engine/devcmd/cmds/AddNPCCmd.java | 2 +- src/engine/gameManager/BuildingManager.java | 4 ++-- src/engine/objects/NPC.java | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/engine/devcmd/cmds/AddNPCCmd.java b/src/engine/devcmd/cmds/AddNPCCmd.java index 4d3f5716..7df268e7 100644 --- a/src/engine/devcmd/cmds/AddNPCCmd.java +++ b/src/engine/devcmd/cmds/AddNPCCmd.java @@ -83,7 +83,7 @@ public class AddNPCCmd extends AbstractDevCmd { } NPC npc = NPC.createNPC(name, contractID, - pc.getLoc(), null, true, zone, (short)level, true, null); + pc.getLoc(), null, true, zone, (short) level, null); if (npc != null) { WorldGrid.addObject(npc, pc); diff --git a/src/engine/gameManager/BuildingManager.java b/src/engine/gameManager/BuildingManager.java index 69c33d7d..ee1750a0 100644 --- a/src/engine/gameManager/BuildingManager.java +++ b/src/engine/gameManager/BuildingManager.java @@ -467,7 +467,7 @@ public enum BuildingManager { NPC npc = null; - npc = NPC.createNPC( pirateName, NpcID.getObjectUUID(), NpcLoc, null, false, zone, (short) rank, false, building); + npc = NPC.createNPC(pirateName, NpcID.getObjectUUID(), NpcLoc, null, false, zone, (short) rank, building); if (npc == null) return false; @@ -522,7 +522,7 @@ public enum BuildingManager { return true; } - npc = NPC.createNPC(pirateName, contract.getObjectUUID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), false, zone, (short) rank, false, building); + npc = NPC.createNPC(pirateName, contract.getObjectUUID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), false, zone, (short) rank, building); if (npc == null) return false; diff --git a/src/engine/objects/NPC.java b/src/engine/objects/NPC.java index 0ee5700c..879f6e36 100644 --- a/src/engine/objects/NPC.java +++ b/src/engine/objects/NPC.java @@ -975,9 +975,7 @@ public class NPC extends AbstractCharacter { return !this.isAlive(); } - // *** Refactor : this has a useInit flag that can be removed - - public static NPC createNPC(String name, int contractID, Vector3fImmutable spawn, Guild guild, boolean isMob, Zone parent, short level, boolean useInit, Building building) { + public static NPC createNPC(String name, int contractID, Vector3fImmutable spawn, Guild guild, boolean isMob, Zone parent, short level, Building building) { NPC npcWithoutID = new NPC(name, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 1, 0, false, false, false, spawn, spawn, Vector3fImmutable.ZERO,