|
|
@ -560,12 +560,37 @@ public class ClientMessagePump implements NetMsgHandler { |
|
|
|
if (!itemManager.inventoryContains(i)) |
|
|
|
if (!itemManager.inventoryContains(i)) |
|
|
|
return; |
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
if (i.isCanDestroy()) |
|
|
|
if (i.isCanDestroy()) { |
|
|
|
if (itemManager.delete(i) == true) { |
|
|
|
if (itemManager.delete(i)) { |
|
|
|
Dispatch dispatch = Dispatch.borrow(sourcePlayer, msg); |
|
|
|
Dispatch dispatch = Dispatch.borrow(sourcePlayer, msg); |
|
|
|
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY); |
|
|
|
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ItemBase ib = i.getItemBase(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(ib == null) |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(ib.getUUID() == 7) // don't allow gold to junk for gold
|
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int value = ib.getBaseValue(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Item gold = itemManager.getGoldInventory(); |
|
|
|
|
|
|
|
int curAmt; |
|
|
|
|
|
|
|
if (gold == null) |
|
|
|
|
|
|
|
curAmt = 0; |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
curAmt = gold.getNumOfItems(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ((curAmt + value) > MBServerStatics.PLAYER_GOLD_LIMIT) { |
|
|
|
|
|
|
|
ChatManager.chatSystemInfo(sourcePlayer, "This would place your inventory over " + MBServerStatics.PLAYER_GOLD_LIMIT + " gold."); |
|
|
|
|
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
itemManager.addGoldToInventory(value, false); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private static void ackBankWindowOpened(AckBankWindowOpenedMsg msg, ClientConnection origin) { |
|
|
|
private static void ackBankWindowOpened(AckBankWindowOpenedMsg msg, ClientConnection origin) { |
|
|
|