mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-17 19:05:31 +00:00
Fix #739 Trade station crashes when loaded without name set
This commit is contained in:
1 parent
f79a8b3896
commit
f0fa49f46c
8 files changed
+135
-70
No files matched your search
@@ -10,52 +10,33 @@
|
||||
******************************************************************************/
|
||||
package forestry.mail.gui;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
|
||||
import forestry.api.mail.IMailAddress;
|
||||
import forestry.api.mail.PostManager;
|
||||
import forestry.core.network.PacketId;
|
||||
import forestry.core.network.PacketString;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.gui.ContainerTile;
|
||||
import forestry.mail.gadgets.MachineTrader;
|
||||
|
||||
public class ContainerTradeName extends Container {
|
||||
public class ContainerTradeName extends ContainerTile<MachineTrader> {
|
||||
|
||||
protected final MachineTrader machine;
|
||||
|
||||
public ContainerTradeName(InventoryPlayer player, MachineTrader tile) {
|
||||
machine = tile;
|
||||
public ContainerTradeName(MachineTrader tile) {
|
||||
super(tile);
|
||||
}
|
||||
|
||||
public IMailAddress getAddress() {
|
||||
return machine.getAddress();
|
||||
}
|
||||
|
||||
public void setAddress(String addressName) {
|
||||
|
||||
if (StringUtils.isBlank(addressName)) {
|
||||
return;
|
||||
}
|
||||
|
||||
PacketString packet = new PacketString(PacketId.TRADING_ADDRESS_SET, addressName);
|
||||
Proxies.net.sendToServer(packet);
|
||||
|
||||
IMailAddress address = PostManager.postRegistry.getMailAddress(addressName);
|
||||
machine.setAddress(address);
|
||||
}
|
||||
|
||||
public void handleSetAddress(PacketString packet) {
|
||||
String addressName = packet.getString();
|
||||
IMailAddress address = PostManager.postRegistry.getMailAddress(addressName);
|
||||
machine.setAddress(address);
|
||||
return tile.getAddress();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInteractWith(EntityPlayer entityPlayer) {
|
||||
return machine.isOwner(entityPlayer);
|
||||
public void detectAndSendChanges() {
|
||||
super.detectAndSendChanges();
|
||||
|
||||
if (tile.isLinked()) {
|
||||
for (Object crafter : crafters) {
|
||||
if (crafter instanceof EntityPlayer) {
|
||||
EntityPlayer player = (EntityPlayer) crafter;
|
||||
tile.openGui(player, tile);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user