Upstream
/
NoCheatPlus
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix premature non-abort. Return boolean for simplicity with traversal.

This commit is contained in:
asofold 2018-01-16 12:02:29 +01:00
parent 2b469a4613
commit 243d8dd6c8
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
NCPCore/src/main/java/fr/neatmonster/nocheatplus/components/data/checktype/CheckTypeTree.java
View File

@ -125,47 +125,51 @@ public abstract class CheckTypeTree<N extends CheckTypeTreeNode<N>> {
return nodeMap.get(checkType);
}
public void visitWithDescendants(final CheckType checkType, final Visitor<N> visitor) {
visitWithDescendants(getNode(checkType), visitor);
public boolean visitWithDescendants(final CheckType checkType, final Visitor<N> visitor) {
return visitWithDescendants(getNode(checkType), visitor);
}
public void visitWithDescendants(final N node, final Visitor<N> visitor) {
public boolean visitWithDescendants(final N node, final Visitor<N> visitor) {
if (!visitor.visit(node)) {
return;
return false;
}
visitDescendants(node, visitor);
return visitDescendants(node, visitor);
}
public void visitDescendants(final CheckType checkType, final Visitor<N> visitor) {
visitDescendants(getNode(checkType), visitor);
public boolean visitDescendants(final CheckType checkType, final Visitor<N> visitor) {
return visitDescendants(getNode(checkType), visitor);
}
public void visitDescendants(final N parentNode, final Visitor<N> visitor) {
public boolean visitDescendants(final N parentNode, final Visitor<N> visitor) {
for (final N childNode : parentNode.getChildren()) {
visitWithDescendants(childNode, visitor);
if (!visitWithDescendants(childNode, visitor)) {
return false;
}
}
return true; // Not aborted.
}
public void visitWithAncestors(final CheckType checkType, final Visitor<N> visitor) {
visitWithAncestors(getNode(checkType), visitor);
public boolean visitWithAncestors(final CheckType checkType, final Visitor<N> visitor) {
return visitWithAncestors(getNode(checkType), visitor);
}
public void visitWithAncestors(final N node, final Visitor<N> visitor) {
public boolean visitWithAncestors(final N node, final Visitor<N> visitor) {
if (!visitor.visit(node)) {
return;
return false;
}
visitAncestors(node, visitor);
return visitAncestors(node, visitor);
}
public void visitAncestors(final CheckType checkType, final Visitor<N> visitor) {
visitAncestors(getNode(checkType), visitor);
public boolean visitAncestors(final CheckType checkType, final Visitor<N> visitor) {
return visitAncestors(getNode(checkType), visitor);
}
public void visitAncestors(final N node, final Visitor<N> visitor) {
public boolean visitAncestors(final N node, final Visitor<N> visitor) {
final N parent = node.getParent();
if (parent != null) {
visitWithAncestors(parent, visitor);
return visitWithAncestors(parent, visitor);
}
return true; // Not aborted.
}
}