github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3220 from spjspj/master

Browse source 
Fill in missing str
This commit is contained in:
spjspj 2017-04-23 23:48:55 +10:00 committed by GitHub
commit ab74433322
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -32,6 +32,7 @@ import java.awt.event.*;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.SocketException;
import java.util.*; import java.util.*;
import java.util.List; import java.util.List;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@ -726,6 +727,12 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
currentConnection.setPassword(password); currentConnection.setPassword(password);
currentConnection.setHost(server); currentConnection.setHost(server);
currentConnection.setPort(port); currentConnection.setPort(port);
String allMAC = "";
try {
allMAC = currentConnection.getMAC();
} catch (SocketException ex) {
}
currentConnection.setUserIdStr(System.getProperty("user.name") + ":" + System.getProperty("os.name") + ":" + MagePreferences.getUserNames() + ":" + allMAC);
currentConnection.setProxyType(proxyType); currentConnection.setProxyType(proxyType);
currentConnection.setProxyHost(proxyServer); currentConnection.setProxyHost(proxyServer);
currentConnection.setProxyPort(proxyPort); currentConnection.setProxyPort(proxyPort);