From: Hendrik <nh...@us...> - 2007-12-31 17:44:26
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/equip In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17680/src/games/stendhal/server/actions/equip Modified Files: Tag: VERSION_00_RELEASE_65_REVISION_01 SourceObject.java Log Message: log correct id of items which got split by ctrl+drag&drop (fixes #1861428) Index: SourceObject.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/equip/SourceObject.java,v retrieving revision 1.23.2.2.2.1 retrieving revision 1.23.2.2.2.2 diff -C2 -d -r1.23.2.2.2.1 -r1.23.2.2.2.2 *** SourceObject.java 27 Dec 2007 21:31:19 -0000 1.23.2.2.2.1 --- SourceObject.java 31 Dec 2007 17:44:28 -0000 1.23.2.2.2.2 *************** *** 157,166 **** String[] srcInfo = getLogInfo(); ! Entity entity = removeFromWorld(player); logger.debug("item removed"); dest.addToWorld(entity, player); logger.debug("item readded"); ! ItemLogger.equipAction(player, item, srcInfo, dest.getLogInfo()); return true; --- 157,166 ---- String[] srcInfo = getLogInfo(); ! Item entity = removeFromWorld(player); logger.debug("item removed"); dest.addToWorld(entity, player); logger.debug("item readded"); ! ItemLogger.equipAction(player, entity, srcInfo, dest.getLogInfo()); return true; *************** *** 194,198 **** * @return Entity to place somewhere else in the world */ ! public Entity removeFromWorld(Player player) { if (quantity != 0) { StackableItem newItem = ((StackableItem) item).splitOff(quantity); --- 194,198 ---- * @return Entity to place somewhere else in the world */ ! public Item removeFromWorld(Player player) { if (quantity != 0) { StackableItem newItem = ((StackableItem) item).splitOff(quantity); |