|
|
@ -398,8 +398,6 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler { |
|
|
|
|
|
|
|
|
|
|
|
HashSet<AbstractWorldObject> awoList = WorldGrid.getObjectsInRangePartial(serverCity, 1000, MBServerStatics.MASK_BUILDING); |
|
|
|
HashSet<AbstractWorldObject> awoList = WorldGrid.getObjectsInRangePartial(serverCity, 1000, MBServerStatics.MASK_BUILDING); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (AbstractWorldObject awo : awoList) { |
|
|
|
for (AbstractWorldObject awo : awoList) { |
|
|
|
Building building = (Building)awo; |
|
|
|
Building building = (Building)awo; |
|
|
|
|
|
|
|
|
|
|
@ -416,7 +414,6 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler { |
|
|
|
if (building.getGuild().isErrant()) |
|
|
|
if (building.getGuild().isErrant()) |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!building.getGuild().equals(serverCity.getGuild()) && !building.getGuild().equals(serverCity.getBane().getOwner().getGuild())) |
|
|
|
if (!building.getGuild().equals(serverCity.getGuild()) && !building.getGuild().equals(serverCity.getBane().getOwner().getGuild())) |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
|
@ -430,7 +427,6 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler { |
|
|
|
if (building.getGuild().equals(serverCity.getBane().getOwner().getGuild())) |
|
|
|
if (building.getGuild().equals(serverCity.getBane().getOwner().getGuild())) |
|
|
|
numAttackerBuildings++; |
|
|
|
numAttackerBuildings++; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Validate bane limits on siege assets
|
|
|
|
// Validate bane limits on siege assets
|
|
|
@ -441,13 +437,12 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler { |
|
|
|
return true; |
|
|
|
return true; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (serverCity.getBane() != null) |
|
|
|
if ((player.getGuild().equals(serverCity.getGuild())) && |
|
|
|
if ((player.getGuild().equals(serverCity.getGuild())) && |
|
|
|
(numDefenderBuildings >= serverCity.getTOL().getRank())) { |
|
|
|
(numDefenderBuildings >= serverCity.getTOL().getRank())) { |
|
|
|
return true; |
|
|
|
return true; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// passes validation: can assign auto-protection to war asset
|
|
|
|
// passes validation: can assign auto-protection to war asset
|
|
|
|
|
|
|
|
|
|
|
|
if (serverCity.getBane() != null) |
|
|
|
if (serverCity.getBane() != null) |
|
|
@ -455,15 +450,9 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler { |
|
|
|
if (player.getGuild().equals(serverCity.getBane().getOwner().getGuild())) |
|
|
|
if (player.getGuild().equals(serverCity.getBane().getOwner().getGuild())) |
|
|
|
return true; |
|
|
|
return true; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
siegeBuilding.setProtectionState(ProtectionState.PROTECTED); |
|
|
|
siegeBuilding.setProtectionState(ProtectionState.PROTECTED); |
|
|
|
// No bane placed. We're done!
|
|
|
|
// No bane placed. We're done!
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return true; |
|
|
|
return true; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|