Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-26 06:24:54 +02:00
Code Issues Projects Releases Wiki Activity

Use jdk method for array comparison

Browse Source
This commit is contained in:
TheMode 2021-08-01 14:00:57 +02:00
parent db9906d0ae
commit 9a74051cdb
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minestom/server/command/CommandManager.java
View File

@ -350,7 +350,7 @@ public final class CommandManager {
for (var entry : syntaxesArguments.entrySet()) {
final var parsedArguments = entry.getValue();
final int index = i + 1;
if (ArrayUtils.sameStart(arguments, parsedArguments, index)) {
if (Arrays.mismatch(arguments, 0, index, parsedArguments, 0, index) == -1) {
final Argument<?> sharedArgument = parsedArguments[i];
final var sharedSyntax = entry.getKey();
final var indexed = new IndexedArgument(sharedSyntax, sharedArgument, i);

22
src/main/java/net/minestom/server/utils/ArrayUtils.java
View File

@ -4,7 +4,6 @@ import it.unimi.dsi.fastutil.ints.IntList;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
import java.util.function.LongConsumer;
@ApiStatus.Internal
@ -53,27 +52,6 @@ public final class ArrayUtils {
return array;
}
/**
* Gets if two arrays share the same start until {@code length}.
*
* @param first the first array
* @param second the second array
* @param length the length to check (0-length)
* @param <T> the type of the arrays
* @return true if both arrays share the same start
*/
public static <T> boolean sameStart(@NotNull T[] first, @NotNull T[] second, int length) {
if (Math.min(first.length, second.length) < length) {
return false;
}
for (int i = 0; i < length; i++) {
if (!Objects.equals(first[i], second[i])) {
return false;
}
}
return true;
}
public static boolean empty(byte[] array) {
for (byte b : array) {
if (b != 0) {