From: Astrid S. <ast...@us...> - 2008-03-29 11:53:07
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/move In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30655/src/games/stendhal/server/actions/move Modified Files: MoveAction.java Log Message: more static imports Index: MoveAction.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/move/MoveAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MoveAction.java 17 Mar 2008 16:19:38 -0000 1.5 --- MoveAction.java 29 Mar 2008 11:53:09 -0000 1.6 *************** *** 13,20 **** package games.stendhal.server.actions.move; import games.stendhal.common.Direction; import games.stendhal.server.actions.ActionListener; import games.stendhal.server.actions.CommandCenter; - import games.stendhal.server.actions.WellKnownActionConstants; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPZone; --- 13,23 ---- package games.stendhal.server.actions.move; + import static games.stendhal.server.actions.WellKnownActionConstants.TARGET; + import static games.stendhal.server.actions.WellKnownActionConstants.TYPE; + import static games.stendhal.server.actions.WellKnownActionConstants.X; + import static games.stendhal.server.actions.WellKnownActionConstants.Y; import games.stendhal.common.Direction; import games.stendhal.server.actions.ActionListener; import games.stendhal.server.actions.CommandCenter; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPZone; *************** *** 33,38 **** import marauroa.common.game.RPAction; - import static games.stendhal.server.actions.WellKnownActionConstants.TARGET; - import static games.stendhal.server.actions.WellKnownActionConstants.TYPE; public class MoveAction implements ActionListener { --- 36,39 ---- *************** *** 142,149 **** } ! if (action.has(WellKnownActionConstants.X) ! && action.has(WellKnownActionConstants.Y)) { ! int x = action.getInt(WellKnownActionConstants.X); ! int y = action.getInt(WellKnownActionConstants.Y); if (player.has(_TELECLICKMODE)) { // Teleport --- 143,150 ---- } ! if (action.has(X) ! && action.has(Y)) { ! int x = action.getInt(X); ! int y = action.getInt(Y); if (player.has(_TELECLICKMODE)) { // Teleport |