(svn r18054) -Change/Fix [FS#3310]: make pause on join pause during the whole joining (including download) phase

1 files changed, 0 insertions, 9 deletions

diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index efb005935..898e471ee 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -829,11 +829,6 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_MAP_OK)
 			}
 		}
 
-		if (_settings_client.network.pause_on_join) {
-			/* Now pause the game till the client is in sync */
-			DoCommandP(0, PM_PAUSED_JOIN, 1, CMD_PAUSE);
-		}
-
 		/* also update the new client with our max values */
 		SEND_COMMAND(PACKET_SERVER_CONFIG_UPDATE)(cs);
 
@@ -1022,10 +1017,6 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_ACK)
 		/* Now he is! Unpause the game */
 		cs->status = STATUS_ACTIVE;
 
-		if (_pause_mode & PM_PAUSED_JOIN) {
-			DoCommandP(0, PM_PAUSED_JOIN, 0, CMD_PAUSE);
-		}
-
 		/* Execute script for, e.g. MOTD */
 		IConsoleCmdExec("exec scripts/on_server_connect.scr 0");
 	}