MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

optimized deleting items

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-05-20 10:30:37 -05:00
parent 7745ef6949
commit 0ac7a1a7fa
1 changed files with 33 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/ClientMessagePump.java
+33 -43
View File
@@ -542,51 +542,41 @@ public class ClientMessagePump implements NetMsgHandler {
}
private static void DeleteItem(DeleteItemMsg msg, ClientConnection origin) {
CharacterItemManager itemManager = origin.getPlayerCharacter().getCharItemManager();
int uuid = msg.getUUID();
private static void deleteItem(DeleteItemMsg msg, ClientConnection origin) {
PlayerCharacter sourcePlayer = origin.getPlayerCharacter();
if (sourcePlayer == null)
if (sourcePlayer == null || !sourcePlayer.isAlive()) {
return;
if (!sourcePlayer.isAlive())
return;
Item i = Item.getFromCache(msg.getUUID());
if (i == null)
return;
if(i.getItemBaseID() == 7)
return; //cant delete gold
if (!itemManager.doesCharOwnThisItem(i.getObjectUUID()))
return;
if (!itemManager.inventoryContains(i))
return;
if(i.getItemBaseID() == 980066)
return;
if (i.canDestroy) {
int value = i.getItemBase().value;
if(i.getItemBase().isRune())
value = 500000;
if(sourcePlayer.getCharItemManager().getGoldInventory().getNumOfItems() + value > 10000000){
return;
}
if (itemManager.delete(i) == true) {
sourcePlayer.getCharItemManager().addGoldToInventory(value,false);
sourcePlayer.getCharItemManager().updateInventory();
Dispatch dispatch = Dispatch.borrow(sourcePlayer, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
}
}
CharacterItemManager itemManager = sourcePlayer.getCharItemManager();
Item item = Item.getFromCache(msg.getUUID());
if (item == null || !canDeleteItem(item, itemManager)) {
return;
}
int value = item.getItemBase().value;
if (item.getItemBase().isRune()) {
value = 500000;
}
if (sourcePlayer.getCharItemManager().getGoldInventory().getNumOfItems() + value > 10000000) {
return;
}
if (itemManager.delete(item)) {
itemManager.addGoldToInventory(value, false);
itemManager.updateInventory();
Dispatch dispatch = Dispatch.borrow(sourcePlayer, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
}
}
private static boolean canDeleteItem(Item item, CharacterItemManager itemManager) {
return item.getItemBaseID() != 7 && // Can't delete gold
item.getItemBaseID() != 980066 && // Can't delete conc pots
item.canDestroy &&
itemManager.doesCharOwnThisItem(item.getObjectUUID()) &&
itemManager.inventoryContains(item);
}
private static void ackBankWindowOpened(AckBankWindowOpenedMsg msg, ClientConnection origin) {
@@ -1750,7 +1740,7 @@ public class ClientMessagePump implements NetMsgHandler {
TransferItemFromInventoryToEquip((TransferItemFromInventoryToEquipMsg) msg, origin);
break;
case DELETEOBJECT:
DeleteItem((DeleteItemMsg) msg, origin);
deleteItem((DeleteItemMsg) msg, origin);
break;
case VIEWRESOURCES:
ViewResourcesMessage((ViewResourcesMessage) msg, origin);