From: Hendrik B. <nh...@us...> - 2009-09-29 20:21:33
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/equip In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30962/src/games/stendhal/server/actions/equip Modified Files: DestinationObject.java Log Message: fixed compiler warnings in server actions Index: DestinationObject.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/equip/DestinationObject.java,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** DestinationObject.java 1 May 2009 17:27:52 -0000 1.45 --- DestinationObject.java 29 Sep 2009 20:21:16 -0000 1.46 *************** *** 98,101 **** --- 98,102 ---- * @return true if can be added to the world * */ + @SuppressWarnings("unchecked") public boolean preCheck(final Entity entity, final Player player) { final StendhalRPZone zone = player.getZone(); *************** *** 112,117 **** boolean isStackable = false; // is the entity stackable ! if (entity instanceof Stackable) { ! final Stackable stackEntity = (Stackable) entity; // now check if it can be stacked on top of another item final Iterator<RPObject> it = rpslot.iterator(); --- 113,118 ---- boolean isStackable = false; // is the entity stackable ! if (entity instanceof Stackable<?>) { ! final Stackable<?> stackEntity = (Stackable<?>) entity; // now check if it can be stacked on top of another item final Iterator<RPObject> it = rpslot.iterator(); *************** *** 119,125 **** final RPObject object = it.next(); ! if (object instanceof Stackable) { // found another stackable ! final Stackable other = (Stackable) object; if (other.isStackable(stackEntity)) { // other is the same type...merge them --- 120,126 ---- final RPObject object = it.next(); ! if (object instanceof Stackable<?>) { // found another stackable ! final Stackable other = (Stackable<?>) object; if (other.isStackable(stackEntity)) { // other is the same type...merge them |