[Arianne-commits] stendhal/src/games/stendhal/client/entity User.java, 1.95, 1.96

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

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/entity
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8886/src/games/stendhal/client/entity

Modified Files:
	User.java 
Log Message:
support missgin slots in iteration

Index: User.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/entity/User.java,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** User.java	11 Aug 2013 07:54:01 -0000	1.95
--- User.java	19 Jan 2014 15:56:01 -0000	1.96
***************
*** 26,29 ****
--- 26,30 ----
  
  import marauroa.common.game.RPObject;
+ import marauroa.common.game.RPSlot;
  
  /**
***************
*** 254,258 ****
  	 */
  	public int findItem(final String slotName, final String itemName) {
! 		for (final RPObject item : getSlot(slotName)) {
  			if (item.get("name").equals(itemName)) {
  				final int itemID = item.getID().getObjectID();
--- 255,263 ----
  	 */
  	public int findItem(final String slotName, final String itemName) {
! 		RPSlot slot = getSlot(slotName);
! 		if (slot == null) {
! 			return -1;
! 		}
! 		for (final RPObject item : slot) {
  			if (item.get("name").equals(itemName)) {
  				final int itemID = item.getID().getObjectID();
***************
*** 429,433 ****
  		return rpObject.getID().getZoneID();
  	}
! 	
  	@Override
  	protected void processPositioning(final RPObject base, final RPObject diff) {
--- 434,438 ----
  		return rpObject.getID().getZoneID();
  	}
! 
  	@Override
  	protected void processPositioning(final RPObject base, final RPObject diff) {
***************
*** 437,447 ****
  		super.processPositioning(base, diff);
  	}
! 	
  	/**
  	 * Start movement towards a direction. This is for
  	 * the client side movement prediction to start moving before the server
  	 * responds to the move action.
! 	 * 
! 	 * @param direction new direction 
  	 * @param facing <code>true</code> if the player should just turn
  	 */
--- 442,452 ----
  		super.processPositioning(base, diff);
  	}
! 
  	/**
  	 * Start movement towards a direction. This is for
  	 * the client side movement prediction to start moving before the server
  	 * responds to the move action.
! 	 *
! 	 * @param direction new direction
  	 * @param facing <code>true</code> if the player should just turn
  	 */