From: Katie <ky...@us...> - 2008-07-30 09:49:03
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/admin In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv21516/src/games/stendhal/server/actions/admin Modified Files: AdministrationAction.java Added Files: WrapAction.java Log Message: The wrap action was supposed to only be for admin > 800 because it's not advanced enough yet to let players use it (in fact it's meant to be an npc who would do it for you). but any player could do it. now correctly implemented the adminlevel condition, and I tested to see that it does now check. Index: AdministrationAction.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/admin/AdministrationAction.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** AdministrationAction.java 12 Jul 2008 14:44:05 -0000 1.22 --- AdministrationAction.java 30 Jul 2008 09:49:08 -0000 1.23 *************** *** 62,65 **** --- 62,66 ---- GagAction.register(); AlterQuestAction.register(); + WrapAction.register(); REQUIRED_ADMIN_LEVELS.put("support", 100); REQUIRED_ADMIN_LEVELS.put("super", 5000); --- NEW FILE: WrapAction.java --- package games.stendhal.server.actions.admin; import games.stendhal.common.Grammar; import games.stendhal.server.actions.ActionListener; import games.stendhal.server.actions.CommandCenter; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.entity.item.Item; import games.stendhal.server.entity.item.Present; import games.stendhal.server.entity.player.Player; import marauroa.common.game.RPAction; import org.apache.log4j.Logger; /** * @author Martin Fuchs */ public class WrapAction implements ActionListener { static final Logger logger = Logger.getLogger(WrapAction.class); /** * Registers the "wrap" action handler. */ public static void register() { final WrapAction wrap = new WrapAction(); CommandCenter.register("wrap", wrap, 800); } public void onAction(final Player player, final RPAction action) { if (action.get("type").equals("wrap")) { onWrap(player, action); } } private void onWrap(final Player player, final RPAction action) { String itemName = action.get("target"); final String args = action.get("args"); if ((args != null) && (args.length() > 0)) { itemName += ' '; itemName += args; } itemName = Grammar.singular(itemName); final Item item = player.getFirstEquipped(itemName); if (item != null) { final String slot = "bag"; final Present present = (Present) SingletonRepository.getEntityManager().getItem("present"); present.setContent(itemName); player.equip(slot, present); player.drop(itemName); SingletonRepository.getRuleProcessor().addGameEvent(player.getName(), "wrap", itemName, slot); player.updateItemAtkDef(); } else { player.sendPrivateText("You don't have any " + itemName); } } } |