Skip to content

Fix uuid fetch bug in offline server #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thomasmny merged 2 commits into from
Dec 5, 2024
Merged

Fix uuid fetch bug in offline server #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60d97e3
Fix uuid fetch bug in offline server
Lumine1909 Oct 20, 2024
b56a9a9
Use Bukkit#getOfflinePlayer instead
Lumine1909 Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion buildsystem-core/src/main/java/de/eintosti/buildsystem/listener/PlayerJoinListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ public void sendPlayerJoinMessage(PlayerJoinEvent event) {
@SuppressWarnings("deprecation")
public void onPlayerJoin(PlayerJoinEvent event) {
Player player = event.getPlayer();
UUIDFetcher.cacheUser(player.getUniqueId(), player.getName());

BuildPlayer buildPlayer = playerManager.createBuildPlayer(player);
manageHidePlayer(player, buildPlayer);
Expand Down
91 changes: 4 additions & 87 deletions buildsystem-core/src/main/java/de/eintosti/buildsystem/util/UUIDFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@
*/
package de.eintosti.buildsystem.util;

import com.google.common.base.Charsets;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.TypeAdapter;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import org.bukkit.Bukkit;
import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.IOException;
Expand All @@ -37,47 +39,14 @@
@SuppressWarnings("deprecation")
public class UUIDFetcher {

private static final String UUID_URL = "https://api.mojang.com/users/profiles/minecraft/%s";
private static final String NAME_URL = "https://api.mojang.com/user/profiles/%s/names";

private static final Map<String, UUID> UUID_CACHE = new HashMap<>();
private static final Map<UUID, String> NAME_CACHE = new HashMap<>();

/**
* Fetches the uuid which belongs to the player with the give name synchronously and returns it.
*
* @param name The name of the player whose uuid is to be fetched
* @return The uuid which belongs to the player
*/
public static UUID getUUID(String name) {
String lowerCase = name.toLowerCase(Locale.ROOT);
if (UUID_CACHE.containsKey(lowerCase)) {
return UUID_CACHE.get(lowerCase);
}

try {
HttpURLConnection connection = (HttpURLConnection) new URL(String.format(Locale.ROOT, UUID_URL, name)).openConnection();
connection.setReadTimeout(5000);

JsonObject jsonObject;
try {
// Support older versions of JSON used by Minecraft versions <1.18
jsonObject = new JsonParser().parse(new BufferedReader(new InputStreamReader(connection.getInputStream())))
.getAsJsonObject();
} catch (IllegalStateException | FileNotFoundException ignored) {
return null;
}

UUID uuid = UUIDTypeAdapter.fromString(jsonObject.get("id").getAsString());
UUID_CACHE.put(lowerCase, uuid);
NAME_CACHE.put(uuid, name);

return uuid;
} catch (Exception e) {
e.printStackTrace();
}

return null;
return Bukkit.getOfflinePlayer(name).getUniqueId();
}

/**
Expand All @@ -87,58 +56,6 @@ public static UUID getUUID(String name) {
* @return The name which belongs to the player
*/
public static String getName(UUID uuid) {
if (NAME_CACHE.containsKey(uuid)) {
return NAME_CACHE.get(uuid);
}

try {
HttpURLConnection connection = (HttpURLConnection) new URL(String.format(Locale.ROOT, NAME_URL, UUIDTypeAdapter.fromUUID(uuid))).openConnection();
connection.setReadTimeout(5000);
JsonArray nameHistory;
try {
// Support older versions of JSON used by Minecraft versions <1.18
nameHistory = new JsonParser().parse(new BufferedReader(new InputStreamReader(connection.getInputStream())))
.getAsJsonArray();
} catch (IllegalStateException ignored) {
return null;
}
JsonObject currentNameData = nameHistory.get(nameHistory.size() - 1).getAsJsonObject();

String name = currentNameData.get("name").getAsString();
UUID_CACHE.put(name, uuid);
NAME_CACHE.put(uuid, name);

return name;
} catch (Exception e) {
e.printStackTrace();
}

return null;
}

public static void cacheUser(UUID uuid, String name) {
UUID_CACHE.put(name.toLowerCase(Locale.ROOT), uuid);
NAME_CACHE.put(uuid, name);
}

public static final class UUIDTypeAdapter extends TypeAdapter<UUID> {

public static String fromUUID(final UUID value) {
return value.toString().replace("-", "");
}

public static UUID fromString(final String input) {
return UUID.fromString(input.replaceFirst("(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})", "$1-$2-$3-$4-$5"));
}

@Override
public void write(JsonWriter out, final UUID value) throws IOException {
out.value(fromUUID(value));
}

@Override
public UUID read(JsonReader in) throws IOException {
return fromString(in.nextString());
}
return Bukkit.getOfflinePlayer(uuid).getName();
}
}