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

slot NPC fix

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-03-05 20:19:55 -06:00
parent 2e5892ff32
commit 35e18e4186
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/ActivateNPCMsgHandler.java
-12
View File
@@ -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;
src/engine/objects/Blueprint.java
+2 -4
View File
@@ -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)){