diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/HackedNPC.java b/Plugin NPC/src/main/java/net/simon987/npcplugin/HackedNPC.java index fb3fcb0..cf93d9d 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/HackedNPC.java +++ b/Plugin NPC/src/main/java/net/simon987/npcplugin/HackedNPC.java @@ -41,7 +41,7 @@ public class HackedNPC extends NonPlayerCharacter implements ControllableUnit { cpu.setMemory(new Memory(MEM_SIZE)); cpu.setHardwareHost(this); - cpu.getMemory().write(0, program, 0, program.length); + cpu.getMemory().write(cpu.getCodeSectionOffset(), program, 0, program.length); for (Object serialisedHw : (List) NpcPlugin.DEFAULT_HACKED_NPC.get("hardware")) { HardwareModule hardware = GameServer.INSTANCE.getRegistry().deserializeHardware((Document) serialisedHw, this); diff --git a/Server/src/main/java/net/simon987/server/assembly/CPU.java b/Server/src/main/java/net/simon987/server/assembly/CPU.java index c25fc3f..a6acf5f 100755 --- a/Server/src/main/java/net/simon987/server/assembly/CPU.java +++ b/Server/src/main/java/net/simon987/server/assembly/CPU.java @@ -433,6 +433,10 @@ public class CPU implements MongoSerializable { this.ip = ip; } + public int getCodeSectionOffset() { + return codeSectionOffset; + } + public void setCodeSectionOffset(int codeSectionOffset) { this.codeSectionOffset = codeSectionOffset; }