GabrielTofvesson/SpigotInvTweaks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement method for merging and sorting stacks to enforce atomicity

Browse Source
This commit is contained in:
Gabriel Tofvesson 2021-04-24 17:57:40 +02:00
parent 029716512a
commit c8d6a7d9f8
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dev/w1zzrd/invtweaks/command/SortCommandExecutor.java
View File

@ -93,8 +93,7 @@ public class SortCommandExecutor implements CommandExecutor {
}
// Merge all stacks and then sort them
mergeStacks(toSort);
sortStacks(toSort);
organizeStacks(toSort);
// If we're sorting a double-chest, we need to separate the combined inventories again
if (chestInventoryHolder instanceof DoubleChest) {
@ -124,8 +123,7 @@ public class SortCommandExecutor implements CommandExecutor {
final ItemStack[] stacks = player.getInventory().getContents();
final ItemStack[] sortable = Arrays.copyOfRange(stacks, 9, 36);
mergeStacks(sortable);
sortStacks(sortable);
organizeStacks(sortable);
System.arraycopy(sortable, 0, stacks, 9, sortable.length);
player.getInventory().setContents(stacks);
@ -137,9 +135,17 @@ public class SortCommandExecutor implements CommandExecutor {
*/
private static void sortInventory(final Inventory inventory) {
final ItemStack[] stacks = inventory.getContents();
organizeStacks(stacks);
inventory.setContents(stacks);
}
/**
* Perform a full stack-merge and sort (in that order) for the given array of ItemStacks
* @param stacks ItemStacks to merge and sort
*/
private static void organizeStacks(final ItemStack[] stacks) {
mergeStacks(stacks);
sortStacks(stacks);
inventory.setContents(stacks);
}
/**