Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Improve reliability of order of config nodes after update #7700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 1, 2025
Merged

Improve reliability of order of config nodes after update #7700

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
94b28cd
init commit
Efnilite Mar 14, 2025
a8a98e1
remove deprecated
Efnilite Mar 14, 2025
b813e6d
fix add failing if node is added from same parent
Efnilite Mar 14, 2025
5759c75
Merge branch 'dev/patch' into patch/config-update-order
sovdeeth Mar 22, 2025
7e0603b
review comments
Efnilite Apr 1, 2025
f18d420
Merge remote-tracking branch 'origin/patch/config-update-order' into …
Efnilite Apr 1, 2025
5c5153a
Merge branch 'dev/patch' into patch/config-update-order
APickledWalrus Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
review comments
  • Loading branch information
@Efnilite
Efnilite committed Apr 1, 2025
commit 7e0603b1723d5d21bb3e8eb36672bab406e70675
6 changes: 5 additions & 1 deletion src/main/java/ch/njol/skript/config/SectionNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ public void add(final Node n) {
public void add(int index, @NotNull Node node) {
Preconditions.checkArgument(index >= 0 && index <= size(), "index out of bounds: %s", index);

if (node.getParent() == this) { // this is not ideal. too bad!
// if a node is moved within the same section, and is at the end of that section,
// the index should be at most nodes.size() - 1
// since the node is removed before being added, the size of nodes is now one smaller.
// if this check wasn't present, adding node at index could cause an IndexOutOfBoundsException
if (node.getParent() == this) {
index = Math.min(index, nodes.size() - 1);
}
node.remove();
Expand Down
1 change: 1 addition & 0 deletions src/main/java/ch/njol/skript/config/VoidNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ public int hashCode() {
// at a different position
return Objects.hash(Arrays.hashCode(getPathSteps()), comment, getIndex());
}

}