Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
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 a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Minecraft.World/CombatEntry.cpp
View File

@@ -6,8 +6,8 @@
CombatEntry::CombatEntry(DamageSource *source, int time, float health, float damage, CombatTracker::eLOCATION location, float fallDistance)
{
this->source = nullptr;
if(source != nullptr)
this->source = NULL;
if(source != NULL)
{
// 4J: this might actually be a derived damage source so use copy func
this->source = source->copy();
@@ -61,7 +61,7 @@ CombatTracker::eLOCATION CombatEntry::getLocation()
wstring CombatEntry::getAttackerName()
{
return getSource()->getEntity() == nullptr ? L"" : getSource()->getEntity()->getNetworkName();
return getSource()->getEntity() == NULL ? L"" : getSource()->getEntity()->getNetworkName();
}
float CombatEntry::getFallDistance()