From 6ad65fcfcae06e3a6492baeb552ee352d57eda22 Mon Sep 17 00:00:00 2001 From: Aaron Kimbrell Date: Sun, 5 Apr 2026 03:31:36 -0500 Subject: [PATCH] Update dGame/dComponents/PropertyManagementComponent.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- dGame/dComponents/PropertyManagementComponent.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dGame/dComponents/PropertyManagementComponent.cpp b/dGame/dComponents/PropertyManagementComponent.cpp index 97a4d5bb..a66e2539 100644 --- a/dGame/dComponents/PropertyManagementComponent.cpp +++ b/dGame/dComponents/PropertyManagementComponent.cpp @@ -131,12 +131,22 @@ PropertyManagementComponent::PropertyManagementComponent(Entity* parent, const i // Load daily reputation contributions and subscribe to position updates m_CurrentDate = GeneralUtils::GetCurrentUTCDate(); LoadDailyContributions(); - Entity::OnPlayerPositionUpdate += [this](Entity* player, const PositionUpdate& update) { - OnPlayerPositionUpdateHandler(player, update); + Entity::OnPlayerPositionUpdate += [](Entity* player, const PositionUpdate& update) { + auto* propertyManagementComponent = PropertyManagementComponent::instance; + if (propertyManagementComponent == nullptr) { + return; + } + + propertyManagementComponent->OnPlayerPositionUpdateHandler(player, update); }; } } +PropertyManagementComponent::~PropertyManagementComponent() { + if (instance == this) { + instance = nullptr; + } +} LWOOBJID PropertyManagementComponent::GetOwnerId() const { return owner; }