Merge branch '1.12.2' into 1.12.2-dev

2019-01-06 16:26:02 +00:00
parent 31673cf247 f907d50333
commit 3bdee06738
29 changed files with 1078 additions and 55 deletions
@@ -398,7 +398,7 @@ public abstract class Spell extends IForgeRegistryEntry.Impl<Spell> implements C
 	 */
 	public static Spell get(String name){
 		ResourceLocation key = new ResourceLocation(name);
-		if(key.getResourceDomain().equals("minecraft")) key = new ResourceLocation(Wizardry.MODID, name);
+		if(key.getNamespace().equals("minecraft")) key = new ResourceLocation(Wizardry.MODID, name);
 		return ((ForgeRegistry<Spell>)registry).getValue(key);
 	}