From 35e18e4186f6d52beeb68cb95a25b187b12ae025 Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Tue, 5 Mar 2024 20:19:55 -0600
Subject: [PATCH] slot NPC fix

---
 .../net/client/handlers/ActivateNPCMsgHandler.java   | 12 ------------
 src/engine/objects/Blueprint.java                    |  6 ++----
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/engine/net/client/handlers/ActivateNPCMsgHandler.java b/src/engine/net/client/handlers/ActivateNPCMsgHandler.java
index a3aff40a..713147da 100644
--- a/src/engine/net/client/handlers/ActivateNPCMsgHandler.java
+++ b/src/engine/net/client/handlers/ActivateNPCMsgHandler.java
@@ -144,18 +144,6 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler {
                     if (contract.getContractID() == 865)//siege engineer
                         override = true;
                 }
-                if(building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.SHACK)){
-                    if(contract.getContractID() == 830)//merchant
-                        override = true;
-                }
-                if(building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.SHRINE)){
-                    if(contract.getContractID() == 252637)//votary
-                        override = true;
-                }
-                if(building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.BULWARK)){
-                    if(contract.getContractID() == 839)//artillery captain
-                        override = true;
-                }
                 if(override == false) {
                     Logger.error("failed at override with contract: " + contract.getContractID());
                     return false;
diff --git a/src/engine/objects/Blueprint.java b/src/engine/objects/Blueprint.java
index aab76a11..5d9774ba 100644
--- a/src/engine/objects/Blueprint.java
+++ b/src/engine/objects/Blueprint.java
@@ -319,7 +319,7 @@ public class Blueprint {
         if (this.maxSlots <= 1 && this.buildingGroup.equals(BuildingGroup.TOL) == false)
             return maxSlots;
 
-        if (this.maxRank == 1 && currentRank == 1&& this.buildingGroup.equals(BuildingGroup.TOL) == false)
+        if (this.maxRank == 1 && currentRank == 1 && this.buildingGroup.equals(BuildingGroup.TOL) == false)
             return getMaxSlots();
 
         switch (currentRank) {
@@ -335,13 +335,11 @@ public class Blueprint {
                 break;
             case 6:
             case 7:
-                availableSlots = 3;
-                break;
             case 8:
                 availableSlots = 3;
                 break;
             default:
-                availableSlots = 0;
+                availableSlots = 1;
                 break;
         }
         if(this.buildingGroup.equals(BuildingGroup.TOL)){