From d7ea9d610bfdec6ec037f4f9036ff7d7a51cb6a6 Mon Sep 17 00:00:00 2001
From: Kane York <rikingcoding@gmail.com>
Date: Wed, 20 Apr 2016 13:45:59 -0700
Subject: [PATCH] Remove feature switch for not giving server time in reply

---
 socketserver/server/commands.go | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/socketserver/server/commands.go b/socketserver/server/commands.go
index 6d868512..e65b3e0c 100644
--- a/socketserver/server/commands.go
+++ b/socketserver/server/commands.go
@@ -107,8 +107,6 @@ func callHandler(handler CommandHandler, conn *websocket.Conn, client *ClientInf
 	return handler(conn, client, cmsg)
 }
 
-var lastVersionWithoutReplyWithServerTime = VersionFromString("ffz_3.5.78")
-
 // C2SHello implements the `hello` C2S Command.
 // It calls SubscribeGlobal() and SubscribeDefaults() with the client, and fills out ClientInfo.Version and ClientInfo.ClientID.
 func C2SHello(conn *websocket.Conn, client *ClientInfo, msg ClientMessage) (rmsg ClientMessage, err error) {
@@ -130,19 +128,13 @@ func C2SHello(conn *websocket.Conn, client *ClientInfo, msg ClientMessage) (rmsg
 	SubscribeGlobal(client)
 	SubscribeDefaults(client)
 
-	if client.Version.After(&lastVersionWithoutReplyWithServerTime) {
-		jsTime := float64(time.Now().UnixNano()/1000) / 1000
-		return ClientMessage{
-			Arguments: []interface{}{
-				client.ClientID.String(),
-				jsTime,
-			},
-		}, nil
-	} else {
-		return ClientMessage{
-			Arguments: client.ClientID.String(),
-		}, nil
-	}
+	jsTime := float64(time.Now().UnixNano()/1000) / 1000
+	return ClientMessage{
+		Arguments: []interface{}{
+			client.ClientID.String(),
+			jsTime,
+		},
+	}, nil
 }
 
 func C2SPing(conn *websocket.Conn, client *ClientInfo, msg ClientMessage) (rmsg ClientMessage, err error) {