Merge branch 'master' of github.com:MassiveCraft/Factions

This commit is contained in:
Olof Larsson committed 2011-10-11 13:01:12 +02:00
commit 6ab7e10d1f
9 files changed
+985 -60

No files matched your search

@@ -138,7 +138,7 @@ public class Persist {
// LOAD BY TYPE
public <T> T load(Type typeOfT, String name)
{
return load(typeOfT, getFile(name));
return (T) load(typeOfT, getFile(name));
}
public <T> T load(Type typeOfT, File file)
@@ -148,7 +148,7 @@ public class Persist {
return null;
}
return p.gson.fromJson(content, typeOfT);
return (T) p.gson.fromJson(content, typeOfT);
}
}