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

Rework of validation checks.

Browse Source
This commit is contained in:
MagicBot
2023-01-14 16:31:58 -05:00
parent 2643be456e
commit 8ef5cb4e22
1 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/PlaceAssetMsgHandler.java
+32 -43
View File
@@ -335,42 +335,30 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
serverCity = ZoneManager.getCityAtLocation(buildingList.getLoc()); serverCity = ZoneManager.getCityAtLocation(buildingList.getLoc());
//no city found //no city found
//check if attacker city.
if (serverCity == null){
Bane bane = Bane.getBaneByAttackerGuild(player.getGuild());
City attackerCity = null;
if (bane != null)
attackerCity = bane.getCity();
if (attackerCity != null) if (serverCity == null) {
if (buildingList.getLoc().isInsideCircle(attackerCity.getLoc(), Enum.CityBoundsType.SIEGE.extents)) PlaceAssetMsg.sendPlaceAssetError(origin, 41, ""); // Cannot place outisde a guild zone
serverCity = attackerCity; return false;
}
//no city found for attacker city,
//check if defender city
if (serverCity == null){
if (player.getGuild().getOwnedCity() != null)
if (buildingList.getLoc().isInsideCircle(player.getGuild().getOwnedCity().getLoc(), Enum.CityBoundsType.SIEGE.extents))
serverCity = player.getGuild().getOwnedCity();
} }
if ((serverCity != null) && // No bane no bow
(serverCity.getBane() != null)) {
// Set the server zone to the city zone in order to account for being inside if (serverCity.getBane() == null) {
// the siege bounds buffer area PlaceAssetMsg.sendPlaceAssetError(origin, 66, ""); // There is no bane circle to support this building of war
return false;
}
serverZone = serverCity.getParent();
if ((player.getGuild().equals(serverCity.getBane().getOwner().getGuild()) == false) // Set the server zone to the city zone in order to account for being inside
// the siege bounds buffer area
serverZone = serverCity.getParent();
if ((player.getGuild().equals(serverCity.getBane().getOwner().getGuild()) == false)
&& (player.getGuild().equals(serverCity.getGuild()) == false)) { && (player.getGuild().equals(serverCity.getGuild()) == false)) {
PlaceAssetMsg.sendPlaceAssetError(origin, 54, ""); // Must belong to attacker or defender PlaceAssetMsg.sendPlaceAssetError(origin, 54, ""); // Must belong to attacker or defender
return false; return false;
} }
}
// cant place siege equipment off city zone.
// If there is a bane placed, we limit placement to 2x the stone rank's worth of attacker assets // If there is a bane placed, we limit placement to 2x the stone rank's worth of attacker assets
// and 1x the tree rank for defenders // and 1x the tree rank for defenders
@@ -413,27 +401,29 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
for (AbstractWorldObject awo : awoList) { for (AbstractWorldObject awo : awoList) {
Building building = (Building) awo; Building building = (Building) awo;
if (building.getBlueprint() != null) if (building.getBlueprint() != null)
if (!building.getBlueprint().isSiegeEquip()) if (!building.getBlueprint().isSiegeEquip())
continue;
if (!building.getLoc().isInsideCircle(serverCity.getLoc(), Enum.CityBoundsType.SIEGE.extents))
continue; continue;
if (!building.getLoc().isInsideCircle(serverCity.getLoc(), Enum.CityBoundsType.SIEGE.extents)) if (building.getGuild() == null)
continue; continue;
if (building.getGuild() == null) if (building.getGuild().isErrant())
continue; continue;
if (building.getGuild().isErrant()) if (!building.getGuild().equals(serverCity.getGuild()) && !building.getGuild().equals(serverCity.getBane().getOwner().getGuild()))
continue; continue;
if (!building.getGuild().equals(serverCity.getGuild()) && !building.getGuild().equals(serverCity.getBane().getOwner().getGuild())) if (building.getGuild().equals(serverCity.getGuild()))
continue; defenderBuildings.add(building);
if (building.getGuild().equals(serverCity.getGuild())) if (building.getGuild().equals(serverCity.getBane().getOwner().getGuild()))
defenderBuildings.add(building); attackerBuildings.add(building);
if (building.getGuild().equals(serverCity.getBane().getOwner().getGuild())) }
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())) {
@@ -452,7 +442,6 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
} }
} }
}
// Passed validation // Passed validation
return true; return true;