MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Floor and level no longer read from db.

Browse Source
This commit is contained in:
MagicBot
2023-04-29 10:59:13 -04:00
parent 5729492c6a
commit b73c8e9045
2 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/msg/LoadCharacterMsg.java
+5 -6
View File
@@ -71,14 +71,13 @@ public class LoadCharacterMsg extends ClientNetMsg {
protected void _serialize(ByteBufferWriter writer) throws SerializationException { protected void _serialize(ByteBufferWriter writer) throws SerializationException {
if (absChar != null && absChar.getObjectType() == GameObjectType.NPC) { if (absChar != null && absChar.getObjectType() == GameObjectType.NPC) {
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);
} }
src/engine/objects/NPC.java
+1 -21
View File
@@ -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;
} }