diff --git a/src/main/java/forestry/mail/PostOffice.java b/src/main/java/forestry/mail/PostOffice.java index 5e71292c0..c75ffe303 100755 --- a/src/main/java/forestry/mail/PostOffice.java +++ b/src/main/java/forestry/mail/PostOffice.java @@ -38,10 +38,13 @@ public class PostOffice extends WorldSavedData implements IPostOffice { public static final String SAVE_NAME = "ForestryMail"; private final int[] collectedPostage = new int[EnumPostage.values().length]; - // / CONSTRUCTOR - public PostOffice(World world) { + // CONSTRUCTORS + public PostOffice() { super(SAVE_NAME); - refreshActiveTradeStations(world); + } + + public PostOffice(String s) { + super(s); } @Override @@ -64,6 +67,9 @@ public class PostOffice extends WorldSavedData implements IPostOffice { @Override public LinkedHashMap getActiveTradeStations(World world) { + if (activeTradeStations == null) + refreshActiveTradeStations(world); + return this.activeTradeStations; } @@ -95,12 +101,18 @@ public class PostOffice extends WorldSavedData implements IPostOffice { @Override public void registerTradeStation(ITradeStation trade) { + if (activeTradeStations == null) + return; + if (!activeTradeStations.containsKey(trade.getAddress())) activeTradeStations.put(trade.getAddress(), trade); } @Override public void deregisterTradeStation(ITradeStation trade) { + if (activeTradeStations == null) + return; + activeTradeStations.remove(trade.getAddress()); } diff --git a/src/main/java/forestry/mail/PostRegistry.java b/src/main/java/forestry/mail/PostRegistry.java index dbd8f09d6..d9a5c9c04 100755 --- a/src/main/java/forestry/mail/PostRegistry.java +++ b/src/main/java/forestry/mail/PostRegistry.java @@ -147,7 +147,7 @@ public class PostRegistry implements IPostRegistry { // Create office if there is none yet if (office == null) { - office = new PostOffice(world); + office = new PostOffice(); world.setItemData(PostOffice.SAVE_NAME, office); }