From fbb1868c0e73735741dbe264df8d90ff91efb576 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Mon, 9 May 2022 00:04:17 +0800
Subject: [PATCH] Try to fix #256 again

---
 .../registry/registries/forge/RegistriesImpl.java         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/forge/src/main/java/dev/architectury/registry/registries/forge/RegistriesImpl.java b/forge/src/main/java/dev/architectury/registry/registries/forge/RegistriesImpl.java
index 5306d96d..493dcf9c 100644
--- a/forge/src/main/java/dev/architectury/registry/registries/forge/RegistriesImpl.java
+++ b/forge/src/main/java/dev/architectury/registry/registries/forge/RegistriesImpl.java
@@ -171,12 +171,12 @@ public class RegistriesImpl {
             if (registry == null) {
                 Registry<T> ts = (Registry<T>) Registry.REGISTRY.get(registryKey.location());
                 if (ts == null) ts = (Registry<T>) BuiltinRegistries.REGISTRY.get(registryKey.location());
-                if (ts == null) ts = (Registry<T>) RegistryProviderImpl.CUSTOM_REGS.get(registryKey);
-                if (ts == null) {
-                    throw new IllegalArgumentException("Registry " + registryKey + " does not exist!");
-                } else {
+                if (ts != null) {
                     return get(ts);
                 }
+                Registrar<?> customReg = RegistryProviderImpl.CUSTOM_REGS.get(registryKey);
+                if (customReg != null) return (Registrar<T>) customReg;
+                throw new IllegalArgumentException("Registry " + registryKey + " does not exist!");
             }
             return get(registry);
         }