fix bug and update documentation

DarkflameUniverse · Dec 14, 2024 · 91d61aa · 91d61aa
1 parent c4630c4
commit 91d61aa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/dGame/dUtilities/SlashCommandHandler.cpp b/dGame/dUtilities/SlashCommandHandler.cpp
@@ -1057,9 +1057,9 @@ void SlashCommandHandler::Startup() {
 	RegisterCommand(InstanceInfoCommand);
 
 	Command ServerUptimeCommand{
-		.help = "Display the time the current server has been active",
-		.info = "Display the time the current server has been active",
-		.aliases = { "serveruptime", "uptime" },
+		.help = "Display the time the current world server has been active",
+		.info = "Display the time the current world server has been active",
+		.aliases = { "uptime" },
 		.handle = GMZeroCommands::ServerUptime,
 		.requiredLevel = eGameMasterLevel::CIVILIAN
 	};

diff --git a/dScripts/02_server/Map/AG/NpcAgCourseStarter.cpp b/dScripts/02_server/Map/AG/NpcAgCourseStarter.cpp
@@ -16,9 +16,10 @@ void NpcAgCourseStarter::OnUse(Entity* self, Entity* user) {
 	if (!scriptedActivityComponent) return;
 
 	const auto selfId = self->GetObjectID();
+	const auto userId = user->GetObjectID();
 	const auto userSysAddr = user->GetSystemAddress();
 
-	if (scriptedActivityComponent->GetActivityPlayerData(user->GetObjectID()) != nullptr) {
+	if (scriptedActivityComponent->GetActivityPlayerData(userId) != nullptr) {
 		GameMessages::SendNotifyClientObject(selfId, u"exit", 0, 0, LWOOBJID_EMPTY, "", userSysAddr);
 	} else {
 		GameMessages::SendNotifyClientObject(selfId, u"start", 0, 0, LWOOBJID_EMPTY, "", userSysAddr);
@@ -44,7 +45,7 @@ void NpcAgCourseStarter::OnMessageBoxResponse(Entity* self, Entity* sender, int3
 		GameMessages::SendNotifyClientObject(selfId, u"start_timer", 0, 0, LWOOBJID_EMPTY, "", senderSysAddr);
 		GameMessages::SendActivityStart(selfId, senderSysAddr);
 
-		auto* const data = scriptedActivityComponent->AddActivityPlayerData(selfId);
+		auto* const data = scriptedActivityComponent->AddActivityPlayerData(senderId);
 		if (data->values[1] != 0) return;
 
 		const auto raceStartTime = Game::server->GetUptime() + std::chrono::seconds(4); // Offset for starting timer

diff --git a/docs/Commands.md b/docs/Commands.md
@@ -45,6 +45,7 @@
 |setannmsg|`/setannmsg <title>`|Sets the message of an announcement.|8|
 |setanntitle|`/setanntitle <title>`|Sets the title of an announcement.|8|
 |shutdownuniverse|`/shutdownuniverse`|Sends a shutdown message to the master server. This will send an announcement to all players that the universe will shut down in 10 minutes.|9|
+|uptime|`/uptime`|Displays the time the current world server has been active.|10|
 
 ## Development Commands