diff options
| author | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2024-04-26 16:05:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-26 16:05:32 -0400 |
| commit | dcea63dbf483818f7723fdb189cca1e74f157691 (patch) | |
| tree | 4b3cb5fdd659c877ab5e8885c3cafafca460a360 /src/main | |
| parent | 532c55d495864f6f72abfa776a065984cec7688e (diff) | |
| download | Skyblocker-dcea63dbf483818f7723fdb189cca1e74f157691.tar.gz Skyblocker-dcea63dbf483818f7723fdb189cca1e74f157691.tar.bz2 Skyblocker-dcea63dbf483818f7723fdb189cca1e74f157691.zip | |
Fix item repo NPE (#673)
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/utils/NEURepoManager.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/main/java/de/hysky/skyblocker/utils/NEURepoManager.java b/src/main/java/de/hysky/skyblocker/utils/NEURepoManager.java index caa5c48c..cda92273 100644 --- a/src/main/java/de/hysky/skyblocker/utils/NEURepoManager.java +++ b/src/main/java/de/hysky/skyblocker/utils/NEURepoManager.java @@ -79,20 +79,20 @@ public class NEURepoManager { private static void deleteAndDownloadRepository(PlayerEntity player) { if (REPO_LOADING != null && !REPO_LOADING.isDone()) { - player.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.updateRepository.loading")), false); + sendMessage(player, Constants.PREFIX.get().append(Text.translatable("skyblocker.updateRepository.loading"))); return; } - player.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.updateRepository.start")), false); + sendMessage(player, Constants.PREFIX.get().append(Text.translatable("skyblocker.updateRepository.start"))); REPO_LOADING = CompletableFuture.runAsync(() -> { try { ItemRepository.setFilesImported(false); FileUtils.recursiveDelete(NEURepoManager.LOCAL_REPO_DIR); - player.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.updateRepository.deleted")), false); - player.sendMessage(Constants.PREFIX.get().append(Text.translatable(loadRepository().join() ? "skyblocker.updateRepository.success" : "skyblocker.updateRepository.failed")), false); + sendMessage(player, Constants.PREFIX.get().append(Text.translatable("skyblocker.updateRepository.deleted"))); + sendMessage(player, Constants.PREFIX.get().append(Text.translatable(loadRepository().join() ? "skyblocker.updateRepository.success" : "skyblocker.updateRepository.failed"))); } catch (Exception e) { LOGGER.error("[Skyblocker] Encountered unknown exception while deleting the NEU repo", e); - player.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.updateRepository.error")), false); + sendMessage(player, Constants.PREFIX.get().append(Text.translatable("skyblocker.updateRepository.error"))); } }); } @@ -105,4 +105,10 @@ public class NEURepoManager { public static CompletableFuture<Void> runAsyncAfterLoad(Runnable runnable) { return REPO_LOADING.thenRunAsync(runnable); } + + private static void sendMessage(PlayerEntity player, Text text) { + if (player != null) { + player.sendMessage(text, false); + } + } } |