From b8217a885839217f674d4a2dc6c462f11bf39cab Mon Sep 17 00:00:00 2001 From: MagicBot Date: Mon, 21 Aug 2023 14:11:22 -0400 Subject: [PATCH] Remove unused variable from signature. --- src/engine/devcmd/cmds/AddNPCCmd.java | 2 +- src/engine/gameManager/BuildingManager.java | 4 ++-- src/engine/objects/NPC.java | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/engine/devcmd/cmds/AddNPCCmd.java b/src/engine/devcmd/cmds/AddNPCCmd.java index e01ef111..495d2517 100644 --- a/src/engine/devcmd/cmds/AddNPCCmd.java +++ b/src/engine/devcmd/cmds/AddNPCCmd.java @@ -79,7 +79,7 @@ public class AddNPCCmd extends AbstractDevCmd { } NPC npc = NPC.createNPC(name, contractID, - pc.getLoc(), null, true, zone, (short) level, null); + pc.getLoc(), null, 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 5c67c430..5633df05 100644 --- a/src/engine/gameManager/BuildingManager.java +++ b/src/engine/gameManager/BuildingManager.java @@ -501,7 +501,7 @@ public enum BuildingManager { NPC npc = null; - npc = NPC.createNPC(pirateName, NpcID.getObjectUUID(), NpcLoc, null, false, zone, (short) rank, building); + npc = NPC.createNPC(pirateName, NpcID.getObjectUUID(), NpcLoc, null, zone, (short) rank, building); if (npc == null) return false; @@ -569,7 +569,7 @@ public enum BuildingManager { return true; } - npc = NPC.createNPC(pirateName, contract.getObjectUUID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), false, zone, (short) rank, building); + npc = NPC.createNPC(pirateName, contract.getObjectUUID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, (short) rank, building); if (npc == null) return false; diff --git a/src/engine/objects/NPC.java b/src/engine/objects/NPC.java index a1824628..d917237d 100644 --- a/src/engine/objects/NPC.java +++ b/src/engine/objects/NPC.java @@ -443,6 +443,7 @@ public class NPC extends AbstractCharacter { } private static int serializeExtraRune(NPC npc, int runeID, int cnt, ByteBufferWriter writer) { + writer.putInt(5); writer.putInt(0); writer.putInt(runeID); @@ -456,7 +457,7 @@ public class NPC extends AbstractCharacter { return cnt + 1; } - public static NPC createNPC(String name, int contractID, Vector3fImmutable spawn, Guild guild, boolean isMob, Zone parent, short level, Building building) { + public static NPC createNPC(String name, int contractID, Vector3fImmutable spawn, Guild guild, Zone parent, short level, Building building) { NPC newNPC = new NPC();