SteamWar/CommonCore
13
0
Fork 0
Code Issues 2 Pull-Requests Projekte Releases Wiki Aktivität

Fix stuff
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details

Quellcode durchsuchen
Dieser Commit ist enthalten in:
yoyosource 2022-05-10 10:57:39 +02:00
Ursprung 128aca9697
Commit 0f03b57e43
1 geänderte Dateien mit 21 neuen und 21 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

8
src/de/steamwar/command/AbstractSWCommand.java
Datei anzeigen

@ -141,7 +141,7 @@ public abstract class AbstractSWCommand<T> {
commandSystemWarning(() -> "The method '" + method.toString() + "' is lacking the varArgs parameters of type '" + String.class.getTypeName() + "' as last Argument"); commandSystemWarning(() -> "The method '" + method.toString() + "' is lacking the varArgs parameters of type '" + String.class.getTypeName() + "' as last Argument");
return; return;
} }
commandHelpList.add(new SubCommand(this, method, anno.value(), new HashMap<>(), localGuardChecker, true, null, anno.noTabComplete())); commandHelpList.add(new SubCommand<>(this, method, anno.value(), new HashMap<>(), localGuardChecker, true, null, anno.noTabComplete()));
}); });
add(Register.class, method, i -> i > 0, true, null, (anno, parameters) -> { add(Register.class, method, i -> i > 0, true, null, (anno, parameters) -> {
@ -162,8 +162,9 @@ public abstract class AbstractSWCommand<T> {
return; return;
} }
} }
commandList.add(new SubCommand(this, method, anno.value(), localTypeMapper, localGuardChecker, false, anno.description(), anno.noTabComplete())); commandList.add(new SubCommand<>(this, method, anno.value(), localTypeMapper, localGuardChecker, false, anno.description(), anno.noTabComplete()));
}); });
}
this.commandList.sort((o1, o2) -> { this.commandList.sort((o1, o2) -> {
int compare = Integer.compare(-o1.subCommand.length, -o2.subCommand.length); int compare = Integer.compare(-o1.subCommand.length, -o2.subCommand.length);
@ -182,7 +183,6 @@ public abstract class AbstractSWCommand<T> {
o2.method.getDeclaringClass() == AbstractSWCommand.class ? 1 : 0); o2.method.getDeclaringClass() == AbstractSWCommand.class ? 1 : 0);
} }
}); });
}
initialized = true; initialized = true;
} }
@ -238,7 +238,7 @@ public abstract class AbstractSWCommand<T> {
private List<Method> methods() { private List<Method> methods() {
List<Method> methods = new ArrayList<>(); List<Method> methods = new ArrayList<>();
Class<?> current = getClass(); Class<?> current = getClass();
while (current.getSuperclass() != AbstractSWCommand.class) { while (current != AbstractSWCommand.class) {
methods.addAll(Arrays.asList(current.getDeclaredMethods())); methods.addAll(Arrays.asList(current.getDeclaredMethods()));
current = current.getSuperclass(); current = current.getSuperclass();
} }