[Arianne-commits] stendhal/src/games/stendhal/client/gui/wt GroundContainer.java, 1.93, 1.94

[Hendrik B. <nh...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/wt
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv28384/src/games/stendhal/client/gui/wt

Modified Files:
	GroundContainer.java 
Log Message:
fixed NullPointerException and hide ConcurrentModificiationExceptions in the cursor code

Index: GroundContainer.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/wt/GroundContainer.java,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** GroundContainer.java	24 Apr 2010 17:29:15 -0000	1.93
--- GroundContainer.java	24 Apr 2010 17:37:41 -0000	1.94
***************
*** 297,301 ****
  
  		} catch (ConcurrentModificationException ex) {
! 			logger.warn(ex, ex);
  		}
  	}
--- 297,301 ----
  
  		} catch (ConcurrentModificationException ex) {
! 			logger.debug(ex, ex);
  		}
  	}
***************
*** 331,335 ****
  			cursor = StendhalCursor.WALK;
  			StaticGameLayers layers = StendhalClient.get().getStaticGameLayers();
! 			if ((layers != null) && layers.getCollisionDetection().collides((int) point2.getX(), (int) point2.getY())) {
  				cursor = StendhalCursor.STOP;
  			} else if (calculateZoneChangeDirection(point2) != null) {
--- 331,335 ----
  			cursor = StendhalCursor.WALK;
  			StaticGameLayers layers = StendhalClient.get().getStaticGameLayers();
! 			if ((layers.getCollisionDetection() != null) && layers.getCollisionDetection().collides((int) point2.getX(), (int) point2.getY())) {
  				cursor = StendhalCursor.STOP;
  			} else if (calculateZoneChangeDirection(point2) != null) {