From 087b7e7abfe81dd7f0fdcdea36ac9f245950df1a Mon Sep 17 00:00:00 2001 From: Loki Rautio Date: Sat, 7 Mar 2026 21:12:22 -0600 Subject: Revert "Project modernization (#630)" This code was not tested and breaks in Release builds, reverting to restore functionality of the nightly. All in-game menus do not work and generating a world crashes. This reverts commit a9be52c41a02d207233199e98898fe7483d7e817. --- Minecraft.World/IndirectEntityDamageSource.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Minecraft.World/IndirectEntityDamageSource.cpp') diff --git a/Minecraft.World/IndirectEntityDamageSource.cpp b/Minecraft.World/IndirectEntityDamageSource.cpp index a24ad1a7..c2a67af5 100644 --- a/Minecraft.World/IndirectEntityDamageSource.cpp +++ b/Minecraft.World/IndirectEntityDamageSource.cpp @@ -32,26 +32,26 @@ shared_ptr IndirectEntityDamageSource::getDeathMessagePacket(shared_ shared_ptr held = entity->instanceof(eTYPE_LIVINGENTITY) ? dynamic_pointer_cast(entity)->getCarriedItem() : nullptr; wstring additional = L""; int type; - if(owner != nullptr) + if(owner != NULL) { type = owner->GetType(); if(type == eTYPE_SERVERPLAYER) { shared_ptr sourcePlayer = dynamic_pointer_cast(owner); - if(sourcePlayer != nullptr) additional = sourcePlayer->name; + if(sourcePlayer != NULL) additional = sourcePlayer->name; } } else { type = entity->GetType(); } - if(held != nullptr && held->hasCustomHoverName() ) + if(held != NULL && held->hasCustomHoverName() ) { - return std::make_shared(player->getNetworkName(), m_msgWithItemId, type, additional, held->getHoverName()); + return shared_ptr( new ChatPacket(player->getNetworkName(), m_msgWithItemId, type, additional, held->getHoverName() ) ); } else { - return std::make_shared(player->getNetworkName(), m_msgId, type, additional); + return shared_ptr( new ChatPacket(player->getNetworkName(), m_msgId, type, additional ) ); } } -- cgit v1.2.3