FOURTH AFTER ROLLBACK: error catching for attempt ot upgrade warehouses

This commit is contained in:
2024-06-02 21:55:31 -05:00
parent 885b612bd6
commit 58cf778ce4
2 changed files with 7 additions and 1 deletions
@@ -66,6 +66,8 @@ public class UpgradeAssetMsgHandler extends AbstractClientMsgHandler {
Logger.error("Attempt to upgrade null building by " + player.getName()); Logger.error("Attempt to upgrade null building by " + player.getName());
return true; return true;
} }
if(buildingToRank.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.WAREHOUSE))
return true;
// Early exit for building that is already ranking // Early exit for building that is already ranking
@@ -9,6 +9,7 @@
package engine.net.client.msg; package engine.net.client.msg;
import engine.Enum;
import engine.Enum.*; import engine.Enum.*;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.gameManager.ZoneManager; import engine.gameManager.ZoneManager;
@@ -530,6 +531,9 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
this.upgradeCost = Integer.MAX_VALUE; this.upgradeCost = Integer.MAX_VALUE;
else if (building.getRank() == building.getBlueprint().getMaxRank()) else if (building.getRank() == building.getBlueprint().getMaxRank())
this.upgradeCost = Integer.MAX_VALUE; this.upgradeCost = Integer.MAX_VALUE;
else
if(building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.WAREHOUSE))
this.upgradeCost = Integer.MAX_VALUE;
else else
this.upgradeCost = building.getBlueprint().getRankCost(Math.min(building.getRank() + 1, 7)); this.upgradeCost = building.getBlueprint().getRankCost(Math.min(building.getRank() + 1, 7));