Browse Source

FOURTH AFTER ROLLBACK: error catching for attempt ot upgrade warehouses

lakebane-master
FatBoy-DOTC 7 months ago
parent
commit
737da1bf14
  1. 2
      src/engine/net/client/handlers/UpgradeAssetMsgHandler.java
  2. 6
      src/engine/net/client/msg/ManageCityAssetsMsg.java

2
src/engine/net/client/handlers/UpgradeAssetMsgHandler.java

@ -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

6
src/engine/net/client/msg/ManageCityAssetsMsg.java

@ -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;
@ -531,7 +532,10 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
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 else
this.upgradeCost = building.getBlueprint().getRankCost(Math.min(building.getRank() + 1, 7)); if(building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.WAREHOUSE))
this.upgradeCost = Integer.MAX_VALUE;
else
this.upgradeCost = building.getBlueprint().getRankCost(Math.min(building.getRank() + 1, 7));
writer.putInt(this.upgradeCost); writer.putInt(this.upgradeCost);
} else } else

Loading…
Cancel
Save