From b4a60555fcd098c8bb960e71f76e0e1e618aa050 Mon Sep 17 00:00:00 2001
From: Achilles <jeff@delmarus.com>
Date: Fri, 24 Mar 2017 17:06:33 -0500
Subject: [PATCH] Revert "Change for id str"

This reverts commit 1e8216c5c59eb0354ed2516cb177c7bfb57d1ca6.
---
 .../java/mage/client/dialog/ConnectDialog.java |  8 +-------
 Mage.Common/src/mage/remote/Connection.java    | 18 ------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
index 291f53a9c1..9132490884 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
@@ -45,7 +45,6 @@ import java.io.InputStreamReader;
 import java.io.Writer;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
-import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.net.UnknownHostException;
@@ -392,12 +391,7 @@ public class ConnectDialog extends MageDialog {
             connection.setUsername(this.txtUserName.getText().trim());
             connection.setPassword(this.txtPassword.getText().trim());
             connection.setForceDBComparison(this.chkForceUpdateDB.isSelected());
-            String allMAC = "";
-            try {
-                allMAC = connection.getMAC();
-            } catch (SocketException ex) {
-            }
-            connection.setUserIdStr(System.getProperty("user.name") + ":" + System.getProperty("os.name") + ":" + MagePreferences.getUserNames() + ":" + allMAC);
+            connection.setUserIdStr(System.getProperty("user.name") + ':' + MagePreferences.getUserNames());
             MageFrame.getPreferences().put(KEY_CONNECT_FLAG, ((CountryItemEditor) cbFlag.getEditor()).getImageItem());
             PreferencesDialog.setProxyInformation(connection);
 
diff --git a/Mage.Common/src/mage/remote/Connection.java b/Mage.Common/src/mage/remote/Connection.java
index 855404ec87..a5cac72336 100644
--- a/Mage.Common/src/mage/remote/Connection.java
+++ b/Mage.Common/src/mage/remote/Connection.java
@@ -258,24 +258,6 @@ public class Connection {
         return null;
     }
 
-    public static String getMAC() throws SocketException {
-        StringBuilder allMACs = new StringBuilder();
-        for (Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces(); interfaces.hasMoreElements();) {
-            NetworkInterface iface = interfaces.nextElement();
-            byte[] mac = iface.getHardwareAddress();
-
-            if (mac != null) {
-                StringBuilder sb = new StringBuilder();
-                for (int i = 0; i < mac.length; i++) {
-                    sb.append(String.format("%02X%s", mac[i], (i < mac.length - 1) ? "-" : ""));
-                }
-                sb.append(';');
-                allMACs.append(sb.toString());
-            }
-        }
-        return allMACs.toString();
-    }
-
     public void setUserData(UserData userData) {
         this.userData = userData;
     }