Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- .../sf/freecol/client/control/InGameController.java | 21 +++++++++++----------
- 1 file changed, 11 insertions(+), 10 deletions(-)
- diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java
- index d575476..c1c01c6 100644
- --- a/src/net/sf/freecol/client/control/InGameController.java
- +++ b/src/net/sf/freecol/client/control/InGameController.java
- @@ -1569,16 +1569,6 @@ public final class InGameController implements NetworkConstants {
- && !buildColonyShowWarnings(tile, unit)) {
- return;
- }
- -
- - if (tile.getOwner() != null && !player.owns(tile)) {
- - // Claim tile from other owners before founding a settlement.
- - // Only native owners that we can steal, buy from, or use a
- - // bonus center tile exception should be possible by this point.
- - if (!claimTile(player, tile, unit, player.getLandPrice(tile), 0))
- - return;
- - // One more check that founding can now proceed.
- - if (!player.canClaimToFoundSettlement(tile)) return;
- - }
- // Get and check the name.
- String name = player.getSettlementName(null);
- @@ -1598,6 +1588,17 @@ public final class InGameController implements NetworkConstants {
- return;
- }
- + // Claim tile from other owners before founding a settlement.
- + if (tile.getOwner() != null && !player.owns(tile)) {
- + // Only native owners that we can steal, buy from, or use a
- + // bonus center tile exception should be possible by this point.
- + if (!claimTile(player, tile, unit, player.getLandPrice(tile), 0))
- + return;
- + // One more check that founding can now proceed.
- + if (!player.canClaimToFoundSettlement(tile)) return;
- + }
- +
- + // Build colony
- if (askServer().buildColony(name, unit) && tile.hasSettlement()) {
- player.invalidateCanSeeTiles();
- gui.playSound("sound.event.buildingComplete");
Add Comment
Please, Sign In to add comment