From 7966625965c57c43e4a5ce1d29a791d9a41c3eed Mon Sep 17 00:00:00 2001 From: Pahimar Date: Sat, 28 May 2016 08:23:31 -0400 Subject: [PATCH] Some extra NPE protection for people that may try to use the Blacklist Registry before EE3 gets to it's preinit phase --- .../java/com/pahimar/ee3/blacklist/BlacklistRegistry.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/pahimar/ee3/blacklist/BlacklistRegistry.java b/src/main/java/com/pahimar/ee3/blacklist/BlacklistRegistry.java index 3afdbaa5..c82fa6c1 100644 --- a/src/main/java/com/pahimar/ee3/blacklist/BlacklistRegistry.java +++ b/src/main/java/com/pahimar/ee3/blacklist/BlacklistRegistry.java @@ -178,14 +178,12 @@ public class BlacklistRegistry { public void load() { if (knowledgeBlacklistFile != null) { - LogHelper.trace(BLACKLIST_MARKER, "Loading player knowledge blacklist from {}", knowledgeBlacklistFile.getAbsolutePath()); Set knowledgeBlacklistSet = SerializationHelper.readSetFromFile(knowledgeBlacklistFile); knowledgeBlacklist.clear(); knowledgeBlacklist.addAll(knowledgeBlacklistSet.stream().filter(wrappedStack -> wrappedStack != null).collect(Collectors.toList())); } if (exchangeBlacklistFile != null) { - LogHelper.trace(BLACKLIST_MARKER, "Loading exchange blacklist from {}", exchangeBlacklistFile.getAbsolutePath()); Set exchangeBlacklistSet = SerializationHelper.readSetFromFile(exchangeBlacklistFile); exchangeBlacklist.clear(); exchangeBlacklist.addAll(exchangeBlacklistSet.stream().filter(wrappedStack -> wrappedStack != null).collect(Collectors.toList())); @@ -225,10 +223,10 @@ public class BlacklistRegistry { public void save(Blacklist blacklist) { if (shouldSave) { - if (blacklist == Blacklist.KNOWLEDGE) { + if (blacklist == Blacklist.KNOWLEDGE && knowledgeBlacklistFile != null) { 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)); } } @@ -239,7 +237,7 @@ public class BlacklistRegistry { */ public void saveAll() { - if (shouldSave) { + if (shouldSave && knowledgeBlacklistFile != null && exchangeBlacklistFile != null) { LogHelper.trace(BLACKLIST_MARKER, "Saving all blacklists to disk", exchangeBlacklistFile.getAbsolutePath()); SerializationHelper.writeJsonFile(knowledgeBlacklistFile, SerializationHelper.GSON.toJson(knowledgeBlacklist)); SerializationHelper.writeJsonFile(exchangeBlacklistFile, SerializationHelper.GSON.toJson(exchangeBlacklist));