From d05dbd7f9438255ed9f5a2de412d3cdb63027072 Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Tue, 2 Sep 2014 19:15:33 -0700 Subject: [PATCH] Make sure post offices are saved and loaded properly. Fixes #141 --- src/main/java/forestry/mail/PostOffice.java | 13 ++++--------- src/main/java/forestry/mail/PostRegistry.java | 2 ++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/forestry/mail/PostOffice.java b/src/main/java/forestry/mail/PostOffice.java index c75ffe303..f13220ee7 100755 --- a/src/main/java/forestry/mail/PostOffice.java +++ b/src/main/java/forestry/mail/PostOffice.java @@ -47,6 +47,10 @@ public class PostOffice extends WorldSavedData implements IPostOffice { super(s); } + public void setWorld(World world) { + refreshActiveTradeStations(world); + } + @Override public void readFromNBT(NBTTagCompound nbttagcompound) { for (int i = 0; i < collectedPostage.length; i++) { @@ -67,9 +71,6 @@ public class PostOffice extends WorldSavedData implements IPostOffice { @Override public LinkedHashMap getActiveTradeStations(World world) { - if (activeTradeStations == null) - refreshActiveTradeStations(world); - return this.activeTradeStations; } @@ -101,18 +102,12 @@ 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 d9a5c9c04..e8ee1b03e 100755 --- a/src/main/java/forestry/mail/PostRegistry.java +++ b/src/main/java/forestry/mail/PostRegistry.java @@ -151,6 +151,8 @@ public class PostRegistry implements IPostRegistry { world.setItemData(PostOffice.SAVE_NAME, office); } + office.setWorld(world); + cachedPostOffice = office; return office; }