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(character): arriving in a world starts at the target scene or the zone's spawn

Browse Source 
A player who had been to a world before arrived at that world's saved
respawn point instead of the zone's spawn. The saved point is where a death
in that world respawns, not where arriving starts.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-10-02 15:13:56 -05:00
parent 7bd15298a4
commit 0c298efe4d
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dGame/dComponents/Physics/ControllablePhysicsComponent.cpp
View File

@@ -187,8 +187,9 @@ void ControllablePhysicsComponent::LoadFromSaveData(const tinyxml2::XMLDocument&
PlaceCharacter();
}
// If it came from another zone it starts at its respawn point, the target scene or the zone's spawn (Moon Base always:
// the saved place tends to be on the roof; a target scene too: only possible in a test map)
// If it came from another zone it starts at the target scene or the zone's spawn (Moon Base always: the saved place
// tends to be on the roof; a target scene too: only possible in a test map). A world's saved respawn point is where a
// death there respawns, not where arriving starts.
void ControllablePhysicsComponent::PlaceCharacter() {
auto* const character = m_Parent->GetCharacter();
if (!character) return;
@@ -201,10 +202,7 @@ void ControllablePhysicsComponent::PlaceCharacter() {
NiQuaternion rot = QuatUtils::IDENTITY;
auto* targetScene = Game::entityManager->GetSpawnPointEntity(targetSceneName);
if (character->HasBeenToWorld(mapID) && targetSceneName.empty()) {
pos = character->GetRespawnPoint(mapID);
rot = Game::zoneManager->GetZone()->GetSpawnRot();
} else if (targetScene != nullptr) {
if (targetScene != nullptr) {
pos = targetScene->GetPosition();
rot = targetScene->GetRotation();
} else {