From 2016048efc406ce8a46da8a1141592e29511b330 Mon Sep 17 00:00:00 2001 From: onixiya1337 <47077455+onixiya1337@users.noreply.github.com> Date: Sat, 30 Dec 2023 19:23:15 +0100 Subject: [PATCH] Fixed crashing (but not resources yet) --- .../jelly/farmhelperv2/feature/impl/MovRecPlayer.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/MovRecPlayer.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/MovRecPlayer.java index 14ea6655..14793040 100644 --- a/src/main/java/com/jelly/farmhelperv2/feature/impl/MovRecPlayer.java +++ b/src/main/java/com/jelly/farmhelperv2/feature/impl/MovRecPlayer.java @@ -123,6 +123,15 @@ public void playRandomRecording(String pattern) { try { List resourceFiles = getResourceFiles(); + if (resourceFiles == null) { + if (FailsafeManager.getInstance().triggeredFailsafe.isPresent()) { + LogUtils.sendError("Resource folder not found! Report this to #bug-reports!"); + } + stop(); + resetStatesAfterMacroDisabled(); + return; + } + for (String file : resourceFiles) { if (file.contains(pattern)) { matchingFiles.add(file); @@ -367,7 +376,7 @@ private static List getResourceFiles() throws IOException, URISyntaxExce URL resourceFolder = classLoader.getResource("farmhelper/movrec"); if (resourceFolder == null) { - LogUtils.sendError("Resource folder not found! Report this to #bug-reports!"); + return null; } URI uri = resourceFolder.toURI();