external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Copy IP address if possible instead of localhost

Browse Source
This commit is contained in:
drdev
2015-06-06 16:02:14 +00:00
parent fd2b7639c3
commit c876abba66
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/net/NetConnectUtil.java
View File

@@ -101,7 +101,7 @@ public class NetConnectUtil {
} }
public static void copyHostedServerUrl() { public static void copyHostedServerUrl() {
String hostname = "localhost"; String hostname = FServerManager.getInstance().getLocalAddress();
String url = hostname + ":" + ForgeProfileProperties.getServerPort(); String url = hostname + ":" + ForgeProfileProperties.getServerPort();
GuiBase.getInterface().copyToClipboard(url); GuiBase.getInterface().copyToClipboard(url);
SOptionPane.showMessageDialog("Share the following URL with anyone who wishes to join your server. It has been copied to your clipboard for convenience.\n\n" + url, "Server URL", SOptionPane.INFORMATION_ICON); SOptionPane.showMessageDialog("Share the following URL with anyone who wishes to join your server. It has been copied to your clipboard for convenience.\n\n" + url, "Server URL", SOptionPane.INFORMATION_ICON);

15
forge-gui/src/main/java/forge/net/server/FServerManager.java
View File

@@ -31,7 +31,6 @@ import io.netty.handler.logging.LogLevel;
import io.netty.handler.logging.LoggingHandler; import io.netty.handler.logging.LoggingHandler;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;
@@ -196,14 +195,18 @@ public final class FServerManager {
return null; return null;
} }
private void mapNatPort(final int port) { public String getLocalAddress() {
final String localAddress;
try { try {
localAddress = InetAddress.getLocalHost().getHostAddress(); return InetAddress.getLocalHost().getHostAddress();
} catch (final UnknownHostException e) { }
throw new RuntimeException(e); catch (final Exception e) {
e.printStackTrace();
return "localhost";
}
} }
private void mapNatPort(final int port) {
final String localAddress = getLocalAddress();
final PortMapping portMapping = new PortMapping(port, localAddress, PortMapping.Protocol.TCP, "Forge"); final PortMapping portMapping = new PortMapping(port, localAddress, PortMapping.Protocol.TCP, "Forge");
if (upnpService != null) { if (upnpService != null) {
// Safeguard shutdown call, to prevent lingering port mappings // Safeguard shutdown call, to prevent lingering port mappings