Compare commits
No commits in common. "f2601f6971e965c9cdac9ccfb855a811e2089387" and "ec69120a26d84506448a671cd12177c89f06612d" have entirely different histories.
f2601f6971
...
ec69120a26
@ -4,7 +4,6 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches: ["master"]
|
branches: ["master"]
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- .gitignore
|
|
||||||
- README.md
|
- README.md
|
||||||
- LICENSE
|
- LICENSE
|
||||||
- docker-compose.yml
|
- docker-compose.yml
|
||||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -19,7 +19,6 @@ cmake-build-*/
|
|||||||
out/
|
out/
|
||||||
build/
|
build/
|
||||||
work/
|
work/
|
||||||
target/
|
|
||||||
.idea_modules/
|
.idea_modules/
|
||||||
atlassian-ide-plugin.xml
|
atlassian-ide-plugin.xml
|
||||||
com_crashlytics_export_strings.xml
|
com_crashlytics_export_strings.xml
|
||||||
|
@ -207,9 +207,6 @@ public final class JavaMinecraftServer extends MinecraftServer {
|
|||||||
private final ForgeMod[] modList;
|
private final ForgeMod[] modList;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* A forge mod for a server.
|
|
||||||
*/
|
|
||||||
@AllArgsConstructor @Getter @ToString
|
@AllArgsConstructor @Getter @ToString
|
||||||
private static class ForgeMod {
|
private static class ForgeMod {
|
||||||
/**
|
/**
|
||||||
|
@ -204,11 +204,11 @@ public final class MojangService {
|
|||||||
log.info("Requesting player with query: {}", query);
|
log.info("Requesting player with query: {}", query);
|
||||||
|
|
||||||
UUID uuid; // The player UUID to lookup
|
UUID uuid; // The player UUID to lookup
|
||||||
boolean isFullUuid = query.length() == 36; // Was a UUID provided?
|
boolean fullLength = query.length() == 36; // Was a UUID provided?
|
||||||
if (query.length() == 32 || isFullUuid) { // Parse the query as a UUID
|
if (query.length() == 32 || fullLength) { // Parse the query as a UUID
|
||||||
try {
|
try {
|
||||||
uuid = isFullUuid ? UUID.fromString(query) : UUIDUtils.addDashes(query);
|
uuid = fullLength ? UUID.fromString(query) : UUIDUtils.addDashes(query);
|
||||||
log.info("Parsed {}UUID: {} -> {}", isFullUuid ? "" : "trimmed ", query, uuid);
|
log.info("Parsed {}UUID: {} -> {}", fullLength ? "" : "trimmed ", query, uuid);
|
||||||
} catch (IllegalArgumentException ex) {
|
} catch (IllegalArgumentException ex) {
|
||||||
throw new BadRequestException("Malformed UUID provided: %s".formatted(query));
|
throw new BadRequestException("Malformed UUID provided: %s".formatted(query));
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user