mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 03:39:09 +00:00
Fix some mail glitches. Check valid addresses for writing letters
This commit is contained in:
1 parent
3d4ba15751
commit
344e842764
8 files changed
+55
-23
No files matched your search
@@ -16,6 +16,7 @@ import java.util.Map;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
@@ -163,11 +164,26 @@ public class PostRegistry implements IPostRegistry {
|
||||
return new MailAddress(gameProfile);
|
||||
}
|
||||
|
||||
public IMailAddress getValidMailAddress(World world, GameProfile gameProfile) {
|
||||
IMailAddress address = new MailAddress(gameProfile);;
|
||||
if (getPOBox(world, address) != null)
|
||||
return address;
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMailAddress getMailAddress(String traderName) {
|
||||
return new MailAddress(traderName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMailAddress getValidMailAddress(World world, String traderName) {
|
||||
IMailAddress address = new MailAddress(traderName);
|
||||
if (getTradeStation(world, address) != null)
|
||||
return address;
|
||||
return null;
|
||||
}
|
||||
|
||||
/* CARRIER */
|
||||
private final HashMap<EnumAddressee, IPostalCarrier> carriers = new HashMap<EnumAddressee, IPostalCarrier>();
|
||||
|
||||
|
||||
Reference in new issue
Block a user