keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Lets just simply this. Fixes last commit.

Browse source
This commit is contained in:
LexManos 2016-05-14 21:40:31 -07:00
parent d5b93bf262
commit 87b0f7db99
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java
View file

@ -228,7 +228,6 @@ public class VillagerRegistry
private String name; private String name;
private int id; private int id;
private List<List<ITradeList>> trades = Lists.newArrayList(); private List<List<ITradeList>> trades = Lists.newArrayList();
private List<List<ITradeList>> imm = Lists.newArrayList();
public VillagerCareer(VillagerProfession parent, String name) public VillagerCareer(VillagerProfession parent, String name)
{ {
@ -251,20 +250,16 @@ public class VillagerRegistry
List<ITradeList> levelTrades = level <= this.trades.size() ? this.trades.get(level - 1) : null; List<ITradeList> levelTrades = level <= this.trades.size() ? this.trades.get(level - 1) : null;
if (levelTrades == null) if (levelTrades == null)
{ {
List<ITradeList> tmp = null;
while (this.trades.size() < level) while (this.trades.size() < level)
{ {
tmp = Lists.newArrayList(); levelTrades = Lists.newArrayList();
this.trades.add(tmp); this.trades.add(levelTrades);
this.imm.add(Collections.unmodifiableList(tmp));
} }
levelTrades = tmp;
} }
if (levelTrades == null) //Not sure how this could happen, but screw it if (levelTrades == null) //Not sure how this could happen, but screw it
{ {
levelTrades = Lists.newArrayList(); levelTrades = Lists.newArrayList();
this.trades.set(level - 1, levelTrades); this.trades.set(level - 1, levelTrades);
this.imm.set(level - 1, Collections.unmodifiableList(levelTrades));
} }
for (ITradeList t : trades) for (ITradeList t : trades)
levelTrades.add(t); levelTrades.add(t);
@ -274,7 +269,7 @@ public class VillagerRegistry
public List<ITradeList> getTrades(int level) public List<ITradeList> getTrades(int level)
{ {
return level >= 0 && level < this.imm.size() ? this.imm.get(level) : null; return level >= 0 && level < this.trades.size() ? Collections.unmodifiableList(this.trades.get(level)) : null;
} }
private VillagerCareer init(EntityVillager.ITradeList[][] trades) private VillagerCareer init(EntityVillager.ITradeList[][] trades)
{ {