From 087b7e7abfe81dd7f0fdcdea36ac9f245950df1a Mon Sep 17 00:00:00 2001
From: Loki Rautio <lokirautio@gmail.com>
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/EntityDamageSource.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'Minecraft.World/EntityDamageSource.cpp')

diff --git a/Minecraft.World/EntityDamageSource.cpp b/Minecraft.World/EntityDamageSource.cpp
index 8639156d..22237bf1 100644
--- a/Minecraft.World/EntityDamageSource.cpp
+++ b/Minecraft.World/EntityDamageSource.cpp
@@ -23,7 +23,7 @@ shared_ptr<Entity> EntityDamageSource::getEntity()
 
 shared_ptr<ChatPacket> EntityDamageSource::getDeathMessagePacket(shared_ptr<LivingEntity> player)
 {
-	shared_ptr<ItemInstance> held = (entity != nullptr) && entity->instanceof(eTYPE_LIVINGENTITY) ? dynamic_pointer_cast<LivingEntity>(entity)->getCarriedItem() : nullptr;
+	shared_ptr<ItemInstance> held = (entity != NULL) && entity->instanceof(eTYPE_LIVINGENTITY) ? dynamic_pointer_cast<LivingEntity>(entity)->getCarriedItem() : nullptr;
 	wstring additional = L"";
 
 	if (entity->instanceof(eTYPE_SERVERPLAYER))
@@ -39,19 +39,19 @@ shared_ptr<ChatPacket> EntityDamageSource::getDeathMessagePacket(shared_ptr<Livi
 		}
 	}
 
-	if ( (held != nullptr) && held->hasCustomHoverName())
+	if ( (held != NULL) && held->hasCustomHoverName())
 	{
-		return std::make_shared<ChatPacket>(player->getNetworkName(), m_msgWithItemId, entity->GetType(), additional, held->getHoverName());
+		return shared_ptr<ChatPacket>( new ChatPacket(player->getNetworkName(), m_msgWithItemId, entity->GetType(), additional, held->getHoverName() ) );
 	}
 	else
 	{
-		return std::make_shared<ChatPacket>(player->getNetworkName(), m_msgId, entity->GetType(), additional);
+		return shared_ptr<ChatPacket>( new ChatPacket(player->getNetworkName(), m_msgId, entity->GetType(), additional ) );
 	}
 }
 
 bool EntityDamageSource::scalesWithDifficulty()
 {
-	return (entity != nullptr) && entity->instanceof(eTYPE_LIVINGENTITY) && !entity->instanceof(eTYPE_PLAYER);
+	return (entity != NULL) && entity->instanceof(eTYPE_LIVINGENTITY) && !entity->instanceof(eTYPE_PLAYER);
 }
 
 // 4J: Copy function
-- 
cgit v1.2.3