Fix-up of the Mail system

Fixed several crashes and bugs. Tested by sending mail and trading with multiple real accounts and a server.
closes #176
This commit is contained in:
mezz committed 2014-09-10 03:55:32 -07:00
1 parent 07afdf63b1
commit 36da6efa91
27 files changed
+470 -258

No files matched your search

+6 -9
View File
@@ -12,15 +12,12 @@ package forestry.mail;
import java.io.File;
import java.util.LinkedHashMap;
import java.util.UUID;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraft.world.WorldSavedData;
import com.mojang.authlib.GameProfile;
import forestry.api.mail.EnumPostage;
import forestry.api.mail.ILetter;
import forestry.api.mail.IPostOffice;
@@ -28,8 +25,8 @@ import forestry.api.mail.IPostalCarrier;
import forestry.api.mail.IPostalState;
import forestry.api.mail.IStamps;
import forestry.api.mail.ITradeStation;
import forestry.api.mail.MailAddress;
import forestry.api.mail.PostManager;
import forestry.api.mail.IMailAddress;
import forestry.core.config.ForestryItem;
public class PostOffice extends WorldSavedData implements IPostOffice {
@@ -67,15 +64,15 @@ public class PostOffice extends WorldSavedData implements IPostOffice {
}
/* TRADE STATION MANAGMENT */
private LinkedHashMap<MailAddress, ITradeStation> activeTradeStations;
private LinkedHashMap<IMailAddress, ITradeStation> activeTradeStations;
@Override
public LinkedHashMap<MailAddress, ITradeStation> getActiveTradeStations(World world) {
public LinkedHashMap<IMailAddress, ITradeStation> getActiveTradeStations(World world) {
return this.activeTradeStations;
}
private void refreshActiveTradeStations(World world) {
activeTradeStations = new LinkedHashMap<MailAddress, ITradeStation>();
activeTradeStations = new LinkedHashMap<IMailAddress, ITradeStation>();
if (world == null || world.getSaveHandler() == null)
return;
File worldSave = world.getSaveHandler().getMapFileFromName("dummy");
@@ -161,8 +158,8 @@ public class PostOffice extends WorldSavedData implements IPostOffice {
return EnumDeliveryState.NOT_MAILABLE;
IPostalState state = EnumDeliveryState.NOT_MAILABLE;
for (MailAddress address : letter.getRecipients()) {
IPostalCarrier carrier = PostManager.postRegistry.getCarrier(address.getType());
for (IMailAddress address : letter.getRecipients()) {
IPostalCarrier carrier = PostManager.postRegistry.getCarrier(address.getType().toString());
if (carrier == null)
continue;
state = carrier.deliverLetter(world, this, address, itemstack, doLodge);