Browse Source

Floor and level no longer read from db.

master
MagicBot 2 years ago
parent
commit
b73c8e9045
  1. 7
      src/engine/net/client/msg/LoadCharacterMsg.java
  2. 22
      src/engine/objects/NPC.java

7
src/engine/net/client/msg/LoadCharacterMsg.java

@ -74,10 +74,9 @@ public class LoadCharacterMsg extends ClientNetMsg {
NPC npc = (NPC) absChar; NPC npc = (NPC) absChar;
if (npc.getRegion() != null) {
if (npc.getBuilding() != null){ writer.putInt(npc.getRegion().getLevel());
writer.putInt(npc.getBuildingLevel()); writer.putInt(npc.getRegion().getRoom());
writer.putInt(npc.getBuildingFloor());
} else { } else {
writer.putInt(-1); writer.putInt(-1);
writer.putInt(-1); writer.putInt(-1);

22
src/engine/objects/NPC.java

@ -85,8 +85,7 @@ public class NPC extends AbstractCharacter {
private int parentZoneID; private int parentZoneID;
public ArrayList<ProducedItem> forgedItems = new ArrayList<>(); public ArrayList<ProducedItem> forgedItems = new ArrayList<>();
private int buildingLevel;
private int buildingFloor;
public HashMap<Integer, MobEquipment> equip = null; public HashMap<Integer, MobEquipment> equip = null;
private String nameOverride = ""; private String nameOverride = "";
private int equipmentSetID = 0; private int equipmentSetID = 0;
@ -262,9 +261,6 @@ public class NPC extends AbstractCharacter {
if (this.upgradeDateTime != null) if (this.upgradeDateTime != null)
submitUpgradeJob(); submitUpgradeJob();
this.buildingFloor = (rs.getInt("npc_buildingFloor"));
this.buildingLevel = (rs.getInt("npc_buildingLevel"));
if (this.contract != null) if (this.contract != null)
this.nameOverride = rs.getString("npc_name") + " the " + this.getContract().getName(); this.nameOverride = rs.getString("npc_name") + " the " + this.getContract().getName();
else else
@ -388,14 +384,6 @@ public class NPC extends AbstractCharacter {
// Configure region and floor/level for this NPC // Configure region and floor/level for this NPC
this.region = BuildingManager.GetRegion(this.building, bindLoc.x, bindLoc.y, bindLoc.z); this.region = BuildingManager.GetRegion(this.building, bindLoc.x, bindLoc.y, bindLoc.z);
if (this.region != null) {
this.buildingFloor = region.getRoom();
this.buildingLevel = region.getLevel();
} else {
this.buildingFloor = -1;
this.buildingLevel = -1;
}
} }
if (this.mobBase != null) { if (this.mobBase != null) {
@ -1456,14 +1444,6 @@ public class NPC extends AbstractCharacter {
return true; return true;
} }
public int getBuildingLevel() {
return buildingLevel;
}
public int getBuildingFloor() {
return buildingFloor;
}
public HashMap<Integer, MobEquipment> getEquip() { public HashMap<Integer, MobEquipment> getEquip() {
return equip; return equip;
} }

Loading…
Cancel
Save