diff --git a/src/main/java/net/Indyuce/mmoitems/api/player/PlayerData.java b/src/main/java/net/Indyuce/mmoitems/api/player/PlayerData.java index 408468e8..bdb7d76a 100644 --- a/src/main/java/net/Indyuce/mmoitems/api/player/PlayerData.java +++ b/src/main/java/net/Indyuce/mmoitems/api/player/PlayerData.java @@ -449,7 +449,16 @@ public class PlayerData { @NotNull public static PlayerData get(@NotNull UUID uuid) { - return Objects.requireNonNull(data.get(uuid), "Player data not loaded"); + + // Might not be null, after all + PlayerData observedData = data.get(uuid); + if (observedData != null) { return observedData; } + + // Attempt to load + load(uuid); + + // Yes + return Objects.requireNonNull(data.get(uuid), "Could not obtain PlayerData. Please make sure the plugin initialized correctly."); } /**