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

Counter scope issue resolved.

Browse Source
This commit is contained in:
MagicBot
2023-01-14 15:23:02 -05:00
parent c84fb60177
commit 29c6d6cd8e
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/PlaceAssetMsgHandler.java
+7 -8
View File
@@ -405,11 +405,11 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
City serverCity = bane.getCity(); City serverCity = bane.getCity();
HashSet<AbstractWorldObject> awoList; HashSet<AbstractWorldObject> awoList;
HashSet<AbstractWorldObject> attackerBuildings = new HashSet<>();
HashSet<AbstractWorldObject> defenderBuildings = new HashSet<>();
;
int maxAttackerAssets = serverCity.getBane().getStone().getRank() * 2; int maxAttackerAssets = serverCity.getBane().getStone().getRank() * 2;
int maxDefenderAssets = serverCity.getRank(); int maxDefenderAssets = serverCity.getRank();
int numDefenderBuildings = 0;
int numAttackerBuildings = 0;
// Count bow for attackers and defenders // Count bow for attackers and defenders
@@ -439,16 +439,15 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
continue; continue;
if (building.getGuild().equals(serverCity.getGuild())) if (building.getGuild().equals(serverCity.getGuild()))
numDefenderBuildings++; defenderBuildings.add(building);
if (building.getGuild().equals(serverCity.getBane().getOwner().getGuild())) if (building.getGuild().equals(serverCity.getBane().getOwner().getGuild()))
numAttackerBuildings++; attackerBuildings.add(building);
// Validate bane limits on siege assets // Validate bane limits on siege assets
if (playerCharacter.getGuild().equals(serverCity.getGuild())) { if (playerCharacter.getGuild().equals(serverCity.getGuild())) {
//defender attempting to place asset //defender attempting to place asset
if (numDefenderBuildings >= maxDefenderAssets) { if (defenderBuildings.size() >= maxDefenderAssets) {
PlaceAssetMsg.sendPlaceAssetError(origin, 62, ""); PlaceAssetMsg.sendPlaceAssetError(origin, 62, "");
return false; return false;
} }
@@ -456,7 +455,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
if (playerCharacter.getGuild().equals(serverCity.getBane().getStone().getGuild())) { if (playerCharacter.getGuild().equals(serverCity.getBane().getStone().getGuild())) {
//attacker attempting to place asset //attacker attempting to place asset
if (numAttackerBuildings >= maxAttackerAssets) { if (attackerBuildings.size() >= maxAttackerAssets) {
PlaceAssetMsg.sendPlaceAssetError(origin, 61, ""); PlaceAssetMsg.sendPlaceAssetError(origin, 61, "");
return false; return false;
} }