From efec0106813bc7c35a29f019fb99ce806a4e5551 Mon Sep 17 00:00:00 2001 From: crschnick Date: Sat, 13 Dec 2025 17:42:58 +0000 Subject: [PATCH] Fix potential NPE --- .../java/io/xpipe/ext/base/identity/IdentityValue.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityValue.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityValue.java index 9ba7ca60c..cf8041e13 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityValue.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/IdentityValue.java @@ -41,9 +41,14 @@ public interface IdentityValue { } static IdentityValue ofBreakout(DataStoreEntry e) { - var cat = DataStorage.get().getStoreCategory(e); + var s = DataStorage.get(); + if (s == null) { + return null; + } + + var cat = s.getStoreCategory(e); var uuid = cat.getConfig().getDefaultIdentityStore(); - var found = DataStorage.get().getStoreEntryIfPresent(uuid); + var found = s.getStoreEntryIfPresent(uuid); if (found.isEmpty() || !(found.get().getStore() instanceof IdentityStore)) { return null; }