Merge in fixes from chickenbones for tick related problem

and straighten out variable naming in ModLoaderModContainer
This commit is contained in:
Christian committed 2012-04-10 22:22:13 -04:00
1 parent 9fdc403396
commit 78f2e8f38a
2 files changed
+22 -18

No files matched your search

@@ -429,13 +429,14 @@ public class ModLoaderModContainer implements ModContainer
if ("required-before".equals(depparts[0]) || "before".equals(depparts[0]))
{
preDependencies.add(depparts[1]);
postDependencies.add(depparts[1]);
}
if ("required-after".equals(depparts[0]) || "after".equals(depparts[0]))
{
postDependencies.add(depparts[1]);
preDependencies.add(depparts[1]);
}
}
}
@@ -458,7 +459,7 @@ public class ModLoaderModContainer implements ModContainer
computeDependencies();
}
return preDependencies;
return postDependencies;
}
@Override
@@ -468,10 +469,10 @@ public class ModLoaderModContainer implements ModContainer
{
computeDependencies();
}
return postDependencies;
return preDependencies;
}
public String toString()
{
return modSource;