From: Astrid S. <ast...@us...> - 2008-03-18 19:31:23
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/admin In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12658/src/games/stendhal/server/actions/admin Modified Files: AlterAction.java SummonAction.java Log Message: code format sorry booched it a bit yesterday Index: AlterAction.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/admin/AlterAction.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** AlterAction.java 17 Mar 2008 16:49:40 -0000 1.11 --- AlterAction.java 18 Mar 2008 19:30:42 -0000 1.12 *************** *** 43,49 **** String stat = action.get(_STAT); ! if ("name".equals( stat ) && (changed instanceof Player)) { ! logger.error("DENIED: Admin " + player.getName() ! + " trying to change player " + action.get(_TARGET) + "'s name"); player.sendPrivateText("Sorry, name cannot be changed."); --- 43,48 ---- String stat = action.get(_STAT); ! if ("name".equals(stat) && (changed instanceof Player)) { ! logger.error("DENIED: Admin " + player.getName() + " trying to change player " + action.get(_TARGET) + "'s name"); player.sendPrivateText("Sorry, name cannot be changed."); *************** *** 51,60 **** } ! if (ATTR_ADMINLEVEL.equals( stat )) { player.sendPrivateText("Use #/adminlevel #<playername> #[<newlevel>] to display or change adminlevel."); return; } ! if (ATTR_TITLE.equals( stat ) && (changed instanceof Player)) { player.sendPrivateText("The title attribute may not be changed directly."); return; --- 50,59 ---- } ! if (ATTR_ADMINLEVEL.equals(stat)) { player.sendPrivateText("Use #/adminlevel #<playername> #[<newlevel>] to display or change adminlevel."); return; } ! if (ATTR_TITLE.equals(stat) && (changed instanceof Player)) { player.sendPrivateText("The title attribute may not be changed directly."); return; *************** *** 105,122 **** } ! if (_ATTR_HP.equals( stat ) ! && (changed.getInt("base_hp") < numberValue)) { ! logger.error("DENIED: Admin " + player.getName() ! + " trying to set player " ! + Grammar.suffix_s(action.get(_TARGET)) ! + " HP over its Base HP"); return; } ! if (_ATTR_HP.equals( stat ) && numberValue == 0) { ! logger.error("DENIED: Admin " + player.getName() ! + " trying to set player " ! + Grammar.suffix_s(action.get(_TARGET)) ! + " HP to 0, making it so unkillable."); return; } --- 104,116 ---- } ! if (_ATTR_HP.equals(stat) && (changed.getInt("base_hp") < numberValue)) { ! logger.error("DENIED: Admin " + player.getName() + " trying to set player " ! + Grammar.suffix_s(action.get(_TARGET)) + " HP over its Base HP"); return; } ! if (_ATTR_HP.equals(stat) && numberValue == 0) { ! logger.error("DENIED: Admin " + player.getName() + " trying to set player " ! + Grammar.suffix_s(action.get(_TARGET)) + " HP to 0, making it so unkillable."); return; } Index: SummonAction.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/admin/SummonAction.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** SummonAction.java 17 Mar 2008 16:19:34 -0000 1.13 --- SummonAction.java 18 Mar 2008 19:30:42 -0000 1.14 *************** *** 57,82 **** if (entity != null) { ! found(type, entity); ! } else if ("cat".equals( type )) { ! if (player.hasPet()) { ! error("You already own a pet!"); ! } else { ! Cat cat = new Cat(player); ! found(type, cat); ! } ! } else if ("baby dragon".equals( type )) { ! if (player.hasPet()) { ! error("You already own a pet!"); ! } else { ! BabyDragon dragon = new BabyDragon(player); found(type, dragon); ! } ! } else if ("sheep".equals( type )) { ! if (player.hasSheep()) { ! error("You already own a sheep!"); ! } else { ! Sheep sheep = new Sheep(player); ! found(type, sheep); ! } } } --- 57,82 ---- if (entity != null) { ! found(type, entity); ! } else if ("cat".equals(type)) { ! if (player.hasPet()) { ! error("You already own a pet!"); ! } else { ! Cat cat = new Cat(player); ! found(type, cat); ! } ! } else if ("baby dragon".equals(type)) { ! if (player.hasPet()) { ! error("You already own a pet!"); ! } else { ! BabyDragon dragon = new BabyDragon(player); found(type, dragon); ! } ! } else if ("sheep".equals(type)) { ! if (player.hasSheep()) { ! error("You already own a sheep!"); ! } else { ! Sheep sheep = new Sheep(player); ! found(type, sheep); ! } } } |