From a35ceeef7ff07d52e30a6f714b7398e514cd7f29 Mon Sep 17 00:00:00 2001
From: olivia <liv@olivia.cx>
Date: Thu, 10 Apr 2025 16:29:36 -0700
Subject: [PATCH 1/7] shavit-misc Add cvar UnNoclipOnRestart

Add functionality to turn off noclip on timer restart, disabled by default u.u

I used to use a separate plugin I made for this, but figured it should be in the main plugin itself as a cvar instead. Since adding as a cvar, may as well see if it is wanted upstream.
---
 addons/sourcemod/scripting/shavit-misc.sp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/sourcemod/scripting/shavit-misc.sp b/addons/sourcemod/scripting/shavit-misc.sp
index df284257f..309209d92 100644
--- a/addons/sourcemod/scripting/shavit-misc.sp
+++ b/addons/sourcemod/scripting/shavit-misc.sp
@@ -112,6 +112,7 @@ Convar gCV_StopTimerWarning = null;
 Convar gCV_WRMessages = null;
 Convar gCV_BhopSounds = null;
 Convar gCV_RestrictNoclip = null;
+Convar gCV_UnNoclipOnRestart = null;
 Convar gCV_SpecScoreboardOrder = null;
 Convar gCV_BadSetLocalAnglesFix = null;
 ConVar gCV_PauseMovement = null;
@@ -295,6 +296,7 @@ public void OnPluginStart()
 	gCV_WRMessages = new Convar("shavit_misc_wrmessages", "3", "How many \"NEW <style> WR!!!\" messages to print?\n0 - Disabled", 0,  true, 0.0, true, 100.0);
 	gCV_BhopSounds = new Convar("shavit_misc_bhopsounds", "1", "Should bhop (landing and jumping) sounds be muted?\n1 - Blocked while !hide is enabled\n2 - Always blocked", 0,  true, 1.0, true, 2.0);
 	gCV_RestrictNoclip = new Convar("shavit_misc_restrictnoclip", "0", "Should noclip be be restricted\n0 - Disabled\n1 - No vertical velocity while in noclip in start zone\n2 - No noclip in start zone", 0, true, 0.0, true, 2.0);
+	gCV_UnNoclipOnRestart = new Convar("shavit_misc_unnocliponrestart", "0", "Should noclip be disabled when a player restarts their timer while in noclip?\n0 - Disabled\n1 - Normal movement will be restored on restart", 0, true, 0.0, true, 1.0);
 	gCV_SpecScoreboardOrder = new Convar("shavit_misc_spec_scoreboard_order", "1", "Use scoreboard ordering for players when changing target when spectating.", 0, true, 0.0, true, 1.0);
 
 	if (gEV_Type != Engine_TF2)
@@ -2378,6 +2380,11 @@ public void Shavit_OnRestart(int client, int track)
 			SetEntProp(client, Prop_Send, "m_bHasHelmet", 1);
 		}
 	}
+
+	if(gCV_UnNoclipOnRestart.BoolValue)
+	{
+		SetEntityMoveType(client, MOVETYPE_WALK);
+	}
 }
 
 public Action Shavit_OnStyleCommandPre(int client, int oldstyle, int newstyle, int track)

From 4d244ca4fd9d62646a2fe4dd0734c9cda43ea7e0 Mon Sep 17 00:00:00 2001
From: olivia <liv@olivia.cx>
Date: Thu, 10 Apr 2025 18:37:13 -0700
Subject: [PATCH 2/7] shavit-misc.sp shavit_misc_unnocliponrestart 1 by default
 (^:

---
 addons/sourcemod/scripting/shavit-misc.sp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sourcemod/scripting/shavit-misc.sp b/addons/sourcemod/scripting/shavit-misc.sp
index 309209d92..460dddc44 100644
--- a/addons/sourcemod/scripting/shavit-misc.sp
+++ b/addons/sourcemod/scripting/shavit-misc.sp
@@ -296,7 +296,7 @@ public void OnPluginStart()
 	gCV_WRMessages = new Convar("shavit_misc_wrmessages", "3", "How many \"NEW <style> WR!!!\" messages to print?\n0 - Disabled", 0,  true, 0.0, true, 100.0);
 	gCV_BhopSounds = new Convar("shavit_misc_bhopsounds", "1", "Should bhop (landing and jumping) sounds be muted?\n1 - Blocked while !hide is enabled\n2 - Always blocked", 0,  true, 1.0, true, 2.0);
 	gCV_RestrictNoclip = new Convar("shavit_misc_restrictnoclip", "0", "Should noclip be be restricted\n0 - Disabled\n1 - No vertical velocity while in noclip in start zone\n2 - No noclip in start zone", 0, true, 0.0, true, 2.0);
-	gCV_UnNoclipOnRestart = new Convar("shavit_misc_unnocliponrestart", "0", "Should noclip be disabled when a player restarts their timer while in noclip?\n0 - Disabled\n1 - Normal movement will be restored on restart", 0, true, 0.0, true, 1.0);
+	gCV_UnNoclipOnRestart = new Convar("shavit_misc_unnocliponrestart", "1", "Should noclip be disabled when a player restarts their timer while in noclip?\n0 - Disabled\n1 - Normal movement will be restored on restart", 0, true, 0.0, true, 1.0);
 	gCV_SpecScoreboardOrder = new Convar("shavit_misc_spec_scoreboard_order", "1", "Use scoreboard ordering for players when changing target when spectating.", 0, true, 0.0, true, 1.0);
 
 	if (gEV_Type != Engine_TF2)

From cba72390e4c38353052ecd2be207950f488f5d0c Mon Sep 17 00:00:00 2001
From: olivia <liv@olivia.cx>
Date: Fri, 11 Apr 2025 08:40:17 -0700
Subject: [PATCH 3/7] shavit-core.sp - disable style cookie is style cookies
 are disabled

Edge case causing this change, but if style cookies are disabled on a server, no reason to save it.
---
 addons/sourcemod/scripting/shavit-core.sp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/sourcemod/scripting/shavit-core.sp b/addons/sourcemod/scripting/shavit-core.sp
index f27291e89..681743a54 100644
--- a/addons/sourcemod/scripting/shavit-core.sp
+++ b/addons/sourcemod/scripting/shavit-core.sp
@@ -1625,7 +1625,10 @@ void ChangeClientStyle(int client, int style, bool manual)
 	char sStyle[4];
 	IntToString(style, sStyle, 4);
 
-	SetClientCookie(client, gH_StyleCookie, sStyle);
+	if(gB_StyleCookies)
+	{
+		SetClientCookie(client, gH_StyleCookie, sStyle);
+	}
 }
 
 public void Player_Jump(Event event, const char[] name, bool dontBroadcast)

From 7ad950ff82a2399860c5718eff137103e33d8e34 Mon Sep 17 00:00:00 2001
From: olivia <liv@olivia.cx>
Date: Mon, 14 Apr 2025 10:52:36 -0700
Subject: [PATCH 4/7] Add FirstLogin to database and profile

---
 .../sql-create-tables-and-migrations.sp       | 21 +++++++++++++++++--
 addons/sourcemod/scripting/shavit-core.sp     |  8 +++----
 addons/sourcemod/scripting/shavit-stats.sp    | 17 +++++++++------
 .../translations/shavit-stats.phrases.txt     |  4 ++++
 4 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/addons/sourcemod/scripting/include/shavit/sql-create-tables-and-migrations.sp b/addons/sourcemod/scripting/include/shavit/sql-create-tables-and-migrations.sp
index b9e64ef8d..a9aa4157d 100644
--- a/addons/sourcemod/scripting/include/shavit/sql-create-tables-and-migrations.sp
+++ b/addons/sourcemod/scripting/include/shavit/sql-create-tables-and-migrations.sp
@@ -53,6 +53,7 @@ enum
 	Migration_DeprecateExactTimeInt,
 	Migration_AddPlayertimesAuthFK,
 	Migration_FixSQLiteMapzonesROWID,
+	Migration_AddUsersFirstLogin,
 	MIGRATIONS_END
 };
 
@@ -87,6 +88,7 @@ char gS_MigrationNames[][] = {
 	"DeprecateExactTimeInt",
 	"AddPlayertimesAuthFK",
 	"FixSQLiteMapzonesROWID",
+	"AddUsersFirstLogin",
 };
 
 static Database gH_SQL;
@@ -133,13 +135,13 @@ public void SQL_CreateTables(Database hSQL, const char[] prefix, int driver)
 	if (driver == Driver_mysql)
 	{
 		FormatEx(sQuery, sizeof(sQuery),
-			"CREATE TABLE IF NOT EXISTS `%susers` (`auth` INT NOT NULL, `name` VARCHAR(32) COLLATE 'utf8mb4_general_ci', `ip` INT, `lastlogin` INT NOT NULL DEFAULT -1, `points` FLOAT NOT NULL DEFAULT 0, `playtime` FLOAT NOT NULL DEFAULT 0, PRIMARY KEY (`auth`), INDEX `points` (`points`), INDEX `lastlogin` (`lastlogin`)) ENGINE=INNODB;",
+			"CREATE TABLE IF NOT EXISTS `%susers` (`auth` INT NOT NULL, `name` VARCHAR(32) COLLATE 'utf8mb4_general_ci', `ip` INT, `lastlogin` INT NOT NULL DEFAULT -1, `firstlogin` INT NOT NULL DEFAULT -1, `points` FLOAT NOT NULL DEFAULT 0, `playtime` FLOAT NOT NULL DEFAULT 0, PRIMARY KEY (`auth`), INDEX `points` (`points`), INDEX `lastlogin` (`lastlogin`)) ENGINE=INNODB;",
 			gS_SQLPrefix);
 	}
 	else
 	{
 		FormatEx(sQuery, sizeof(sQuery),
-			"CREATE TABLE IF NOT EXISTS `%susers` (`auth` INT NOT NULL PRIMARY KEY, `name` VARCHAR(32), `ip` INT, `lastlogin` INTEGER NOT NULL DEFAULT -1, `points` FLOAT NOT NULL DEFAULT 0, `playtime` FLOAT NOT NULL DEFAULT 0);",
+			"CREATE TABLE IF NOT EXISTS `%susers` (`auth` INT NOT NULL PRIMARY KEY, `name` VARCHAR(32), `ip` INT, `lastlogin` INTEGER NOT NULL DEFAULT -1, `firstlogin` INTEGER NOT NULL DEFAULT -1, `points` FLOAT NOT NULL DEFAULT 0, `playtime` FLOAT NOT NULL DEFAULT 0);",
 			gS_SQLPrefix);
 	}
 
@@ -369,6 +371,7 @@ void ApplyMigration(int migration)
 		case Migration_DeprecateExactTimeInt: ApplyMigration_DeprecateExactTimeInt();
 		case Migration_AddPlayertimesAuthFK: ApplyMigration_AddPlayertimesAuthFK();
 		case Migration_FixSQLiteMapzonesROWID: ApplyMigration_FixSQLiteMapzonesROWID();
+		case Migration_AddUsersFirstLogin: ApplyMigration_AddUsersFirstLogin();
 	}
 }
 
@@ -686,6 +689,20 @@ public void Trans_FixSQLiteMapzonesROWID_Error(Database db, any data, int numQue
 	LogError("Timer error! SQLiteMapzonesROWID migration transaction failed. Reason: %s", error);
 }
 
+void ApplyMigration_AddUsersFirstLogin()
+{
+	char sQuery[256];
+	FormatEx(sQuery, sizeof(sQuery), "ALTER TABLE %susers ADD `firstlogin` int(11) DEFAULT -1 NOT NULL %s;", gS_SQLPrefix, (gI_Driver == Driver_mysql) ? "AFTER `lastlogin`" : "");
+	QueryLog(gH_SQL, ApplyMigration_AddUsersFirstLogin2222222_Callback, sQuery, Migration_AddUsersFirstLogin, DBPrio_High);
+}
+
+public void ApplyMigration_AddUsersFirstLogin2222222_Callback(Database db, DBResultSet results, const char[] error, any data)
+{
+	char sQuery[256];
+	FormatEx(sQuery, sizeof(sQuery), "UPDATE %susers SET firstlogin = IF((SELECT COUNT(*) FROM %splayertimes WHERE %splayertimes.auth = %susers.auth) > 0, (SELECT MIN(`date`) FROM %splayertimes WHERE auth = %susers.auth), IF((%susers.lastlogin != 0), %susers.lastlogin, UNIX_TIMESTAMP()));", gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix);
+	QueryLog(gH_SQL, SQL_TableMigrationSingleQuery_Callback, sQuery, Migration_AddUsersFirstLogin, DBPrio_High);
+}
+
 public void SQL_TableMigrationSingleQuery_Callback(Database db, DBResultSet results, const char[] error, any data)
 {
 	InsertMigration(data);
diff --git a/addons/sourcemod/scripting/shavit-core.sp b/addons/sourcemod/scripting/shavit-core.sp
index 25fb4c013..2d74994eb 100644
--- a/addons/sourcemod/scripting/shavit-core.sp
+++ b/addons/sourcemod/scripting/shavit-core.sp
@@ -2807,14 +2807,14 @@ public void OnClientAuthorized(int client, const char[] auth)
 	if (gI_Driver == Driver_mysql)
 	{
 		FormatEx(sQuery, 512,
-			"INSERT INTO %susers (auth, name, ip, lastlogin) VALUES (%d, '%s', %d, %d) ON DUPLICATE KEY UPDATE name = '%s', ip = %d, lastlogin = %d;",
-			gS_MySQLPrefix, iSteamID, sEscapedName, iIPAddress, iTime, sEscapedName, iIPAddress, iTime);
+			"INSERT INTO %susers (auth, name, ip, lastlogin, firstlogin) VALUES (%d, '%s', %d, %d, %d) ON DUPLICATE KEY UPDATE name = '%s', ip = %d, lastlogin = %d;",
+			gS_MySQLPrefix, iSteamID, sEscapedName, iIPAddress, iTime, iTime, sEscapedName, iIPAddress, iTime);
 	}
 	else // postgresql & sqlite
 	{
 		FormatEx(sQuery, 512,
-			"INSERT INTO %susers (auth, name, ip, lastlogin) VALUES (%d, '%s', %d, %d) ON CONFLICT(auth) DO UPDATE SET name = '%s', ip = %d, lastlogin = %d;",
-			gS_MySQLPrefix, iSteamID, sEscapedName, iIPAddress, iTime, sEscapedName, iIPAddress, iTime);
+			"INSERT INTO %susers (auth, name, ip, lastlogin, firstlogin) VALUES (%d, '%s', %d, %d, %d) ON CONFLICT(auth) DO UPDATE SET name = '%s', ip = %d, lastlogin = %d;",
+			gS_MySQLPrefix, iSteamID, sEscapedName, iIPAddress, iTime, iTime, sEscapedName, iIPAddress, iTime);
 	}
 
 	QueryLog(gH_SQL, SQL_InsertUser_Callback, sQuery, GetClientSerial(client));
diff --git a/addons/sourcemod/scripting/shavit-stats.sp b/addons/sourcemod/scripting/shavit-stats.sp
index a67ef72f2..fbe101f68 100644
--- a/addons/sourcemod/scripting/shavit-stats.sp
+++ b/addons/sourcemod/scripting/shavit-stats.sp
@@ -890,7 +890,7 @@ Action OpenStatsMenu_Main(int steamid, int style, DataPack data)
 	char sQuery[2048];
 
 	FormatEx(sQuery, sizeof(sQuery),
-		"SELECT 0, points, lastlogin, ip, playtime, name FROM %susers WHERE auth = %d\n" ...
+		"SELECT 0, points, lastlogin, firstlogin, ip, playtime, name FROM %susers WHERE auth = %d\n" ...
 		"UNION ALL SELECT 1, SUM(playtime), 0, 0, 0, '' FROM %sstyleplaytime WHERE auth = %d AND style = %d\n" ...
 		"UNION ALL SELECT 2, COUNT(*), 0, 0, 0, '' FROM %susers u1\n" ...
 		"    JOIN (SELECT points FROM %susers WHERE auth = %d) u2\n" ...
@@ -960,6 +960,7 @@ public void OpenStatsMenuCallback(Database db, DBResultSet results, const char[]
 
 	float fPoints;
 	char sLastLogin[32];
+	char sFirstLogin[32];
 	char sCountry[64];
 	char sPlaytime[16];
 
@@ -989,7 +990,11 @@ public void OpenStatsMenuCallback(Database db, DBResultSet results, const char[]
 			FormatTime(sLastLogin, 32, "%Y-%m-%d %H:%M:%S", iLastLogin);
 			Format(sLastLogin, 32, "%T: %s", "LastLogin", client, (iLastLogin != -1)? sLastLogin:"N/A");
 
-			int iIPAddress = results.FetchInt(3);
+			int iFirstLogin = results.FetchInt(3);
+			FormatTime(sFirstLogin, 32, "%Y-%m-%d %H:%M:%S", iFirstLogin);
+			Format(sFirstLogin, 32, "%T: %s", "FirstLogin", client, (iFirstLogin != -1)? sFirstLogin:"N/A");
+			
+			int iIPAddress = results.FetchInt(4);
 			char sIPAddress[32];
 			IPAddressToString(iIPAddress, sIPAddress, 32);
 
@@ -998,10 +1003,10 @@ public void OpenStatsMenuCallback(Database db, DBResultSet results, const char[]
 				sCountry = "Local Area Network";
 			}
 
-			float fPlaytime = results.FetchFloat(4);
+			float fPlaytime = results.FetchFloat(5);
 			FormatSeconds(fPlaytime, sPlaytime, sizeof(sPlaytime), false, true, true);
 
-			results.FetchString(5, gS_TargetName[client], MAX_NAME_LENGTH);
+			results.FetchString(6, gS_TargetName[client], MAX_NAME_LENGTH);
 			ReplaceString(gS_TargetName[client], MAX_NAME_LENGTH, "#", "?");
 		}
 		else if (type == 1)
@@ -1056,8 +1061,8 @@ public void OpenStatsMenuCallback(Database db, DBResultSet results, const char[]
 		}
 
 		Menu menu = new Menu(MenuHandler_ProfileHandler);
-		menu.SetTitle("%s's %T. [U:1:%u]\n%T: %s\n%s\n%s\n%T: %s\n",
-			gS_TargetName[client], "Profile", client, gI_TargetSteamID[client], "Country", client, sCountry, sLastLogin,
+		menu.SetTitle("%s's %T. [U:1:%u]\n%T: %s\n%s\n%s\n%s\n%T: %s\n",
+			gS_TargetName[client], "Profile", client, gI_TargetSteamID[client], "Country", client, sCountry, sFirstLogin, sLastLogin,
 			sRankingString, "Playtime", client, sPlaytime);
 
 		int[] styles = new int[gI_Styles];
diff --git a/addons/sourcemod/translations/shavit-stats.phrases.txt b/addons/sourcemod/translations/shavit-stats.phrases.txt
index c20c0cdb7..c0c0f7496 100644
--- a/addons/sourcemod/translations/shavit-stats.phrases.txt
+++ b/addons/sourcemod/translations/shavit-stats.phrases.txt
@@ -74,6 +74,10 @@
 	{
 		"en"		"Last Login"
 	}
+	"FirstLogin"
+	{
+		"en"		"First Login"
+	}
 	"MapCompletions"
 	{
 		"en"		"Map completions"

From 8e312bc8e36248bea98f7e398ef326477a33ac04 Mon Sep 17 00:00:00 2001
From: olivia <liv@olivia.cx>
Date: Mon, 14 Apr 2025 11:20:32 -0700
Subject: [PATCH 5/7] fix FirstLogin query for sqlite

---
 .../include/shavit/sql-create-tables-and-migrations.sp          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sourcemod/scripting/include/shavit/sql-create-tables-and-migrations.sp b/addons/sourcemod/scripting/include/shavit/sql-create-tables-and-migrations.sp
index a9aa4157d..a00a44207 100644
--- a/addons/sourcemod/scripting/include/shavit/sql-create-tables-and-migrations.sp
+++ b/addons/sourcemod/scripting/include/shavit/sql-create-tables-and-migrations.sp
@@ -699,7 +699,7 @@ void ApplyMigration_AddUsersFirstLogin()
 public void ApplyMigration_AddUsersFirstLogin2222222_Callback(Database db, DBResultSet results, const char[] error, any data)
 {
 	char sQuery[256];
-	FormatEx(sQuery, sizeof(sQuery), "UPDATE %susers SET firstlogin = IF((SELECT COUNT(*) FROM %splayertimes WHERE %splayertimes.auth = %susers.auth) > 0, (SELECT MIN(`date`) FROM %splayertimes WHERE auth = %susers.auth), IF((%susers.lastlogin != 0), %susers.lastlogin, UNIX_TIMESTAMP()));", gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix);
+	FormatEx(sQuery, sizeof(sQuery), "UPDATE %susers SET firstlogin = IF((SELECT COUNT(*) FROM %splayertimes WHERE %splayertimes.auth = %susers.auth) > 0, (SELECT MIN(`date`) FROM %splayertimes WHERE auth = %susers.auth), IF((%susers.lastlogin != 0), %susers.lastlogin, %s));", gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, (gI_Driver == Driver_mysql) ? "UNIX_TIMESTAMP()" : "unixepoch('now')");
 	QueryLog(gH_SQL, SQL_TableMigrationSingleQuery_Callback, sQuery, Migration_AddUsersFirstLogin, DBPrio_High);
 }
 

From 8a92071944e9277ed7368a546fb4f350107f810e Mon Sep 17 00:00:00 2001
From: olivia <liv@olivia.cx>
Date: Mon, 14 Apr 2025 12:32:35 -0700
Subject: [PATCH 6/7] fix statsmenu query oopsie teehee :3

---
 addons/sourcemod/scripting/shavit-stats.sp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sourcemod/scripting/shavit-stats.sp b/addons/sourcemod/scripting/shavit-stats.sp
index fbe101f68..b8c622e67 100644
--- a/addons/sourcemod/scripting/shavit-stats.sp
+++ b/addons/sourcemod/scripting/shavit-stats.sp
@@ -891,8 +891,8 @@ Action OpenStatsMenu_Main(int steamid, int style, DataPack data)
 
 	FormatEx(sQuery, sizeof(sQuery),
 		"SELECT 0, points, lastlogin, firstlogin, ip, playtime, name FROM %susers WHERE auth = %d\n" ...
-		"UNION ALL SELECT 1, SUM(playtime), 0, 0, 0, '' FROM %sstyleplaytime WHERE auth = %d AND style = %d\n" ...
-		"UNION ALL SELECT 2, COUNT(*), 0, 0, 0, '' FROM %susers u1\n" ...
+		"UNION ALL SELECT 1, SUM(playtime), 0, 0, 0, 0, '' FROM %sstyleplaytime WHERE auth = %d AND style = %d\n" ...
+		"UNION ALL SELECT 2, COUNT(*), 0, 0, 0, 0, '' FROM %susers u1\n" ...
 		"    JOIN (SELECT points FROM %susers WHERE auth = %d) u2\n" ...
 		"    WHERE u1.points >= u2.points",
 		gS_MySQLPrefix, steamid,

From fc3c71f61564c6f364952bf996bd2a6ab027c7fc Mon Sep 17 00:00:00 2001
From: olivia <liv@olivia.cx>
Date: Fri, 18 Apr 2025 11:41:03 -0700
Subject: [PATCH 7/7] sql-create-tables-and-migrations.sp - fix queries for
 sqlite

---
 .../shavit/sql-create-tables-and-migrations.sp        | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/sourcemod/scripting/include/shavit/sql-create-tables-and-migrations.sp b/addons/sourcemod/scripting/include/shavit/sql-create-tables-and-migrations.sp
index a00a44207..06a99f939 100644
--- a/addons/sourcemod/scripting/include/shavit/sql-create-tables-and-migrations.sp
+++ b/addons/sourcemod/scripting/include/shavit/sql-create-tables-and-migrations.sp
@@ -692,14 +692,21 @@ public void Trans_FixSQLiteMapzonesROWID_Error(Database db, any data, int numQue
 void ApplyMigration_AddUsersFirstLogin()
 {
 	char sQuery[256];
-	FormatEx(sQuery, sizeof(sQuery), "ALTER TABLE %susers ADD `firstlogin` int(11) DEFAULT -1 NOT NULL %s;", gS_SQLPrefix, (gI_Driver == Driver_mysql) ? "AFTER `lastlogin`" : "");
+	FormatEx(sQuery, sizeof(sQuery), "ALTER TABLE %susers ADD `firstlogin` INT NOT NULL DEFAULT -1 %s;", gS_SQLPrefix, (gI_Driver == Driver_mysql) ? "AFTER `lastlogin`" : "");
 	QueryLog(gH_SQL, ApplyMigration_AddUsersFirstLogin2222222_Callback, sQuery, Migration_AddUsersFirstLogin, DBPrio_High);
 }
 
 public void ApplyMigration_AddUsersFirstLogin2222222_Callback(Database db, DBResultSet results, const char[] error, any data)
 {
 	char sQuery[256];
-	FormatEx(sQuery, sizeof(sQuery), "UPDATE %susers SET firstlogin = IF((SELECT COUNT(*) FROM %splayertimes WHERE %splayertimes.auth = %susers.auth) > 0, (SELECT MIN(`date`) FROM %splayertimes WHERE auth = %susers.auth), IF((%susers.lastlogin != 0), %susers.lastlogin, %s));", gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, (gI_Driver == Driver_mysql) ? "UNIX_TIMESTAMP()" : "unixepoch('now')");
+	if(gI_Driver == Driver_mysql)
+	{
+		FormatEx(sQuery, sizeof(sQuery), "UPDATE %susers SET firstlogin = IF((SELECT COUNT(*) FROM %splayertimes WHERE %splayertimes.auth = %susers.auth) > 0, (SELECT MIN(`date`) FROM %splayertimes WHERE auth = %susers.auth), IF((%susers.lastlogin != 0), %susers.lastlogin, UNIX_TIMESTAMP()));", gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix);
+	}
+	else
+	{
+		FormatEx(sQuery, sizeof(sQuery), "UPDATE %susers SET firstlogin = IIF((SELECT COUNT(*) FROM %splayertimes WHERE %splayertimes.auth = %susers.auth) > 0, (SELECT MIN(`date`) FROM %splayertimes WHERE auth = %susers.auth), IIF((%susers.lastlogin != 0), %susers.lastlogin, unixepoch('now')));", gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix, gS_SQLPrefix);
+	}
 	QueryLog(gH_SQL, SQL_TableMigrationSingleQuery_Callback, sQuery, Migration_AddUsersFirstLogin, DBPrio_High);
 }