[Arianne-commits] stendhal/src/games/stendhal/server/actions/move PushAction.java, 1.19, 1.20 MoveToAction.java, 1.9, 1.10 MoveAction.java, 1.9, 1.10 FaceAction.java, 1.3, 1.4

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

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/move
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10528/src/games/stendhal/server/actions/move

Modified Files:
	PushAction.java MoveToAction.java MoveAction.java 
	FaceAction.java 
Log Message:
code cleanup (mostly @Override)

Index: MoveToAction.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/move/MoveToAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MoveToAction.java	5 Apr 2011 19:59:46 -0000	1.9
--- MoveToAction.java	6 Jan 2013 16:24:08 -0000	1.10
***************
*** 52,55 ****
--- 52,56 ----
  	 * @param action move-to action
  	 */
+ 	@Override
  	public void onAction(final Player player, final RPAction action) {
  		if (!player.getZone().isMoveToAllowed()) {
***************
*** 57,66 ****
  			return;
  		}
! 		
  		if (player.isPoisoned()) {
  			player.sendPrivateText("Poison has disoriented you and you cannot move normally. You only seem able to walk backwards and cannot plan out any route in advance.");
  			return;
  		}
! 		
  		if (player.hasPath()) {
  			player.clearPath();
--- 58,67 ----
  			return;
  		}
! 
  		if (player.isPoisoned()) {
  			player.sendPrivateText("Poison has disoriented you and you cannot move normally. You only seem able to walk backwards and cannot plan out any route in advance.");
  			return;
  		}
! 
  		if (player.hasPath()) {
  			player.clearPath();
***************
*** 99,103 ****
  
  	/**
! 	 * On request of the client add a node at the end of the path that goes 
  	 * one step further into the requested direction. This allows the client
  	 * to trigger a zone change with the mouse.
--- 100,104 ----
  
  	/**
! 	 * On request of the client add a node at the end of the path that goes
  	 * one step further into the requested direction. This allows the client
  	 * to trigger a zone change with the mouse.

Index: FaceAction.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/move/FaceAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FaceAction.java	25 Feb 2009 23:42:52 -0000	1.3
--- FaceAction.java	6 Jan 2013 16:24:08 -0000	1.4
***************
*** 29,32 ****
--- 29,33 ----
  	}
  
+ 	@Override
  	public void onAction(final Player player, final RPAction action) {
  

Index: MoveAction.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/move/MoveAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MoveAction.java	25 Feb 2009 23:42:52 -0000	1.9
--- MoveAction.java	6 Jan 2013 16:24:08 -0000	1.10
***************
*** 24,28 ****
  public class MoveAction implements ActionListener {
  
! 	
  
  	public static void register() {
--- 24,28 ----
  public class MoveAction implements ActionListener {
  
! 
  
  	public static void register() {
***************
*** 31,34 ****
--- 31,35 ----
  	}
  
+ 	@Override
  	public void onAction(final Player player, final RPAction action) {
  		if (action.has(DIR)) {

Index: PushAction.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/move/PushAction.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** PushAction.java	4 Jun 2012 14:09:04 -0000	1.19
--- PushAction.java	6 Jan 2013 16:24:08 -0000	1.20
***************
*** 44,52 ****
  	}
  
  	public void onAction(final Player player, final RPAction action) {
  
  		// evaluate the target parameter
  		final Entity entity = EntityHelper.entityFromTargetName(
! 			action.get(TARGET), player);
  
  		if ((entity == null) || !(entity instanceof RPEntity)) {
--- 44,53 ----
  	}
  
+ 	@Override
  	public void onAction(final Player player, final RPAction action) {
  
  		// evaluate the target parameter
  		final Entity entity = EntityHelper.entityFromTargetName(
! 				action.get(TARGET), player);
  
  		if ((entity == null) || !(entity instanceof RPEntity)) {
***************
*** 77,81 ****
  				// stop anyone just following a path (again to make annoying
  				// others harder).
! 				if (dir.oppositeDirection() == pushed.getDirection()
  						&& !pushed.hasPath()) {
  					pushed.stop();
--- 78,82 ----
  				// stop anyone just following a path (again to make annoying
  				// others harder).
! 				if ((dir.oppositeDirection() == pushed.getDirection())
  						&& !pushed.hasPath()) {
  					pushed.stop();
***************
*** 111,122 ****
  			return false;
  		}
! 		
  		// players cannot push rp entities with area larger than 4
! 		if (pushed.getArea().getWidth() * pushed.getArea().getHeight() > 4) {
  			pusher.sendPrivateText("You're strong, but not that strong!");
  			return false;
  		}
  
! 		// the number of pushes is limited per time 
  		if (!pusher.canPush(pushed)) {
  			pusher.sendPrivateText("Give yourself a breather before you start pushing again.");
--- 112,123 ----
  			return false;
  		}
! 
  		// players cannot push rp entities with area larger than 4
! 		if ((pushed.getArea().getWidth() * pushed.getArea().getHeight()) > 4) {
  			pusher.sendPrivateText("You're strong, but not that strong!");
  			return false;
  		}
  
! 		// the number of pushes is limited per time
  		if (!pusher.canPush(pushed)) {
  			pusher.sendPrivateText("Give yourself a breather before you start pushing again.");
***************
*** 124,128 ****
  		}
  
! 		// the player must be in range. 
  		return (pusher.nextTo(pushed));
  	}
--- 125,129 ----
  		}
  
! 		// the player must be in range.
  		return (pusher.nextTo(pushed));
  	}
***************
*** 137,141 ****
  	 */
  	private void move(final Player pusher, final RPEntity pushed, final int x, final int y) {
! 		
  		// move items under players, with the players, when pushed
  		if (pushed instanceof Player) {
--- 138,142 ----
  	 */
  	private void move(final Player pusher, final RPEntity pushed, final int x, final int y) {
! 
  		// move items under players, with the players, when pushed
  		if (pushed instanceof Player) {
***************
*** 157,161 ****
  			}
  		}
! 		
  		new GameEvent(pusher.getName(), "push", pushed.getName(), pushed.getZone().getName(), pushed.getX() + " " + pushed.getY() + " --> " + x + " " + y).raise();
  		pushed.setPosition(x, y);
--- 158,162 ----
  			}
  		}
! 
  		new GameEvent(pusher.getName(), "push", pushed.getName(), pushed.getZone().getName(), pushed.getX() + " " + pushed.getY() + " --> " + x + " " + y).raise();
  		pushed.setPosition(x, y);