[Arianne-commits] stendhal/src/games/stendhal/server/actions/move PushAction.java, 1.8, 1.9

[Katie <ky...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/move
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11797/src/games/stendhal/server/actions/move

Modified Files:
	PushAction.java 
Log Message:
only stop player pushing an rp entity off an item if the rp entity is also a player


Index: PushAction.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/move/PushAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PushAction.java	23 Aug 2008 09:45:05 -0000	1.8
--- PushAction.java	24 Aug 2008 10:42:37 -0000	1.9
***************
*** 93,102 ****
  		}
  
! 		// prevent pushing an rpEntity off an item
! 		final Set<Item> items = player.getZone().getItemsOnGround();
! 		for (final Item item : items) {
! 			if (rpEntity.getArea().intersects(item.getArea())) {
! 				player.sendPrivateText("You cannot push now because there is an item below " + rpEntity.getName() + ".");
! 				return false;
  			}
  		}
--- 93,105 ----
  		}
  
! 		// prevent pushing a player off an ite
! 		if (rpEntity instanceof Player) {
! 			// prevent pushing a player off an item
! 			final Set<Item> items = player.getZone().getItemsOnGround();
! 			for (final Item item : items) {
! 				if (rpEntity.getArea().intersects(item.getArea())) {
! 					player.sendPrivateText("You cannot push now because there is an item below " + rpEntity.getName() + ".");
! 					return false;
! 				}
  			}
  		}