Merge branch 'bleeding' into bleeding-1.10

Signed-off-by: Chris Sanders <[email protected]>
OwnageTechGeek · Jun 26, 2016 · ebd0737 · ebd0737
2 parents 7428985 + 1e2eed3
commit ebd0737
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/SpongeCommon b/SpongeCommon
diff --git a/src/main/java/org/spongepowered/mod/mixin/core/forge/MixinDimensionManager.java b/src/main/java/org/spongepowered/mod/mixin/core/forge/MixinDimensionManager.java
@@ -74,7 +74,7 @@ public static int[] getDimensions(DimensionType type) {
 
     @Overwrite
     public static void init() {
-        WorldManager.registerVanillaDimensions();
+        WorldManager.registerVanillaTypesAndDimensions();
     }
 
     @Overwrite