Closes #3217
Closes #3226
Closes #3227
Closes #3229
Closes #3230
This commit is contained in:
NotMyFault
2021-09-06 13:47:40 +02:00
parent be38086f6c
commit 4caaead7ee
4 changed files with 20 additions and 15 deletions

View File

@ -71,7 +71,7 @@ tasks.named<ShadowJar>("shadowJar") {
relocate("net.kyori.examination", "com.plotsquared.core.configuration.examination")
relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
relocate("org.bstats", "com.plotsquared.metrics")
relocate("com.sk89q.squirrelid", "com.plotsquared.squirrelid")
relocate("org.enginehub", "com.plotsquared.squirrelid")
relocate("org.khelekore.prtree", "com.plotsquared.prtree")
relocate("com.google.inject", "com.plotsquared.google")
relocate("org.aopalliance", "com.plotsquared.core.aopalliance")
@ -93,7 +93,7 @@ tasks {
opt.links("https://papermc.io/javadocs/paper/1.17/")
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/7.2.6/")
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/7.2.6/")
opt.links("https://jd.adventure.kyori.net/api/4.8.1/")
opt.links("https://jd.adventure.kyori.net/api/4.9.0/")
opt.links("https://google.github.io/guice/api-docs/5.0.1/javadoc/")
opt.links("https://checkerframework.org/api/")
}

View File

@ -29,12 +29,12 @@ import com.google.common.util.concurrent.RateLimiter;
import com.plotsquared.core.configuration.Settings;
import com.plotsquared.core.uuid.UUIDMapping;
import com.plotsquared.core.uuid.UUIDService;
import com.sk89q.squirrelid.Profile;
import com.sk89q.squirrelid.resolver.HttpRepositoryService;
import com.sk89q.squirrelid.resolver.ProfileService;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.enginehub.squirrelid.Profile;
import org.enginehub.squirrelid.resolver.HttpRepositoryService;
import org.enginehub.squirrelid.resolver.ProfileService;
import java.io.IOException;
import java.util.ArrayList;
@ -73,7 +73,7 @@ public class SquirrelIdUUIDService implements UUIDService {
this.rateLimiter.acquire(uuids.size());
try {
try {
for (final Profile profile : this.profileService.findAllById(uuids)) {
for (final Profile profile : this.profileService.findAllByUuid(uuids)) {
results.add(new UUIDMapping(profile.getUniqueId(), profile.getName()));
}
} catch (final IllegalArgumentException illegalArgumentException) {