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

Start mobequip refactor

Browse Source
This commit is contained in:
MagicBot
2024-03-18 10:01:29 -04:00
parent 0590ae64e7
commit 61c4cb1361
56 changed files with 198 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/ItemProductionMsgHandler.java
+14 -14
View File
@@ -129,18 +129,18 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
if (targetItem.template.item_type.equals(ItemType.GOLD))
return;
if (!vendor.getCharItemManager().hasRoomInventory(targetItem.template.item_wt)) {
if (!vendor.charItemManager.hasRoomInventory(targetItem.template.item_wt)) {
ErrorPopupMsg.sendErrorPopup(player, 21);
return;
}
itemMan = origin.getPlayerCharacter().getCharItemManager();
itemMan = origin.getPlayerCharacter().charItemManager;
if (itemMan == null)
return;
if (vendor.getCharItemManager().getInventoryWeight() > 500) {
if (vendor.charItemManager.getInventoryWeight() > 500) {
ErrorPopupMsg.sendErrorPopup(player, 21);
return;
}
@@ -166,7 +166,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
dispatch = Dispatch.borrow(player, outMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
origin.getPlayerCharacter().getCharItemManager().updateInventory();
origin.getPlayerCharacter().charItemManager.updateInventory();
} catch (Exception e) {
Logger.error(e);
} finally {
@@ -199,7 +199,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
return;
if (!vendor.getCharItemManager().forgeContains(targetItem, vendor))
if (!vendor.charItemManager.forgeContains(targetItem, vendor))
return;
boolean worked = DbManager.ItemQueries.UPDATE_FORGE_TO_INVENTORY(targetItem);
@@ -213,7 +213,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
targetItem.containerType = Enum.ItemContainerType.INVENTORY;
targetItem.setOwner(vendor);
vendor.getCharItemManager().addItemToInventory(targetItem);
vendor.charItemManager.addItemToInventory(targetItem);
vendor.removeItemFromForge(targetItem);
@@ -269,9 +269,9 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
if (targetItem.template.item_type.equals(ItemType.GOLD))
return;
if (!vendor.getCharItemManager().doesCharOwnThisItem(targetItem.getObjectUUID()))
if (!vendor.charItemManager.doesCharOwnThisItem(targetItem.getObjectUUID()))
continue;
if (vendor.getCharItemManager().inventoryContains(targetItem) == false)
if (vendor.charItemManager.inventoryContains(targetItem) == false)
continue;
itemValue = targetItem.template.item_value;
@@ -293,7 +293,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
}
totalValue += itemValue;
long start = System.currentTimeMillis();
vendor.getCharItemManager().recycle(targetItem);
vendor.charItemManager.recycle(targetItem);
long end = System.currentTimeMillis();
long timetook = end - start;
@@ -347,7 +347,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
return;
if (!vendor.getCharItemManager().forgeContains(targetItem, vendor))
if (!vendor.charItemManager.forgeContains(targetItem, vendor))
return;
// Cannot junk items without a forge!
@@ -404,17 +404,17 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
if (targetItem.template.item_type.equals(ItemType.GOLD))
return;
if (vendor.getCharItemManager().inventoryContains(targetItem) == false)
if (vendor.charItemManager.inventoryContains(targetItem) == false)
return;
if (player.getCharItemManager().hasRoomInventory(targetItem.template.item_wt) == false)
if (player.charItemManager.hasRoomInventory(targetItem.template.item_wt) == false)
return;
player.getCharItemManager().buyFromNPC(targetItem, vendor);
player.charItemManager.buyFromNPC(targetItem, vendor);
}
player.getCharItemManager().updateInventory();
player.charItemManager.updateInventory();
// Update NPC inventory to client