Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-11-14 07:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: a launchpad sends its rockets to its own zone

Browse Source 
A zone transfer from a launchpad took the zone from the message when
the message asked for that. The client never does, so the zone is now
always the launchpad's default zone or the zone the player picked on
it. The log line no longer uses the sender named in the message.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-11-10 13:11:10 -06:00
parent 718bd78e8c
commit 66e6137a9f
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dGame/dGameMessages/ObjectMessages.cpp
View File

@@ -76,11 +76,8 @@ namespace GameMessages {
cloneId = rocketPad->GetSelectedCloneId(player->GetObjectID());
if (param2) {
mapId = rocketPad->GetDefaultZone();
} else {
mapId = param3;
}
// The launchpad decides where its rockets go: its own zone, or the one the player picked on it
mapId = rocketPad->GetDefaultZone();
if (mapId == 0) {
mapId = rocketPad->GetSelectedMapId(player->GetObjectID());
@@ -90,11 +87,11 @@ namespace GameMessages {
mapId = Game::zoneManager->GetZoneID().GetMapID(); // Fallback to sending the player back to the same zone.
}
LOG("Player %llu has requested zone transfer to (%i, %i).", sender->GetObjectID(), static_cast<int>(mapId), static_cast<int>(cloneId));
LOG("Player %llu has requested zone transfer to (%i, %i).", player->GetObjectID(), static_cast<int>(mapId), static_cast<int>(cloneId));
auto* character = player->GetCharacter();
if (mapId <= 0) {
if (mapId <= 0 || !character) {
return;
}