From: MadMetzger <mad...@us...> - 2009-07-30 17:26:24
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/trade In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv806/src/games/stendhal/server/trade Modified Files: Shop.java Log Message: remove earnings from zone Index: Shop.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/trade/Shop.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Shop.java 30 Jul 2009 17:01:20 -0000 1.11 --- Shop.java 30 Jul 2009 17:26:06 -0000 1.12 *************** *** 9,12 **** --- 9,13 ---- import java.util.HashMap; import java.util.HashSet; + import java.util.Iterator; import java.util.LinkedList; import java.util.List; *************** *** 75,82 **** --- 76,90 ---- item.setQuantity(this.sumUpEarningsForPlayer(earner)); earner.equipToInventoryOnly(item); + this.removeAllEarningsFromZone(earnings.get(earner.getName())); earnings.remove(earner.getName()); } } + private void removeAllEarningsFromZone(Set<Earning> set) { + for(Earning earning:set) { + this.zone.remove(earning); + } + } + private int sumUpEarningsForPlayer(final Player earner) { Set<Earning> earningsForPlayer = earnings.get(earner.getName()); |