From: <oli...@us...> - 2008-08-24 10:21:34
|
Revision: 4333 http://freecol.svn.sourceforge.net/freecol/?rev=4333&view=rev Author: olivierschmitt Date: 2008-08-24 10:21:43 +0000 (Sun, 24 Aug 2008) Log Message: ----------- Minor fixes Modified Paths: -------------- freecol/trunk/src/net/sf/freecol/common/model/SimpleCombatModel.java freecol/trunk/src/net/sf/freecol/server/ai/mission/TransportMission.java freecol/trunk/src/net/sf/freecol/server/control/InGameInputHandler.java Modified: freecol/trunk/src/net/sf/freecol/common/model/SimpleCombatModel.java =================================================================== --- freecol/trunk/src/net/sf/freecol/common/model/SimpleCombatModel.java 2008-08-24 09:52:55 UTC (rev 4332) +++ freecol/trunk/src/net/sf/freecol/common/model/SimpleCombatModel.java 2008-08-24 10:21:43 UTC (rev 4333) @@ -512,7 +512,7 @@ case LOSS: if (attacker.isNaval()) { Location repairLocation = attackingPlayer.getRepairLocation(attacker); - damageShip(attacker, null, attacker); + damageShip(attacker, null, defender); attacker.addModelMessage(attacker, ModelMessage.MessageType.UNIT_DEMOTED, "model.unit.shipDamaged", "%unit%", attacker.getName(), @@ -533,7 +533,7 @@ break; case GREAT_LOSS: if (attacker.isNaval()) { - sinkShip(attacker, null, attacker); + sinkShip(attacker, null, defender); attacker.addModelMessage(attacker, ModelMessage.MessageType.UNIT_LOST, "model.unit.shipSunk", "%unit%", attacker.getName(), Modified: freecol/trunk/src/net/sf/freecol/server/ai/mission/TransportMission.java =================================================================== --- freecol/trunk/src/net/sf/freecol/server/ai/mission/TransportMission.java 2008-08-24 09:52:55 UTC (rev 4332) +++ freecol/trunk/src/net/sf/freecol/server/ai/mission/TransportMission.java 2008-08-24 10:21:43 UTC (rev 4333) @@ -505,7 +505,6 @@ // since we are in Europe, use the carrier entry point to search for a good settlement spot. Unit carrier = getUnit(); Tile colonyTile = BuildColonyMission.findColonyLocation(carrier); - int colonyValue = aiPlayer.getPlayer().getColonyValue(colonyTile); int space = getAvailableSpace(); while (colonyTile!=null && space > 0) { AIUnit newUnit = getCheapestUnitInEurope(connection); @@ -513,6 +512,7 @@ if (newUnit.getUnit().isColonist() && !newUnit.getUnit().isArmed() && !newUnit.getUnit().isMounted() && newUnit.getUnit().getRole() != Role.PIONEER) { // send the colonist to build the new colony + int colonyValue = aiPlayer.getPlayer().getColonyValue(colonyTile); newUnit.setMission(new BuildColonyMission(getAIMain(), newUnit, colonyTile, colonyValue)); } addToTransportList(newUnit); Modified: freecol/trunk/src/net/sf/freecol/server/control/InGameInputHandler.java =================================================================== --- freecol/trunk/src/net/sf/freecol/server/control/InGameInputHandler.java 2008-08-24 09:52:55 UTC (rev 4332) +++ freecol/trunk/src/net/sf/freecol/server/control/InGameInputHandler.java 2008-08-24 10:21:43 UTC (rev 4333) @@ -1354,7 +1354,8 @@ if (unit.canCaptureGoods() && getGame().getGameOptions().getBoolean(GameOptions.UNIT_HIDING)) { List<Goods> goodsInUnit = unit.getGoodsContainer().getCompactGoods(); for (Goods newGoods : goodsInUnit) { - int capturedGoods = newGoods.getAmount() - oldGoodsCounts.get(newGoods.getType().getId()).intValue(); + Integer oldGoodsAmount = oldGoodsCounts.get(newGoods.getType().getId()); + int capturedGoods = newGoods.getAmount() - (oldGoodsAmount!=null?oldGoodsAmount.intValue():0); if (capturedGoods > 0) { Element captured = reply.getOwnerDocument().createElement("capturedGoods"); captured.setAttribute("type", newGoods.getType().getId()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |