From 84ce034ad0eeffd6e88ea7a1cae821779b620841 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Wed, 6 Jul 2022 17:16:20 +0800
Subject: Fix #970

---
 .../src/main/java/me/shedaniel/rei/mixin/forge/MixinTagLoader.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'forge/src/main/java/me')

diff --git a/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinTagLoader.java b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinTagLoader.java
index d6c164b86..66606b9bd 100644
--- a/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinTagLoader.java
+++ b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinTagLoader.java
@@ -40,10 +40,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 
 @Mixin(TagLoader.class)
 public class MixinTagLoader<T> {
@@ -65,6 +62,7 @@ public class MixinTagLoader<T> {
         if (resourceKey == null) return;
         TagNodes.TAG_DATA_MAP.put(resourceKey, new HashMap<>());
         Map<ResourceLocation, TagNodes.TagData> tagDataMap = TagNodes.TAG_DATA_MAP.get(resourceKey);
+        if (tagDataMap == null) return;
         Registry<T> registry = ((Registry<Registry<T>>) Registry.REGISTRY).get((ResourceKey<Registry<T>>) resourceKey);
         Stopwatch stopwatch = Stopwatch.createStarted();
         
-- 
cgit