Adjust

Stuyk · Apr 4, 2023 · c82c34f · c82c34f
1 parent 10fa575
commit c82c34f
Showing 1 changed file with 25 additions and 8 deletions.
diff --git a/src/core/plugins/core-inventory/server/src/view.ts b/src/core/plugins/core-inventory/server/src/view.ts
@@ -316,25 +316,42 @@ const Internal = {
  return;
  }
 
+ // Check Storage Capacity
+ const maxWeight = openStoragesWeight[player.id];
+ let itemsToCheck: Array<StoredItem>;
+
  if (info.startType === 'custom') {
- const maxWeight = openStoragesWeight[player.id];
- if (Athena.systems.inventory.weight.isWeightExceeded([complexSwap.from], maxWeight)) {
+ itemsToCheck = complexSwap.from;
+
+ if (Athena.systems.inventory.weight.isWeightExceeded([complexSwap.to])) {
  InventoryView.storage.resync(player);
  return;
  }
-
- openStorages[player.id] = complexSwap.from;
- } else {
- await Athena.document.character.set(player, info.startType, complexSwap.from);
  }
 
  if (info.endType === 'custom') {
- const maxWeight = openStoragesWeight[player.id];
- if (Athena.systems.inventory.weight.isWeightExceeded([complexSwap.to], maxWeight)) {
+ itemsToCheck = complexSwap.to;
+
+ if (Athena.systems.inventory.weight.isWeightExceeded([complexSwap.from])) {
  InventoryView.storage.resync(player);
  return;
  }
+ }
+
+ const isWeightExceeded = Athena.systems.inventory.weight.isWeightExceeded([itemsToCheck], maxWeight);
+ if (isWeightExceeded) {
+ InventoryView.storage.resync(player);
+ return;
+ }
 
+ // Assign Data
+ if (info.startType === 'custom') {
+ openStorages[player.id] = complexSwap.from;
+ } else {
+ await Athena.document.character.set(player, info.startType, complexSwap.from);
+ }
+
+ if (info.endType === 'custom') {
  openStorages[player.id] = complexSwap.to;
  } else {
  await Athena.document.character.set(player, info.endType, complexSwap.to);