forked from MagicBane/Server
Raised visibility of collection
This commit is contained in:
@@ -220,16 +220,16 @@ public class InfoCmd extends AbstractDevCmd {
|
||||
|
||||
// List hirelings
|
||||
|
||||
if (targetBuilding.getHirelings().isEmpty() == false) {
|
||||
if (targetBuilding.hirelings.isEmpty() == false) {
|
||||
|
||||
output += newline;
|
||||
output += "Hirelings List: name / slot / floor";
|
||||
|
||||
for (AbstractCharacter npc : targetBuilding.getHirelings().keySet()) {
|
||||
for (AbstractCharacter npc : targetBuilding.hirelings.keySet()) {
|
||||
|
||||
if (npc.getObjectType() != GameObjectType.NPC)
|
||||
continue;
|
||||
output += newline + npc.getName() + " slot " + targetBuilding.getHirelings().get(npc);
|
||||
output += newline + npc.getName() + " slot " + targetBuilding.hirelings.get(npc);
|
||||
output += newline + "location " + npc.getLoc();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ public class PurgeObjectsCmd extends AbstractDevCmd {
|
||||
for (Building building : zone.zoneBuildingSet) {
|
||||
if (!BuildingManager.IsWallPiece(building))
|
||||
continue;
|
||||
for (AbstractCharacter ac : building.getHirelings().keySet()) {
|
||||
for (AbstractCharacter ac : building.hirelings.keySet()) {
|
||||
NPC npc = null;
|
||||
Mob mobA = null;
|
||||
|
||||
@@ -143,7 +143,7 @@ public class PurgeObjectsCmd extends AbstractDevCmd {
|
||||
if ((building.getBlueprint() != null) && (building.getBlueprint().getBuildingGroup() == BuildingGroup.SPIRE))
|
||||
building.disableSpire(false);
|
||||
|
||||
for (AbstractCharacter ac : building.getHirelings().keySet()) {
|
||||
for (AbstractCharacter ac : building.hirelings.keySet()) {
|
||||
NPC npc = null;
|
||||
Mob mobA = null;
|
||||
|
||||
|
||||
@@ -13,7 +13,10 @@ import engine.Enum.BuildingGroup;
|
||||
import engine.Enum.DbObjectType;
|
||||
import engine.InterestManagement.WorldGrid;
|
||||
import engine.devcmd.AbstractDevCmd;
|
||||
import engine.gameManager.*;
|
||||
import engine.gameManager.BuildingManager;
|
||||
import engine.gameManager.ChatManager;
|
||||
import engine.gameManager.DbManager;
|
||||
import engine.gameManager.ZoneManager;
|
||||
import engine.math.Vector3fImmutable;
|
||||
import engine.objects.*;
|
||||
|
||||
@@ -141,7 +144,7 @@ public class RemoveObjectCmd extends AbstractDevCmd {
|
||||
|
||||
// Remove hirelings for this building
|
||||
|
||||
for (AbstractCharacter abstractCharacter : building.getHirelings().keySet())
|
||||
for (AbstractCharacter abstractCharacter : building.hirelings.keySet())
|
||||
BuildingManager.removeHireling(building, abstractCharacter);
|
||||
|
||||
Zone zone = building.getParentZone();
|
||||
@@ -170,7 +173,7 @@ public class RemoveObjectCmd extends AbstractDevCmd {
|
||||
// Remove npc from hirelings list.
|
||||
|
||||
if (npc.building != null)
|
||||
npc.building.getHirelings().remove(npc);
|
||||
npc.building.hirelings.remove(npc);
|
||||
|
||||
for (Integer minionUUID : npc.minions) {
|
||||
Mob minionMob = Mob.getMob(minionUUID);
|
||||
@@ -207,7 +210,7 @@ public class RemoveObjectCmd extends AbstractDevCmd {
|
||||
// Remove npc from hirelings list.
|
||||
|
||||
if (mob.building != null)
|
||||
mob.building.getHirelings().remove(mob);
|
||||
mob.building.hirelings.remove(mob);
|
||||
|
||||
mob.setLoc(Vector3fImmutable.ZERO); //Move it off the plane..
|
||||
mob.setBindLoc(Vector3fImmutable.ZERO); //Reset the bind loc..
|
||||
|
||||
@@ -65,13 +65,13 @@ public class SlotTestCmd extends AbstractDevCmd {
|
||||
|
||||
outString += "\r\nNext Available Slot: " + BuildingManager.getAvailableSlot(building);
|
||||
|
||||
if (building.getHirelings().isEmpty() == false) {
|
||||
if (building.hirelings.isEmpty() == false) {
|
||||
|
||||
outString += "\r\n\r\n";
|
||||
outString += "Hirelings List:";
|
||||
|
||||
for (AbstractCharacter hireling : building.getHirelings().keySet())
|
||||
outString += "\r\n" + hireling.getName() + " slot : " + building.getHirelings().get(hireling);
|
||||
for (AbstractCharacter hireling : building.hirelings.keySet())
|
||||
outString += "\r\n" + hireling.getName() + " slot : " + building.hirelings.get(hireling);
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user