From 2f20a8254f44e8d1081dbd2a2de8c1f71b2c10a9 Mon Sep 17 00:00:00 2001
From: Mordred Admin <gogs@fake.local>
Date: Tue, 29 Aug 2017 10:42:19 +0200
Subject: [PATCH 1/2] Build fix

---
 src/servers/Server_Zone/ServerZone.h       |  3 ---
 src/servers/Server_Zone/mainGameServer.cpp | 15 +--------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/servers/Server_Zone/ServerZone.h b/src/servers/Server_Zone/ServerZone.h
index c5091123..b6878c5a 100644
--- a/src/servers/Server_Zone/ServerZone.h
+++ b/src/servers/Server_Zone/ServerZone.h
@@ -20,9 +20,6 @@ namespace Core {
 
       void run( int32_t argc, char* argv[] );
 
-      void setServerId( uint16_t serverId );
-      uint16_t getServerId() const;
-
       bool createSession( uint32_t sessionId );
       void removeSession( uint32_t sessionId );
       void removeSession( std::string playerName );
diff --git a/src/servers/Server_Zone/mainGameServer.cpp b/src/servers/Server_Zone/mainGameServer.cpp
index c6d6a6f4..e5c73995 100644
--- a/src/servers/Server_Zone/mainGameServer.cpp
+++ b/src/servers/Server_Zone/mainGameServer.cpp
@@ -7,19 +7,6 @@ Core::ServerZone g_serverZone( "config/settings_zone.xml" );
 
 int main( int32_t argc, char* argv[] )
 {
-   // i hate to do this, but we need to set this first...
-   for(auto i = 1; i < argc; ++i )
-   {
-      auto arg = boost::to_lower_copy( std::string( argv[i] ) );
-
-      // trim '-' from start of arg
-      arg = arg.erase( 0, arg.find_first_not_of( '-' ) );
-      if( arg == "sId" && argc > i + 1 )
-      {
-         g_serverZone.setServerId( std::atol( argv[i + 1] ) );
-         break;
-      }
-   }
    g_serverZone.run( argc, argv );
    return 0;
-}
\ No newline at end of file
+}

From 0b1ad75f55e2cf45f7d72511fd8fc66328fdb35a Mon Sep 17 00:00:00 2001
From: SapphireMordred <30826167+SapphireMordred@users.noreply.github.com>
Date: Tue, 29 Aug 2017 12:06:13 +0200
Subject: [PATCH 2/2] Removed serverId from config

---
 bin/config/settings_zone.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bin/config/settings_zone.xml b/bin/config/settings_zone.xml
index 8259be1d..c4093b9a 100644
--- a/bin/config/settings_zone.xml
+++ b/bin/config/settings_zone.xml
@@ -1,11 +1,9 @@
 <Settings>
 
    <General>
-      <!-- ID of this server -->
-      <ServerId>100</ServerId> 
       <!-- Port the zone server accepts game conenctions on -->
       <ListenPort>54992</ListenPort> 
-	  <!-- Ip the zone server conenctions on -->
+      <!-- Ip the zone server conenctions on -->
       <ListenIp>127.0.0.1</ListenIp>
       <!-- Path of FFXIV dat files -->
       <DataPath>C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack\\ffxiv</DataPath>
@@ -19,4 +17,4 @@
       </Mysql>
    </General>
 
-</Settings>
\ No newline at end of file
+</Settings>