From: Astrid S. <ast...@us...> - 2009-03-01 19:57:32
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13039/src/games/stendhal/server/entity/item Modified Files: NecroStaff.java Log Message: code format whitespaces et al ran server (which ran) ran tests (which fail due to changed behaviour in seller) Index: NecroStaff.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/NecroStaff.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** NecroStaff.java 27 Feb 2009 19:29:09 -0000 1.4 --- NecroStaff.java 1 Mar 2009 19:57:21 -0000 1.5 *************** *** 85,89 **** final List<Creature> possibleCreatures = new ArrayList<Creature>(); for (final Creature creature : creatures) { ! if (creature.getLevel() <= LEVEL_FACTOR*playerlevel && creature.get("class").equals("undead") && !creature.isRare()) { --- 85,89 ---- final List<Creature> possibleCreatures = new ArrayList<Creature>(); for (final Creature creature : creatures) { ! if (creature.getLevel() <= LEVEL_FACTOR * playerlevel && creature.get("class").equals("undead") && !creature.isRare()) { *************** *** 111,115 **** //@Override public boolean onUsed(final RPEntity user) { ! if(!this.isContained()) { user.sendPrivateText("The staff must be wielded."); return false; --- 111,115 ---- //@Override public boolean onUsed(final RPEntity user) { ! if (!this.isContained()) { user.sendPrivateText("The staff must be wielded."); return false; *************** *** 124,128 **** if (zone.getNPCList().size() >= MAX_ZONE_NPCS) { user.sendPrivateText("Mysteriously, the staff does not function! Perhaps this area is too crowded..."); ! logger.warn(user.getName() + " is trying to use the necromancer staff but there are too many npcs in " + zone.getName() ); return false; } --- 124,128 ---- if (zone.getNPCList().size() >= MAX_ZONE_NPCS) { user.sendPrivateText("Mysteriously, the staff does not function! Perhaps this area is too crowded..."); ! logger.warn(user.getName() + " is trying to use the necromancer staff but there are too many npcs in " + zone.getName()); return false; } *************** *** 148,152 **** //Suck some of the summoners HP depending on the summoned creature's level. ! user.damage(HP_FACTOR*creature.getLevel(),this); return true; } --- 148,152 ---- //Suck some of the summoners HP depending on the summoned creature's level. ! user.damage(HP_FACTOR * creature.getLevel(), this); return true; } |