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

Slots are slots; blueprint logic not needed on back-end.

Browse Source
This commit is contained in:
MagicBot
2023-04-04 10:48:17 -04:00
parent 307f52866d
commit 84bae3141c
2 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Mob.java
+4 -5
View File
@@ -804,17 +804,16 @@ public class Mob extends AbstractIntelligenceAgent {
this.level = 1;
//add this npc to building
if (this.building != null && this.loadID != 0 && building.getBlueprintUUID() != 0) {
int maxSlots;
maxSlots = building.getBlueprint().getSlotsForRank(this.building.getRank());
if (this.building != null) {
for (int slot = 1; slot < maxSlots + 1; slot++) {
int maxSlots = 10;
for (int slot = 1; slot < maxSlots + 1; slot++)
if (!this.building.getHirelings().containsValue(slot)) {
this.building.getHirelings().put(this, slot);
break;
}
}
}
//set bonuses
src/engine/objects/NPC.java
+5 -21
View File
@@ -354,28 +354,12 @@ public class NPC extends AbstractCharacter {
if (this.building != null) {
if (building.getBlueprint() != null) {
int maxSlots = 10;
int maxSlots;
maxSlots = building.getBlueprint().getSlotsForRank(this.building.getRank());
for (int slot = 1; slot < maxSlots + 1; slot++) {
if (!this.building.getHirelings().containsValue(slot)) {
this.building.getHirelings().put(this, slot);
break;
}
}
} else {
int maxSlots = 10;
for (int slot = 1; slot < maxSlots + 1; slot++) {
if (!this.building.getHirelings().containsValue(slot)) {
this.building.getHirelings().put(this, slot);
break;
}
}
for (int slot = 1; slot < maxSlots + 1; slot++)
if (!this.building.getHirelings().containsValue(slot)) {
this.building.getHirelings().put(this, slot);
break;
}
}