simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-12-13 22:59:02 +00:00
Code Issues Projects Releases Wiki Activity

Cubot object id is no longer stored inside every CpuHardware in the database. Renamed some fields in the database to make them more readable

Browse Source
This commit is contained in:
simon
2018-05-12 16:16:24 -04:00
parent 4cd58c86a5
commit 3368268924
27 changed files with 83 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Plugin NPC/src/main/java/net/simon987/npcplugin/ElectricBox.java
View File

@@ -44,7 +44,7 @@ public class ElectricBox extends GameObject implements Updatable, Attackable {
public ElectricBox(Document document) {
super(document);
hp = (int) document.get("hp");
hp = document.getInteger("hp");
}
/**

11
Plugin NPC/src/main/java/net/simon987/npcplugin/Factory.java
View File

@@ -53,11 +53,7 @@ public class Factory extends GameObject implements Updatable {
public Factory(Document document) {
super(document);
setObjectId((long) document.get("i"));
setX((int) document.get("x"));
setY((int) document.get("y"));
tmpNpcArray = ((ArrayList) document.get("tmpNpcArray")).toArray();
tmpNpcArray = ((ArrayList) document.get("npcs")).toArray();
}
@Override
@@ -78,13 +74,12 @@ public class Factory extends GameObject implements Updatable {
for (Object id : tmpNpcArray) {
NonPlayerCharacter npc = (NonPlayerCharacter) GameServer.INSTANCE.getGameUniverse().getObject((int) (long) id);
NonPlayerCharacter npc = (NonPlayerCharacter) GameServer.INSTANCE.getGameUniverse().getObject((long) id);
if (npc != null) {
npc.setFactory(this);
npcs.add(npc);
}
}
tmpNpcArray = null;
@@ -139,7 +134,7 @@ public class Factory extends GameObject implements Updatable {
tmpNpcArray.add(npc.getObjectId());
}
dbObject.put("n", tmpNpcArray);
dbObject.put("npcs", tmpNpcArray);
return dbObject;
}

2
Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java
View File

@@ -24,6 +24,8 @@ public class HarvesterNPC extends NonPlayerCharacter {
public HarvesterNPC(Document document) {
super(document);
setTask(new HarvestTask());
setDirection(Direction.getDirection(document.getInteger("direction")));
}

4
Plugin NPC/src/main/java/net/simon987/npcplugin/RadioReceiverHardware.java
View File

@@ -24,8 +24,8 @@ public class RadioReceiverHardware extends CpuHardware {
this.cubot = cubot;
}
public RadioReceiverHardware(Document document) {
super(document);
public RadioReceiverHardware(Document document, ControllableUnit unit) {
super(document, unit);
this.cubot = (ControllableUnit) GameServer.INSTANCE.getGameUniverse().getObject((long) document.get("cubot"));
}

2
Plugin NPC/src/main/java/net/simon987/npcplugin/VaultDoor.java
View File

@@ -145,7 +145,7 @@ public class VaultDoor extends GameObject implements Programmable, Enterable, Up
dbObject.put("homeX", getHomeX());
dbObject.put("homeY", getHomeY());
dbObject.put("pw", new String(password));
dbObject.put("password", new String(password));
return dbObject;
}