From fb54ea94c024bdcd53c100ab530ce83fa7a58ca5 Mon Sep 17 00:00:00 2001
From: cpw <cpw@weeksfamily.ca>
Date: Sat, 2 Jan 2016 12:05:56 -0500
Subject: [PATCH] Move substitution activation after id loading. This should
 fix the problem of null for existing object.

---
 .../fml/common/registry/PersistentRegistryManager.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java b/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
index 8bc999c8b5..3085cc0c48 100644
--- a/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
+++ b/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
@@ -321,11 +321,11 @@ public class PersistentRegistryManager
             substitutions = Sets.union(snapshotEntry.substitutions, currentRegistry.getActiveSubstitutions());
         }
         newRegistry.loadAliases(snapshotEntry.aliases);
-        newRegistry.loadSubstitutions(substitutions);
         newRegistry.loadBlocked(snapshotEntry.blocked);
         missing.put(registryName, Maps.<ResourceLocation, Integer>newLinkedHashMap());
         remaps.put(registryName, Maps.<ResourceLocation, Integer[]>newHashMap());
         newRegistry.loadIds(snapshotEntry.ids, missing.get(registryName), remaps.get(registryName), currentRegistry, registryName);
+        newRegistry.loadSubstitutions(substitutions);
         // Load current dummies AFTER the snapshot is loaded
         newRegistry.loadDummied(snapshotEntry.dummied);
     }