aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/ServersideAttributeMap.cpp
diff options
context:
space:
mode:
authorLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
committerLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
commit087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch)
tree69454763e73ca764af4e682d3573080b13138a0e /Minecraft.World/ServersideAttributeMap.cpp
parenta9be52c41a02d207233199e98898fe7483d7e817 (diff)
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.
Diffstat (limited to 'Minecraft.World/ServersideAttributeMap.cpp')
-rw-r--r--Minecraft.World/ServersideAttributeMap.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.World/ServersideAttributeMap.cpp b/Minecraft.World/ServersideAttributeMap.cpp
index 07544e76..901854cc 100644
--- a/Minecraft.World/ServersideAttributeMap.cpp
+++ b/Minecraft.World/ServersideAttributeMap.cpp
@@ -17,7 +17,7 @@ AttributeInstance *ServersideAttributeMap::getInstance(eATTRIBUTE_ID id)
// 4J: Removed legacy name
// If we didn't find it, search by legacy name
- /*if (result == nullptr)
+ /*if (result == NULL)
{
auto it = attributesByLegacy.find(name);
if(it != attributesByLegacy.end())
@@ -43,7 +43,7 @@ AttributeInstance *ServersideAttributeMap::registerAttribute(Attribute *attribut
// 4J: Removed legacy name
// If this is a ranged attribute also add to legacy name map
/*RangedAttribute *rangedAttribute = dynamic_cast<RangedAttribute*>(attribute);
- if (rangedAttribute != nullptr && rangedAttribute->getImportLegacyName() != L"")
+ if (rangedAttribute != NULL && rangedAttribute->getImportLegacyName() != L"")
{
attributesByLegacy.insert(std::pair<wstring, AttributeInstance*>(rangedAttribute->getImportLegacyName(), instance));
}*/
@@ -69,7 +69,7 @@ unordered_set<AttributeInstance *> *ServersideAttributeMap::getSyncableAttribute
unordered_set<AttributeInstance *> *result = new unordered_set<AttributeInstance *>();
vector<AttributeInstance *> atts;
getAttributes(atts);
- for (size_t i = 0; i < atts.size(); i++)
+ for (int i = 0; i < atts.size(); i++)
{
AttributeInstance *instance = atts.at(i);