Skip to content

Commit

Permalink
Fix item repo NPE (#673)
Browse files Browse the repository at this point in the history
  • Loading branch information
AzureAaron authored Apr 26, 2024
1 parent 532c55d commit dcea63d
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions src/main/java/de/hysky/skyblocker/utils/NEURepoManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,20 @@ private static CompletableFuture<Boolean> loadRepository() {

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")));
}
});
}
Expand All @@ -105,4 +105,10 @@ private static void deleteAndDownloadRepository(PlayerEntity player) {
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);
}
}
}

0 comments on commit dcea63d

Please sign in to comment.