[Freecol-commits] freecol/src/net/sf/freecol/common/model Unit.java, 1.298, 1.299

[Sergio C. <ser...@us...>]

Update of /cvsroot/freecol/freecol/src/net/sf/freecol/common/model
In directory sc8-pr-cvs17:/tmp/cvs-serv498/src/net/sf/freecol/common/model

Modified Files:
	Unit.java 
Log Message:
Fix bug #1763358 Hide or disable end turn button when it isn't your turn


Index: Unit.java
===================================================================
RCS file: /cvsroot/freecol/freecol/src/net/sf/freecol/common/model/Unit.java,v
retrieving revision 1.298
retrieving revision 1.299
diff -C2 -d -r1.298 -r1.299
*** Unit.java	9 Aug 2007 08:19:08 -0000	1.298
--- Unit.java	9 Aug 2007 08:48:24 -0000	1.299
***************
*** 3640,3644 ****
                                      { "%nation%", enemy.getNationAsString() } }, 
                                  ModelMessage.UNIT_DEMOTED);
!             } else if (getType() == BRAVE && !defender.isOffensive() && defender.getColony() != null) {
                  damageOrStealAtColony(defender.getColony());
              } else {
--- 3640,3644 ----
                                      { "%nation%", enemy.getNationAsString() } }, 
                                  ModelMessage.UNIT_DEMOTED);
!             } else if (getType() == BRAVE && !defender.isOffensiveUnit() && defender.getColony() != null) {
                  damageOrStealAtColony(defender.getColony());
              } else {