From: Hendrik <nh...@us...> - 2007-07-01 20:39:29
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/actions In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17450/src/games/stendhal/server/actions Modified Files: DisplaceAction.java Log Message: removed unused code and added JavaDoc Index: DisplaceAction.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/DisplaceAction.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** DisplaceAction.java 11 Jun 2007 09:36:54 -0000 1.15 --- DisplaceAction.java 1 Jul 2007 20:39:29 -0000 1.16 *************** *** 15,22 **** import games.stendhal.server.StendhalRPRuleProcessor; import games.stendhal.server.StendhalRPZone; import games.stendhal.server.entity.item.Item; import games.stendhal.server.entity.player.Player; - import games.stendhal.server.entity.PassiveEntity; - import games.stendhal.server.entity.RPEntity; import marauroa.common.Log4J; import marauroa.common.game.RPAction; --- 15,21 ---- import games.stendhal.server.StendhalRPRuleProcessor; import games.stendhal.server.StendhalRPZone; + import games.stendhal.server.entity.PassiveEntity; import games.stendhal.server.entity.item.Item; import games.stendhal.server.entity.player.Player; import marauroa.common.Log4J; import marauroa.common.game.RPAction; *************** *** 25,36 **** --- 24,44 ---- import org.apache.log4j.Logger; + /** + * Moving of items around on the ground + */ public class DisplaceAction implements ActionListener { private static final Logger logger = Log4J.getLogger(DisplaceAction.class); + /** + * register this action + */ public static void register() { StendhalRPRuleProcessor.register("displace", new DisplaceAction()); } + /** + * handle movement of items + */ public void onAction(Player player, RPAction action) { Log4J.startMethod(logger, "displace"); *************** *** 42,57 **** if (zone.has(targetid)) { RPObject object = zone.get(targetid); ! if (object instanceof RPEntity) /** Player, Creatures and NPCs */ ! { ! RPEntity entity = (RPEntity) object; ! if (player.nextTo(entity)) { ! if (action.has("x") && action.has("y")) { ! // int x=action.getInt("x"); ! // int y=action.getInt("y"); ! ! /** TODO: Code displace here */ ! } ! } ! } else if (object instanceof PassiveEntity) { if (action.has("x") && action.has("y")) { int x = action.getInt("x"); --- 50,54 ---- if (zone.has(targetid)) { RPObject object = zone.get(targetid); ! if (object instanceof PassiveEntity) { if (action.has("x") && action.has("y")) { int x = action.getInt("x"); |