From 849e30841cbffd502c6fd7e669b1d1d40164db1f Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Sun, 14 Sep 2025 18:50:19 -0500 Subject: [PATCH] junk from inventory --- src/engine/net/client/ClientMessagePump.java | 26 -------------------- src/engine/objects/CharacterItemManager.java | 26 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/engine/net/client/ClientMessagePump.java b/src/engine/net/client/ClientMessagePump.java index 56084557..3078c8a2 100644 --- a/src/engine/net/client/ClientMessagePump.java +++ b/src/engine/net/client/ClientMessagePump.java @@ -566,32 +566,6 @@ public class ClientMessagePump implements NetMsgHandler { 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); - - //test } private static void ackBankWindowOpened(AckBankWindowOpenedMsg msg, ClientConnection origin) { diff --git a/src/engine/objects/CharacterItemManager.java b/src/engine/objects/CharacterItemManager.java index b4b6fcfa..6b073635 100644 --- a/src/engine/objects/CharacterItemManager.java +++ b/src/engine/objects/CharacterItemManager.java @@ -971,6 +971,32 @@ public class CharacterItemManager { // CharacterItemManager.junkedItems.add(i); + ItemBase ib = i.getItemBase(); + + if(ib == null) + return false; + + if(ib.getUUID() == 7) // don't allow gold to junk for gold + return false; + + int value = ib.getBaseValue(); + + Item gold = this.absCharacter.charItemManager.getGoldInventory(); + int curAmt; + if (gold == null) + curAmt = 0; + else + curAmt = gold.getNumOfItems(); + + if ((curAmt + value) > MBServerStatics.PLAYER_GOLD_LIMIT) { + ChatManager.chatSystemInfo((PlayerCharacter)this.absCharacter, "This would place your inventory over " + MBServerStatics.PLAYER_GOLD_LIMIT + " gold."); + return false; + } + + this.absCharacter.charItemManager.addGoldToInventory(value, false); + + //test + calculateWeights(); if (updateInventory)