[Freecol-commits] SF.net SVN: freecol:[4793] freecol/trunk/src/net/sf/freecol/server/control/ InGameInputHandler.java

[<bur...@us...>]

Revision: 4793
          http://freecol.svn.sourceforge.net/freecol/?rev=4793&view=rev
Author:   burschik
Date:     2008-12-31 13:18:58 +0000 (Wed, 31 Dec 2008)

Log Message:
-----------
Consider possible NPE detected by Markus Schaber.

Modified Paths:
--------------
    freecol/trunk/src/net/sf/freecol/server/control/InGameInputHandler.java

Modified: freecol/trunk/src/net/sf/freecol/server/control/InGameInputHandler.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/server/control/InGameInputHandler.java	2008-12-31 09:24:29 UTC (rev 4792)
+++ freecol/trunk/src/net/sf/freecol/server/control/InGameInputHandler.java	2008-12-31 13:18:58 UTC (rev 4793)
@@ -994,12 +994,15 @@
                 Colony colony = tile.getColony();
                 // ships in settlements don't slow enemy ships
                 if (colony != null) {
+                    /* TODO: this doesn't actually do anything.
+                     * Should a fortress slow enemy ships?
                     Player enemy = colony.getOwner();
                     if (player != enemy && (player.getStance(enemy) == Stance.WAR
                             || unit.hasAbility("model.ability.piracy"))
                             && colony.hasAbility("model.ability.bombardShips")) {
                         float bombardingPower = combatModel.getOffencePower(colony, unit);
                     }
+                    */
                 } else if (!tile.isLand() && tile.getFirstUnit() != null) {
                     Player enemy = tile.getFirstUnit().getOwner();
                     if (player == enemy) { // own units, check another tile
@@ -1020,6 +1023,9 @@
             }
             
             if (attackPower > 0) {
+                // this must be the case, because it is the only way
+                // to increase attackPower
+                assert attacker != null;
                 float defencePower = combatModel.getDefencePower(attacker, unit);
                 float totalProbability = attackPower + defencePower;
                 int r = getPseudoRandom().nextInt(Math.round(totalProbability) + 1);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.