Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Some extra NPE protection for people that may try to use the Blacklist Registry before EE3 gets to it's preinit phase

Browse source
This commit is contained in:
Pahimar 2016-05-28 08:23:31 -04:00
parent d4ed4bbacb
commit 7966625965
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/pahimar/ee3/blacklist/BlacklistRegistry.java
View file

@ -178,14 +178,12 @@ public class BlacklistRegistry {
public void load() { public void load() {
if (knowledgeBlacklistFile != null) { if (knowledgeBlacklistFile != null) {
LogHelper.trace(BLACKLIST_MARKER, "Loading player knowledge blacklist from {}", knowledgeBlacklistFile.getAbsolutePath());
Set<WrappedStack> knowledgeBlacklistSet = SerializationHelper.readSetFromFile(knowledgeBlacklistFile); Set<WrappedStack> knowledgeBlacklistSet = SerializationHelper.readSetFromFile(knowledgeBlacklistFile);
knowledgeBlacklist.clear(); knowledgeBlacklist.clear();
knowledgeBlacklist.addAll(knowledgeBlacklistSet.stream().filter(wrappedStack -> wrappedStack != null).collect(Collectors.toList())); knowledgeBlacklist.addAll(knowledgeBlacklistSet.stream().filter(wrappedStack -> wrappedStack != null).collect(Collectors.toList()));
} }
if (exchangeBlacklistFile != null) { if (exchangeBlacklistFile != null) {
LogHelper.trace(BLACKLIST_MARKER, "Loading exchange blacklist from {}", exchangeBlacklistFile.getAbsolutePath());
Set<WrappedStack> exchangeBlacklistSet = SerializationHelper.readSetFromFile(exchangeBlacklistFile); Set<WrappedStack> exchangeBlacklistSet = SerializationHelper.readSetFromFile(exchangeBlacklistFile);
exchangeBlacklist.clear(); exchangeBlacklist.clear();
exchangeBlacklist.addAll(exchangeBlacklistSet.stream().filter(wrappedStack -> wrappedStack != null).collect(Collectors.toList())); exchangeBlacklist.addAll(exchangeBlacklistSet.stream().filter(wrappedStack -> wrappedStack != null).collect(Collectors.toList()));
@ -225,10 +223,10 @@ public class BlacklistRegistry {
public void save(Blacklist blacklist) { public void save(Blacklist blacklist) {
if (shouldSave) { if (shouldSave) {
if (blacklist == Blacklist.KNOWLEDGE) { if (blacklist == Blacklist.KNOWLEDGE && knowledgeBlacklistFile != null) {
SerializationHelper.writeJsonFile(knowledgeBlacklistFile, SerializationHelper.GSON.toJson(knowledgeBlacklist)); SerializationHelper.writeJsonFile(knowledgeBlacklistFile, SerializationHelper.GSON.toJson(knowledgeBlacklist));
} }
else if (blacklist == Blacklist.EXCHANGE) { else if (blacklist == Blacklist.EXCHANGE && exchangeBlacklistFile != null) {
SerializationHelper.writeJsonFile(exchangeBlacklistFile, SerializationHelper.GSON.toJson(exchangeBlacklist)); SerializationHelper.writeJsonFile(exchangeBlacklistFile, SerializationHelper.GSON.toJson(exchangeBlacklist));
} }
} }
@ -239,7 +237,7 @@ public class BlacklistRegistry {
*/ */
public void saveAll() { public void saveAll() {
if (shouldSave) { if (shouldSave && knowledgeBlacklistFile != null && exchangeBlacklistFile != null) {
LogHelper.trace(BLACKLIST_MARKER, "Saving all blacklists to disk", exchangeBlacklistFile.getAbsolutePath()); LogHelper.trace(BLACKLIST_MARKER, "Saving all blacklists to disk", exchangeBlacklistFile.getAbsolutePath());
SerializationHelper.writeJsonFile(knowledgeBlacklistFile, SerializationHelper.GSON.toJson(knowledgeBlacklist)); SerializationHelper.writeJsonFile(knowledgeBlacklistFile, SerializationHelper.GSON.toJson(knowledgeBlacklist));
SerializationHelper.writeJsonFile(exchangeBlacklistFile, SerializationHelper.GSON.toJson(exchangeBlacklist)); SerializationHelper.writeJsonFile(exchangeBlacklistFile, SerializationHelper.GSON.toJson(exchangeBlacklist));