From 1e3c885f45c54100a72a273cb0a0b6e620a042fa Mon Sep 17 00:00:00 2001
From: leper <leper@wildfiregames.com>
Date: Sun, 4 Nov 2012 23:01:12 +0000
Subject: [PATCH] Allow trading with neutral players.

This was SVN commit r12821.
---
 binaries/data/mods/public/simulation/components/Trader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/binaries/data/mods/public/simulation/components/Trader.js b/binaries/data/mods/public/simulation/components/Trader.js
index cdca1e7978..7aeeeaa100 100644
--- a/binaries/data/mods/public/simulation/components/Trader.js
+++ b/binaries/data/mods/public/simulation/components/Trader.js
@@ -169,7 +169,7 @@ Trader.prototype.CanTrade = function(target)
 	var traderPlayerId = cmpTraderPlayer.GetPlayerID();
 	var cmpTargetPlayer = QueryOwnerInterface(target, IID_Player);
 	var targetPlayerId = cmpTargetPlayer.GetPlayerID();
-	var ownershipSuitableForTrading = (traderPlayerId == targetPlayerId) || cmpTraderPlayer.IsAlly(targetPlayerId);
+	var ownershipSuitableForTrading = cmpTraderPlayer.IsAlly(targetPlayerId) || cmpTraderPlayer.IsNeutral(targetPlayerId);
 	if (!ownershipSuitableForTrading)
 		return false;
 	return true;