Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Captain slot issue in db rectified.

Browse Source
This commit is contained in:
MagicBot
2023-04-24 14:06:17 -04:00
parent 14c98d9376
commit d729fbb287
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/NPC.java
+2 -12
View File
@@ -359,15 +359,8 @@ public class NPC extends AbstractCharacter {
// For some reason the npc is created and initialized twice when // For some reason the npc is created and initialized twice when
// createMobWithNoID() is called. // createMobWithNoID() is called.
if (this.building != null) { if (this.building != null)
// Artillery Tower Captains use a hardcoded slot not first available
if (this.contract != null && this.contract.getContractID() == 842)
this.building.getHirelings().put(this, 2);
else
slotNPCinBuilding(); // picks first available free slot slotNPCinBuilding(); // picks first available free slot
}
//TODO set these correctly later //TODO set these correctly later
this.rangeHandOne = 8; this.rangeHandOne = 8;
@@ -937,7 +930,6 @@ public class NPC extends AbstractCharacter {
this.region = BuildingManager.GetRegion(this.building, buildingWorldLoc.x, buildingWorldLoc.y, buildingWorldLoc.z); this.region = BuildingManager.GetRegion(this.building, buildingWorldLoc.x, buildingWorldLoc.y, buildingWorldLoc.z);
if (this.region != null){ if (this.region != null){
this.buildingFloor = region.getRoom(); this.buildingFloor = region.getRoom();
@@ -956,8 +948,8 @@ public class NPC extends AbstractCharacter {
this.setBindLoc(new Vector3fImmutable(this.statLat + zone.absX, this.statAlt + zone.absY, this.statLon + zone.absZ)); this.setBindLoc(new Vector3fImmutable(this.statLat + zone.absX, this.statAlt + zone.absY, this.statLon + zone.absZ));
if (ConfigManager.serverType.equals(ServerType.WORLDSERVER)) if (ConfigManager.serverType.equals(ServerType.WORLDSERVER))
this.setLoc(new Vector3fImmutable(this.statLat + zone.absX, this.statAlt + zone.absY, this.statLon + zone.absZ)); this.setLoc(new Vector3fImmutable(this.statLat + zone.absX, this.statAlt + zone.absY, this.statLon + zone.absZ));
} }
//create npc profits //create npc profits
if (this.parentZone != null){ if (this.parentZone != null){
if (this.parentZone.isPlayerCity()) if (this.parentZone.isPlayerCity())
@@ -967,8 +959,6 @@ public class NPC extends AbstractCharacter {
} }
@Override @Override
public Vector3fImmutable getLoc() { public Vector3fImmutable getLoc() {