mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Force client warning from illegal naval-native-trades.

This commit is contained in:
Mike Pope 2020-03-04 10:28:15 +10:30
parent e822962bee
commit 2119b554ff
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/net/sf/freecol/common/model/Unit.java
View File

@ -2412,17 +2412,23 @@ public class Unit extends GoodsLocation
* @return The appropriate {@code MoveType}.
*/
private MoveType getTradeMoveType(Settlement settlement) {
final Player owner = this.getOwner();
if (settlement instanceof Colony) {
return (getOwner().atWarWith(settlement.getOwner()))
return (owner.atWarWith(settlement.getOwner()))
? MoveType.MOVE_NO_ACCESS_WAR
: (!hasAbility(Ability.TRADE_WITH_FOREIGN_COLONIES))
? MoveType.MOVE_NO_ACCESS_TRADE
: MoveType.ENTER_SETTLEMENT_WITH_CARRIER_AND_GOODS;
} else if (settlement instanceof IndianSettlement) {
// Do not block for war, bringing gifts is allowed
return (!((IndianSettlement)settlement).allowContact(this))
// Require contact, and settlement-level contact for naval units,
// but not block for war as bringing gifts is allowed
return (!allowContact(settlement)
|| (this.isNaval()
&& ((IndianSettlement)settlement).getContactLevel(owner)
== IndianSettlement.ContactLevel.UNCONTACTED))
? MoveType.MOVE_NO_ACCESS_CONTACT
: (hasGoodsCargo() || getSpecification()
// Allow trade if cargo present or empty-traders-option
: (this.hasGoodsCargo() || getSpecification()
.getBoolean(GameOptions.EMPTY_TRADERS))
? MoveType.ENTER_SETTLEMENT_WITH_CARRIER_AND_GOODS
: MoveType.MOVE_NO_ACCESS_GOODS;

1
test/src/net/sf/freecol/common/model/BaseCostDeciderTest.java
View File

@ -210,6 +210,7 @@ public class BaseCostDeciderTest extends FreeColTestCase {
// Add contact, but disallow empty traders
Player.makeContact(galleon.getOwner(), settlement.getOwner());
((IndianSettlement)settlement).setContacted(galleon.getOwner());
spec().setBoolean(GameOptions.EMPTY_TRADERS, Boolean.FALSE);
cost = base.getCost(galleon, unitTile, settlementTile, 4);
assertEquals("Move should be invalid, no goods to trade",