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

Bugfix in slotting blueprint buildings

Browse Source
This commit is contained in:
MagicBot
2023-04-04 10:31:59 -04:00
parent a85bbde9d2
commit 7ef338be1d
3 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/BuildingManager.java
+20 -22
View File
@@ -450,7 +450,7 @@ public enum BuildingManager {
}
public static synchronized boolean addHireling(Building building, PlayerCharacter contractOwner, Vector3fImmutable NpcLoc, Zone zone, Contract NpcID, Item item) {
public static synchronized boolean addHireling(Building building, PlayerCharacter contractOwner, Vector3fImmutable NpcLoc, Zone zone, Contract contractID, Item item) {
int rank = 1;
@@ -460,7 +460,7 @@ public enum BuildingManager {
if (building.getBlueprint().getMaxSlots() == building.getHirelings().size())
return false;
String pirateName = NPC.getPirateName(NpcID.getMobbaseID());
String pirateName = NPC.getPirateName(contractID.getMobbaseID());
if (item.getChargesRemaining() > 0)
rank = item.getChargesRemaining() * 10;
@@ -469,9 +469,9 @@ public enum BuildingManager {
Mob mob = null;
NPC npc = null;
if (NPC.ISGuardCaptain(NpcID.getContractID())) {
if (NPC.ISGuardCaptain(contractID.getContractID())) {
mob = Mob.createMob( NpcID.getMobbaseID(), NpcLoc, contractOwner.getGuild(), true, zone, building, NpcID.getContractID());
mob = Mob.createMob( contractID.getMobbaseID(), NpcLoc, contractOwner.getGuild(), true, zone, building, contractID.getContractID());
if (mob == null)
return false;
@@ -479,26 +479,24 @@ public enum BuildingManager {
mob.setRank(rank);
mob.setPlayerGuard(true);
mob.setParentZone(zone);
return true;
} else {
npc = NPC.createNPC( pirateName, NpcID.getObjectUUID(), NpcLoc, contractOwner.getGuild(), false, zone, (short) rank, false, building);
if (npc == null)
return false;
npc.setBindLoc(NpcLoc.x - zone.getAbsX(), NpcLoc.y - zone.getAbsY(), NpcLoc.z - zone.getAbsZ());
npc.setBuilding(building);
npc.setParentZone(zone);
if (NPC.GetNPCProfits(npc) == null)
NPCProfits.CreateProfits(npc);
WorldGrid.addObject(npc, contractOwner);
return true;
}
npc = NPC.createNPC( pirateName, contractID.getObjectUUID(), NpcLoc, contractOwner.getGuild(), false, zone, (short) rank, false, building);
if (npc == null)
return false;
npc.setBindLoc(NpcLoc.x - zone.getAbsX(), NpcLoc.y - zone.getAbsY(), NpcLoc.z - zone.getAbsZ());
npc.setBuilding(building);
npc.setParentZone(zone);
if (NPC.GetNPCProfits(npc) == null)
NPCProfits.CreateProfits(npc);
WorldGrid.addObject(npc, contractOwner);
return true;
}
public static boolean IsWallPiece(Building building) {