From 4c3938c0f9df9c2fa15508016cbdbbdf4703acf2 Mon Sep 17 00:00:00 2001
From: Nicholas Ignoffo <speedynutty68@gmail.com>
Date: Fri, 30 Dec 2016 17:12:38 -0800
Subject: [PATCH] Change meteor config NPE with EnderCore to a useful error
 message

(cherry picked from commit 09007c5)
---
 .../WayofTime/bloodmagic/meteor/MeteorConfigHandler.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java
index 487df85f..dbe77473 100644
--- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java
@@ -1,5 +1,6 @@
 package WayofTime.bloodmagic.meteor;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.ConfigHandler;
 import WayofTime.bloodmagic.gson.Serializers;
 import com.google.common.collect.Lists;
@@ -30,6 +31,11 @@ public class MeteorConfigHandler
 
     public static void handleMeteors(boolean checkNewVersion)
     {
+        if (meteorDir == null) {
+            BloodMagic.instance.getLogger().error("Attempted to handle meteor config but the folder has not been initialized. Was this run too early?");
+            return;
+        }
+
         // Clear the meteors so that reloading in-game can be done
         MeteorRegistry.meteorMap.clear();
         List<Pair<String, Meteor>> defaultMeteors = getDefaultMeteors();