Skip to content

Commit 2400ce4

Browse files
Fix bots trying to trade back even when outside scanning range
1 parent 7fb7dfa commit 2400ce4

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

server/services/trade.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,14 @@ export default class TradeService extends EventEmitter {
457457
return tradeTechs;
458458
}
459459

460+
_canPlayersTradeInRange(game: Game, fromPlayer: Player, toPlayer: Player) {
461+
if (game.settings.player.tradeScanning === 'scanned') {
462+
return this.playerService.isInScanningRangeOfPlayer(game, fromPlayer, toPlayer);
463+
}
464+
465+
return true;
466+
}
467+
460468
_tradeScanningCheck(game: Game, fromPlayer: Player, toPlayer: Player) {
461469
if (game.settings.player.tradeScanning === 'scanned') {
462470
let isInRange = this.playerService.isInScanningRangeOfPlayer(game, fromPlayer, toPlayer);
@@ -525,6 +533,10 @@ export default class TradeService extends EventEmitter {
525533
return;
526534
}
527535

536+
if (!this._canPlayersTradeInRange(game, fromPlayer, toPlayer)) {
537+
return;
538+
}
539+
528540
let tradeChance = TRADE_CHANCE_BASE + (TRADE_CHANCE_STEP * reputation.score);
529541
let tradeRoll = this.randomService.getRandomNumber(99);
530542
let canPerformTrade = tradeRoll <= tradeChance || true;

0 commit comments

Comments
 (0)