13
0

Fix: Schematic Search Command
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Dieser Commit ist enthalten in:
Chaoscaot 2023-01-21 09:48:20 +01:00
Ursprung f5bb922df9
Commit 8de16e966c

Datei anzeigen

@ -303,7 +303,7 @@ public class SchematicCommand extends SWCommand {
int finalI = i; int finalI = i;
switch (current) { switch (current) {
case "-type": case "-type":
predicates.add(node -> node.getSchemtype().name().equalsIgnoreCase(query[finalI + 1])); predicates.add(node -> !node.isDir() && node.getSchemtype().name().equalsIgnoreCase(query[finalI + 1]));
break; break;
case "-item": case "-item":
predicates.add(node -> node.getItem().equalsIgnoreCase(query[finalI + 1])); predicates.add(node -> node.getItem().equalsIgnoreCase(query[finalI + 1]));
@ -320,7 +320,7 @@ public class SchematicCommand extends SWCommand {
predicates.add(node -> !node.getName().contains(query[finalI + 1])); predicates.add(node -> !node.getName().contains(query[finalI + 1]));
break; break;
case "-excludeType": case "-excludeType":
predicates.add(node -> !node.getSchemtype().name().equalsIgnoreCase(query[finalI + 1])); predicates.add(node -> !node.isDir() && !node.getSchemtype().name().equalsIgnoreCase(query[finalI + 1]));
break; break;
case "-excludeOwner": case "-excludeOwner":
SteamwarUser steamwarUser1 = SteamwarUser.get(query[finalI + 1]); SteamwarUser steamwarUser1 = SteamwarUser.get(query[finalI + 1]);
@ -340,7 +340,7 @@ public class SchematicCommand extends SWCommand {
i++; i++;
} }
List<SchematicNode> nodes = SchematicNode.getAll(user).stream().filter(node -> { List<SchematicNode> nodes = SchematicNode.getAll(SteamwarUser.get(userId)).stream().filter(node -> {
for (Predicate<SchematicNode> predicate : predicates) { for (Predicate<SchematicNode> predicate : predicates) {
if (!predicate.test(node)) { if (!predicate.test(node)) {
return false; return false;