root/trunk/AE-go_GameServer/src/com/aionemu/gameserver/services/ExchangeService.java
| 967 | 993 | ||
|---|---|---|---|
21 | 21 | ||
22 | import com.aionemu.gameserver.model.gameobjects.Item; | 22 | import com.aionemu.gameserver.model.gameobjects.Item; |
23 | import com.aionemu.gameserver.model.gameobjects.PersistentState; | 23 | import com.aionemu.gameserver.model.gameobjects.PersistentState; |
24 | import com.aionemu.gameserver.model.gameobjects.player.Inventory; | 24 | import com.aionemu.gameserver.model.gameobjects.player.Storage; |
25 | import com.aionemu.gameserver.model.gameobjects.player.Player; | 25 | import com.aionemu.gameserver.model.gameobjects.player.Player; |
26 | import com.aionemu.gameserver.model.trade.Exchange; | 26 | import com.aionemu.gameserver.model.trade.Exchange; |
27 | import com.aionemu.gameserver.model.trade.ExchangeItem; | 27 | import com.aionemu.gameserver.model.trade.ExchangeItem; |
... | ... | ||
109 | Exchange currentExchange = getCurrentExchange(activePlayer); | 109 | Exchange currentExchange = getCurrentExchange(activePlayer); |
110 | if(currentExchange.isLocked()) | 110 | if(currentExchange.isLocked()) |
111 | return; | 111 | return; |
112 | | 112 | |
113 | //count total amount in inventory | 113 | //count total amount in inventory |
114 | int availableCount = activePlayer.getInventory().getKinahItem().getItemCount(); | 114 | int availableCount = activePlayer.getInventory().getKinahItem().getItemCount(); |
115 | //count amount that was already added to exchange | 115 | //count amount that was already added to exchange |
116 | availableCount -= currentExchange.getKinahCount(); | 116 | availableCount -= currentExchange.getKinahCount(); |
117 | | 117 | |
118 | int countToAdd = availableCount > itemCount ? itemCount : availableCount; | 118 | int countToAdd = availableCount > itemCount ? itemCount : availableCount; |
119 | 119 | ||
120 | if(countToAdd > 0) | 120 | if(countToAdd > 0) |
... | ... | ||
281 | */ | 281 | */ |
282 | private void removeItemsFromInventory(Player player, Exchange exchange) | 282 | private void removeItemsFromInventory(Player player, Exchange exchange) |
283 | { | 283 | { |
284 | Inventory inventory = player.getInventory(); | 284 | Storage inventory = player.getInventory(); |
285 | 285 | ||
286 | for(ExchangeItem exchangeItem : exchange.getItems().values()) | 286 | for(ExchangeItem exchangeItem : exchange.getItems().values()) |
287 | { | 287 | { |
Download diff