From 3df54d3d0f374ff057aafc94f75b067a3c72f5cc Mon Sep 17 00:00:00 2001
From: cpw <cpw@weeksfamily.ca>
Date: Sun, 22 Mar 2015 12:03:37 -0400
Subject: [PATCH] What a dumb oversight. One needs to copy the active
 substitution set to the active gamedata. Doesn't work well otherwise.

Closes #616
---
 .../fml/common/registry/FMLControlledNamespacedRegistry.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fml/src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java b/fml/src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java
index 7f013bd0a..8d2a1112e 100644
--- a/fml/src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java
+++ b/fml/src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java
@@ -95,6 +95,8 @@ public class FMLControlledNamespacedRegistry<I> extends RegistryNamespaced {
         this.minId = registry.minId;
         this.aliases.clear();
         this.aliases.putAll(registry.aliases);
+        this.activeSubstitutions.clear();
+
         underlyingIntegerMap = new ObjectIntIdentityMap();
         registryObjects.clear();
 
@@ -102,6 +104,7 @@ public class FMLControlledNamespacedRegistry<I> extends RegistryNamespaced {
         {
             addObjectRaw(registry.getId(thing), registry.getNameForObject(thing), thing);
         }
+        this.activeSubstitutions.putAll(registry.activeSubstitutions);
     }
 
     // public api