From: Hendrik B. <nh...@us...> - 2009-09-29 20:23:10
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/player In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31215/src/games/stendhal/server/entity/player Modified Files: PlayerRPClass.java Player.java Log Message: fixed compiler warnings in entities Index: Player.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/player/Player.java,v retrieving revision 1.250 retrieving revision 1.251 diff -C2 -d -r1.250 -r1.251 *** Player.java 11 Sep 2009 21:07:38 -0000 1.250 --- Player.java 29 Sep 2009 20:22:31 -0000 1.251 *************** *** 403,407 **** * @return The current amount of karma. * ! * @see #addKarma() */ @Override --- 403,407 ---- * @return The current amount of karma. * ! * @see #addKarma(double) */ @Override *************** *** 1887,1892 **** public void equip(final Item item, final int amount) { ! if (item instanceof Stackable) { ! ((Stackable) item).setQuantity(amount); super.equipToInventoryOnly(item); } else { --- 1887,1892 ---- public void equip(final Item item, final int amount) { ! if (item instanceof Stackable<?>) { ! ((Stackable<?>) item).setQuantity(amount); super.equipToInventoryOnly(item); } else { Index: PlayerRPClass.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/player/PlayerRPClass.java,v retrieving revision 1.150 retrieving revision 1.151 diff -C2 -d -r1.150 -r1.151 *** PlayerRPClass.java 7 Jun 2009 14:28:51 -0000 1.150 --- PlayerRPClass.java 29 Sep 2009 20:22:31 -0000 1.151 *************** *** 18,38 **** import marauroa.common.game.Definition.Type; - import org.apache.log4j.Logger; - /** ! * Handles the RPClass registration and updating old Player objects created by ! * an older version of Stendhal. */ public class PlayerRPClass { - - - private static Logger logger = Logger.getLogger(PlayerRPClass.class); - - - - - - /** * Generates the RPClass and specifies slots and attributes. --- 18,26 ---- import marauroa.common.game.Definition.Type; /** ! * Handles the RPClass registration. */ public class PlayerRPClass { /** * Generates the RPClass and specifies slots and attributes. *************** *** 132,143 **** } - - - - - - - - - } --- 120,122 ---- |