[Arianne-commits] stendhal/src/games/stendhal/server/actions/equip DisplaceAction.java, 1.16, 1.17 DropAction.java, 1.3, 1.4 EquipUtil.java, 1.12, 1.13

[Kimmo R. <ki...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/equip
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23656/src/games/stendhal/server/actions/equip

Modified Files:
	DisplaceAction.java DropAction.java EquipUtil.java 
Log Message:
Use the same maximum throwing distance for items from ground and from bag. Fixes [2902136] "droping items"


Index: EquipUtil.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/equip/EquipUtil.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** EquipUtil.java	25 Feb 2009 23:42:53 -0000	1.12
--- EquipUtil.java	23 Nov 2009 14:22:41 -0000	1.13
***************
*** 16,19 ****
--- 16,24 ----
  public class EquipUtil {
  	private static Logger logger = Logger.getLogger(EquipUtil.class);
+ 	
+ 	/**
+ 	 * The maximum distance a player can throw an item away from himself.
+ 	 */
+ 	protected static final int MAX_THROWING_DISTANCE = 8;
  
  	/**

Index: DisplaceAction.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/equip/DisplaceAction.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** DisplaceAction.java	30 Oct 2009 21:33:38 -0000	1.16
--- DisplaceAction.java	23 Nov 2009 14:22:41 -0000	1.17
***************
*** 40,48 ****
   */
  public class DisplaceAction implements ActionListener {
- 	/**
- 	 * The maximum distance a player can throw an item away from himself.
- 	 */
- 	private static final int MAX_THROWING_DISTANCE = 8;
- 	
  	private static Logger logger = Logger.getLogger(DisplaceAction.class);
  
--- 40,43 ----
***************
*** 158,162 ****
      	int centerY = (int) (y + entity.getArea().getHeight() / 2);
      	
!     	if (!(player.squaredDistance(centerX, centerY) < MAX_THROWING_DISTANCE * MAX_THROWING_DISTANCE)) {
      		player.sendPrivateText("You cannot throw that far.");
      		return false;
--- 153,157 ----
      	int centerY = (int) (y + entity.getArea().getHeight() / 2);
      	
!     	if (!(player.squaredDistance(centerX, centerY) < EquipUtil.MAX_THROWING_DISTANCE * EquipUtil.MAX_THROWING_DISTANCE)) {
      		player.sendPrivateText("You cannot throw that far.");
      		return false;

Index: DropAction.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/equip/DropAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DropAction.java	1 May 2009 15:24:14 -0000	1.3
--- DropAction.java	23 Nov 2009 14:22:41 -0000	1.4
***************
*** 9,15 ****
  
  public class DropAction extends EquipmentAction {
- 
- 	
- 	
  	public static void register() {
  		CommandCenter.register("drop", new DropAction());
--- 9,12 ----
***************
*** 21,25 ****
  		// get destination and check it
  		final DestinationObject dest = new DestinationObject(action, player);
! 		if (!dest.checkDistance(player, 5.0)) {
  		    player.sendPrivateText("You cannot throw that far.");
  		    return;
--- 18,22 ----
  		// get destination and check it
  		final DestinationObject dest = new DestinationObject(action, player);
! 		if (!dest.checkDistance(player, EquipUtil.MAX_THROWING_DISTANCE)) {
  		    player.sendPrivateText("You cannot throw that far.");
  		    return;