Fix type in LootEntry json name. And rename LootTable.finalize to freeze to avoid overriding Object function. Closes #2846 and #2847

This commit is contained in:
LexManos committed 2016-05-10 23:35:02 -07:00
1 parent 92800f61d3
commit 34d4b0b93f
3 files changed
+24 -21

No files matched your search

@@ -1021,6 +1021,9 @@ public class ForgeHooks
if (!custom)
ret = ForgeEventFactory.loadLootTable(name, ret);
if (ret != null)
ret.freeze();
return ret;
}
@@ -1093,7 +1096,7 @@ public class ForgeHooks
ctx.entryCount++;
if (json.has("entryName"))
return ctx.validateEntryName(JsonUtils.getString(json, "EntryName"));
return ctx.validateEntryName(JsonUtils.getString(json, "entryName"));
if (ctx.custom)
return "custom#" + json.hashCode(); //We don't care about custom ones modders shouldn't be editing them!