From be7403b0d0493bd4e7335e064254409fcc80098f Mon Sep 17 00:00:00 2001
From: ramon-bernardo <ramonbernardo.contato@gmail.com>
Date: Sun, 17 Nov 2024 15:09:56 -0300
Subject: [PATCH 1/2] Move players record to lua

---
 data/cpplinter.lua                            |  1 -
 data/globalevents/globalevents.xml            |  1 -
 data/globalevents/scripts/record.lua          |  4 --
 data/lib/core/game/lib.lua                    |  1 +
 data/lib/core/game/players_record.lua         | 11 ++++
 .../creaturescripts/player/players_record.lua | 13 +++++
 data/scripts/globalevents/players_record.lua  | 28 ++++++++++
 src/game.cpp                                  | 51 ++++++-------------
 src/game.h                                    | 10 ++--
 src/globalevent.cpp                           | 24 ---------
 src/globalevent.h                             |  2 -
 src/luascript.cpp                             |  5 +-
 src/player.cpp                                |  1 -
 13 files changed, 72 insertions(+), 80 deletions(-)
 delete mode 100644 data/globalevents/scripts/record.lua
 create mode 100644 data/lib/core/game/players_record.lua
 create mode 100644 data/scripts/creaturescripts/player/players_record.lua
 create mode 100644 data/scripts/globalevents/players_record.lua

diff --git a/data/cpplinter.lua b/data/cpplinter.lua
index 17624824de..946a6571e2 100644
--- a/data/cpplinter.lua
+++ b/data/cpplinter.lua
@@ -1048,7 +1048,6 @@ MoveEvent = {}
 ---@field interval fun(self:GlobalEvent, interval:integer):boolean
 ---@field onStartup fun():boolean
 ---@field onShutdown fun():boolean
----@field onRecord fun(current:integer, old:integer):boolean
 ---@field onThink fun(interval:integer):boolean
 ---@field onTime fun(interval:integer):boolean
 ---@operator call(string):GlobalEvent
diff --git a/data/globalevents/globalevents.xml b/data/globalevents/globalevents.xml
index 58df782580..27ff48924e 100644
--- a/data/globalevents/globalevents.xml
+++ b/data/globalevents/globalevents.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <globalevents>
 	<globalevent type="startup" name="ServerStartup" script="startup.lua" />
-	<globalevent type="record" name="PlayerRecord" script="record.lua" />
 	<globalevent name="Server Save" time="09:55:00" script="server_save.lua" />
 	<!--
 	<globalevent name="timer_example" time="12:00:00" script="my_script.lua" />
diff --git a/data/globalevents/scripts/record.lua b/data/globalevents/scripts/record.lua
deleted file mode 100644
index e3ef607e79..0000000000
--- a/data/globalevents/scripts/record.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-function onRecord(current, old)
-	addEvent(Game.broadcastMessage, 150, "New record: " .. current .. " players are logged in.", MESSAGE_STATUS_DEFAULT)
-	return true
-end
diff --git a/data/lib/core/game/lib.lua b/data/lib/core/game/lib.lua
index 45220c805c..93f104a386 100644
--- a/data/lib/core/game/lib.lua
+++ b/data/lib/core/game/lib.lua
@@ -1,5 +1,6 @@
 dofile('data/lib/core/game/account_storage.lua')
 dofile('data/lib/core/game/global_storage.lua')
+dofile('data/lib/core/game/players_record.lua')
 dofile('data/lib/core/game/quest.lua')
 dofile('data/lib/core/game/world_light.lua')
 dofile('data/lib/core/game/world_time.lua')
diff --git a/data/lib/core/game/players_record.lua b/data/lib/core/game/players_record.lua
new file mode 100644
index 0000000000..1a47cb6513
--- /dev/null
+++ b/data/lib/core/game/players_record.lua
@@ -0,0 +1,11 @@
+do
+	local playersRecord = 0
+
+	function Game.getPlayersRecord()
+		return playersRecord
+	end
+
+	function Game.setPlayersRecord(value)
+		playersRecord = value
+	end
+end
diff --git a/data/scripts/creaturescripts/player/players_record.lua b/data/scripts/creaturescripts/player/players_record.lua
new file mode 100644
index 0000000000..5565ffe203
--- /dev/null
+++ b/data/scripts/creaturescripts/player/players_record.lua
@@ -0,0 +1,13 @@
+local event = CreatureEvent("PlayersRecord")
+
+function event.onLogin(player)
+	local players = #Game.getPlayers()
+	local record = Game.getPlayersRecord()
+	if players > record then
+		Game.setPlayersRecord(players)
+		addEvent(Game.broadcastMessage, 150, "New record: " .. players .. " players are logged in.", MESSAGE_STATUS_DEFAULT)
+	end
+	return true
+end
+
+event:register()
diff --git a/data/scripts/globalevents/players_record.lua b/data/scripts/globalevents/players_record.lua
new file mode 100644
index 0000000000..c11db18d57
--- /dev/null
+++ b/data/scripts/globalevents/players_record.lua
@@ -0,0 +1,28 @@
+do
+	-- Load players record
+	local event = GlobalEvent("LoadPlayersRecord")
+
+	function event.onStartup()
+		local resultId = db.storeQuery("SELECT `value` FROM `server_config` WHERE `config` = 'players_record'")
+		if resultId then
+			Game.setPlayersRecord(result.getNumber(resultId, "value"))
+		else
+			db.query("INSERT INTO `server_config` (`config`, `value`) VALUES ('players_record', '0')")
+		end
+		return true
+	end
+
+	event:register()
+end
+
+do
+	-- Save players record
+	local event = GlobalEvent("SavePlayersRecord")
+
+	function event.onShutdown()
+		db.query("UPDATE `server_config` SET `value` = '" .. Game.getPlayersRecord() .. "' WHERE `config` = 'players_record'")
+		return true
+	end
+	
+	event:register()
+end
diff --git a/src/game.cpp b/src/game.cpp
index 41ae78ddf3..a79cacfa55 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -47,8 +47,10 @@ extern MoveEvents* g_moveEvents;
 extern Weapons* g_weapons;
 extern Scripts* g_scripts;
 
-Game::Game()
+Game::Game() : scriptInterface("Game Interface")
 {
+	scriptInterface.initState();
+
 	offlineTrainingWindow.defaultEnterButton = 0;
 	offlineTrainingWindow.defaultEscapeButton = 1;
 	offlineTrainingWindow.choices.emplace_back("Sword Fighting and Shielding", SKILL_SWORD);
@@ -93,8 +95,6 @@ void Game::setGameState(GameState_t newState)
 
 			mounts.loadFromXml();
 
-			loadPlayersRecord();
-
 			g_globalEvents->startup();
 			break;
 		}
@@ -770,6 +770,18 @@ void Game::playerMoveCreature(Player* player, Creature* movingCreature, const Po
 	}
 }
 
+uint32_t Game::getPlayersRecord()
+{
+	lua_State* L = scriptInterface.getLuaState();
+	lua_getglobal(L, "Game");
+	lua_getfield(L, -1, "getPlayersRecord");
+	lua_call(L, 0, 1);
+
+	uint32_t playersRecord = lua_tointeger(L, -1);
+	lua_pop(L, 1);
+	return playersRecord;
+}
+
 ReturnValue Game::internalMoveCreature(Creature* creature, Direction direction, uint32_t flags /*= 0*/)
 {
 	creature->setLastPosition(creature->getPosition());
@@ -4894,39 +4906,6 @@ void Game::updatePlayerShield(Player* player)
 	}
 }
 
-void Game::checkPlayersRecord()
-{
-	const size_t playersOnline = getPlayersOnline();
-	if (playersOnline > playersRecord) {
-		uint32_t previousRecord = playersRecord;
-		playersRecord = playersOnline;
-
-		for (auto& it : g_globalEvents->getEventMap(GLOBALEVENT_RECORD)) {
-			it.second.executeRecord(playersRecord, previousRecord);
-		}
-		updatePlayersRecord();
-	}
-}
-
-void Game::updatePlayersRecord() const
-{
-	Database& db = Database::getInstance();
-	db.executeQuery(
-	    fmt::format("UPDATE `server_config` SET `value` = '{:d}' WHERE `config` = 'players_record'", playersRecord));
-}
-
-void Game::loadPlayersRecord()
-{
-	Database& db = Database::getInstance();
-
-	DBResult_ptr result = db.storeQuery("SELECT `value` FROM `server_config` WHERE `config` = 'players_record'");
-	if (result) {
-		playersRecord = result->getNumber<uint32_t>("value");
-	} else {
-		db.executeQuery("INSERT INTO `server_config` (`config`, `value`) VALUES ('players_record', '0')");
-	}
-}
-
 void Game::playerInviteToParty(uint32_t playerId, uint32_t invitedId)
 {
 	if (playerId == invitedId) {
diff --git a/src/game.h b/src/game.h
index 40881a29a1..e6700dfc9e 100644
--- a/src/game.h
+++ b/src/game.h
@@ -208,7 +208,7 @@ class Game
 	size_t getPlayersOnline() const { return players.size(); }
 	size_t getMonstersOnline() const { return monsters.size(); }
 	size_t getNpcsOnline() const { return npcs.size(); }
-	uint32_t getPlayersRecord() const { return playersRecord; }
+	uint32_t getPlayersRecord();
 
 	ReturnValue internalMoveCreature(Creature* creature, Direction direction, uint32_t flags = 0);
 	ReturnValue internalMoveCreature(Creature& creature, Tile& toTile, uint32_t flags = 0);
@@ -290,9 +290,6 @@ class Game
 	bool internalCreatureSay(Creature* creature, SpeakClasses type, const std::string& text, bool ghostMode,
 	                         SpectatorVec* spectatorsPtr = nullptr, const Position* pos = nullptr, bool echo = false);
 
-	void loadPlayersRecord();
-	void checkPlayersRecord();
-
 	void sendGuildMotd(uint32_t playerId);
 	void kickPlayer(uint32_t playerId, bool displayEffect);
 	void playerDebugAssert(uint32_t playerId, const std::string& assertLine, const std::string& date,
@@ -502,6 +499,8 @@ class Game
 	void checkDecay();
 	void internalDecayItem(Item* item);
 
+	LuaScriptInterface scriptInterface;
+
 	std::unordered_map<uint32_t, Player*> players;
 	std::unordered_map<std::string, Player*> mappedPlayerNames;
 	std::unordered_map<uint32_t, Player*> mappedPlayerGuids;
@@ -534,9 +533,6 @@ class Game
 	WorldType_t worldType = WORLD_TYPE_PVP;
 
 	ServiceManager* serviceManager = nullptr;
-
-	void updatePlayersRecord() const;
-	uint32_t playersRecord = 0;
 };
 
 #endif // FS_GAME_H
diff --git a/src/globalevent.cpp b/src/globalevent.cpp
index 85b80afbc3..923850b816 100644
--- a/src/globalevent.cpp
+++ b/src/globalevent.cpp
@@ -208,7 +208,6 @@ GlobalEventMap GlobalEvents::getEventMap(GlobalEvent_t type)
 			return timerMap;
 		case GLOBALEVENT_STARTUP:
 		case GLOBALEVENT_SHUTDOWN:
-		case GLOBALEVENT_RECORD:
 		case GLOBALEVENT_SAVE: {
 			GlobalEventMap retMap;
 			for (const auto& it : serverMap) {
@@ -288,8 +287,6 @@ bool GlobalEvent::configureEvent(const pugi::xml_node& node)
 			eventType = GLOBALEVENT_STARTUP;
 		} else if (caseInsensitiveEqual(value, "shutdown")) {
 			eventType = GLOBALEVENT_SHUTDOWN;
-		} else if (caseInsensitiveEqual(value, "record")) {
-			eventType = GLOBALEVENT_RECORD;
 		} else if (caseInsensitiveEqual(value, "save")) {
 			eventType = GLOBALEVENT_SAVE;
 		} else {
@@ -315,8 +312,6 @@ std::string_view GlobalEvent::getScriptEventName() const
 			return "onStartup";
 		case GLOBALEVENT_SHUTDOWN:
 			return "onShutdown";
-		case GLOBALEVENT_RECORD:
-			return "onRecord";
 		case GLOBALEVENT_SAVE:
 			return "onSave";
 		case GLOBALEVENT_TIMER:
@@ -326,25 +321,6 @@ std::string_view GlobalEvent::getScriptEventName() const
 	}
 }
 
-bool GlobalEvent::executeRecord(uint32_t current, uint32_t old)
-{
-	// onRecord(current, old)
-	if (!tfs::lua::reserveScriptEnv()) {
-		std::cout << "[Error - GlobalEvent::executeRecord] Call stack overflow" << std::endl;
-		return false;
-	}
-
-	ScriptEnvironment* env = tfs::lua::getScriptEnv();
-	env->setScriptId(scriptId, scriptInterface);
-
-	lua_State* L = scriptInterface->getLuaState();
-	scriptInterface->pushFunction(scriptId);
-
-	lua_pushnumber(L, current);
-	lua_pushnumber(L, old);
-	return scriptInterface->callFunction(2);
-}
-
 bool GlobalEvent::executeEvent() const
 {
 	if (!tfs::lua::reserveScriptEnv()) {
diff --git a/src/globalevent.h b/src/globalevent.h
index e1ef779d22..def5d094f2 100644
--- a/src/globalevent.h
+++ b/src/globalevent.h
@@ -18,7 +18,6 @@ enum GlobalEvent_t
 
 	GLOBALEVENT_STARTUP,
 	GLOBALEVENT_SHUTDOWN,
-	GLOBALEVENT_RECORD,
 	GLOBALEVENT_SAVE,
 };
 
@@ -66,7 +65,6 @@ class GlobalEvent final : public Event
 
 	bool configureEvent(const pugi::xml_node& node) override;
 
-	bool executeRecord(uint32_t current, uint32_t old);
 	bool executeEvent() const;
 
 	GlobalEvent_t getEventType() const { return eventType; }
diff --git a/src/luascript.cpp b/src/luascript.cpp
index 269a2699f0..b5720ff4b7 100644
--- a/src/luascript.cpp
+++ b/src/luascript.cpp
@@ -3535,7 +3535,6 @@ void LuaScriptInterface::registerFunctions()
 	registerMethod(L, "GlobalEvent", "onTime", LuaScriptInterface::luaGlobalEventOnCallback);
 	registerMethod(L, "GlobalEvent", "onStartup", LuaScriptInterface::luaGlobalEventOnCallback);
 	registerMethod(L, "GlobalEvent", "onShutdown", LuaScriptInterface::luaGlobalEventOnCallback);
-	registerMethod(L, "GlobalEvent", "onRecord", LuaScriptInterface::luaGlobalEventOnCallback);
 	registerMethod(L, "GlobalEvent", "onSave", LuaScriptInterface::luaGlobalEventOnCallback);
 
 	// Weapon
@@ -18166,8 +18165,6 @@ int LuaScriptInterface::luaGlobalEventType(lua_State* L)
 			global->setEventType(GLOBALEVENT_STARTUP);
 		} else if (tmpStr == "shutdown") {
 			global->setEventType(GLOBALEVENT_SHUTDOWN);
-		} else if (tmpStr == "record") {
-			global->setEventType(GLOBALEVENT_RECORD);
 		} else if (tmpStr == "timer") {
 			global->setEventType(GLOBALEVENT_TIMER);
 		} else if (tmpStr == "save") {
@@ -18210,7 +18207,7 @@ int LuaScriptInterface::luaGlobalEventRegister(lua_State* L)
 
 int LuaScriptInterface::luaGlobalEventOnCallback(lua_State* L)
 {
-	// globalevent:onThink / record / etc. (callback)
+	// globalevent:onThink / etc. (callback)
 	GlobalEvent* globalevent = tfs::lua::getUserdata<GlobalEvent>(L, 1);
 	if (globalevent) {
 		if (!globalevent->loadCallback()) {
diff --git a/src/player.cpp b/src/player.cpp
index 23fb219cf1..4168eae8ae 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1165,7 +1165,6 @@ void Player::onCreatureAppear(Creature* creature, bool isLogin)
 			}
 		}
 
-		g_game.checkPlayersRecord();
 		IOLoginData::updateOnlineStatus(guid, true);
 	}
 }

From 16abcc7cdbe7412cbbb260878a55fb608ad33840 Mon Sep 17 00:00:00 2001
From: ramon-bernardo <ramonbernardo.contato@gmail.com>
Date: Sun, 17 Nov 2024 15:16:55 -0300
Subject: [PATCH 2/2] Save record

---
 data/lib/core/game/players_record.lua        | 4 ++++
 data/scripts/globalevents/players_record.lua | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/data/lib/core/game/players_record.lua b/data/lib/core/game/players_record.lua
index 1a47cb6513..0b019c0f64 100644
--- a/data/lib/core/game/players_record.lua
+++ b/data/lib/core/game/players_record.lua
@@ -8,4 +8,8 @@ do
 	function Game.setPlayersRecord(value)
 		playersRecord = value
 	end
+
+	function Game.savePlayersRecord()
+		db.query("UPDATE `server_config` SET `value` = '" .. Game.getPlayersRecord() .. "' WHERE `config` = 'players_record'")
+	end
 end
diff --git a/data/scripts/globalevents/players_record.lua b/data/scripts/globalevents/players_record.lua
index c11db18d57..5bb48fbfe2 100644
--- a/data/scripts/globalevents/players_record.lua
+++ b/data/scripts/globalevents/players_record.lua
@@ -19,8 +19,8 @@ do
 	-- Save players record
 	local event = GlobalEvent("SavePlayersRecord")
 
-	function event.onShutdown()
-		db.query("UPDATE `server_config` SET `value` = '" .. Game.getPlayersRecord() .. "' WHERE `config` = 'players_record'")
+	function event.onSave()
+		Game.savePlayersRecord()
 		return true
 	end