Start mobequip refactor

This commit is contained in:
2024-03-18 10:01:29 -04:00
parent 0590ae64e7
commit 61c4cb1361
56 changed files with 198 additions and 377 deletions
+7 -7
View File
@@ -214,16 +214,16 @@ public class Account extends AbstractGameObject {
}
//dupe check
if (!item.validForInventory(origin, player, player.getCharItemManager()))
if (!item.validForInventory(origin, player, player.charItemManager))
return;
if (item.containerType == Enum.ItemContainerType.INVENTORY && player.getCharItemManager().isVaultOpen()) {
if (!player.getCharItemManager().hasRoomVault(item.template.item_wt)) {
if (item.containerType == Enum.ItemContainerType.INVENTORY && player.charItemManager.isVaultOpen()) {
if (!player.charItemManager.hasRoomVault(item.template.item_wt)) {
ClientMessagePump.forceTransferFromVaultToInventory(msg, origin, "There is no room in your vault.");
return;
}
if (player.getCharItemManager().moveItemToVault(item)) {
if (player.charItemManager.moveItemToVault(item)) {
this.vault.add(item);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
@@ -245,7 +245,7 @@ public class Account extends AbstractGameObject {
return;
}
CharacterItemManager itemManager = player.getCharItemManager();
CharacterItemManager itemManager = player.charItemManager;
if (itemManager == null) {
ClientMessagePump.forceTransferFromInventoryToVault(msg, origin, "Can't find your item manager.");
@@ -300,7 +300,7 @@ public class Account extends AbstractGameObject {
if (npc == null)
return;
CharacterItemManager itemManager = player.getCharItemManager();
CharacterItemManager itemManager = player.charItemManager;
if (itemManager == null)
return;
@@ -347,7 +347,7 @@ public class Account extends AbstractGameObject {
if (!ClientMessagePump.NPCVaultBankRangeCheck(player, origin, "vault"))
return;
CharacterItemManager itemManager = player.getCharItemManager();
CharacterItemManager itemManager = player.charItemManager;
if (itemManager == null)
return;