diff options
| author | qwasdrizzel <145519042+qwasdrizzel@users.noreply.github.com> | 2026-03-05 17:17:45 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-05 17:17:45 -0600 |
| commit | 0666959d312dc74903f55d1071488a90239330f1 (patch) | |
| tree | 5c6886f7ec65a7828bc6e34a469514e418bcf78b /Minecraft.World/ServersideAttributeMap.cpp | |
| parent | 9370cbc7d878df1615d8ce76bc459e8b414d0f19 (diff) | |
| parent | eed770b121aa4ce38f002db042d0137c24c6d344 (diff) | |
Merge branch 'smartcmd:main' into main
Diffstat (limited to 'Minecraft.World/ServersideAttributeMap.cpp')
| -rw-r--r-- | Minecraft.World/ServersideAttributeMap.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/ServersideAttributeMap.cpp b/Minecraft.World/ServersideAttributeMap.cpp index ec75aa22..901854cc 100644 --- a/Minecraft.World/ServersideAttributeMap.cpp +++ b/Minecraft.World/ServersideAttributeMap.cpp @@ -14,12 +14,12 @@ AttributeInstance *ServersideAttributeMap::getInstance(Attribute *attribute) AttributeInstance *ServersideAttributeMap::getInstance(eATTRIBUTE_ID id) { AttributeInstance *result = BaseAttributeMap::getInstance(id); - + // 4J: Removed legacy name // If we didn't find it, search by legacy name /*if (result == NULL) { - AUTO_VAR(it, attributesByLegacy.find(name)); + auto it = attributesByLegacy.find(name); if(it != attributesByLegacy.end()) { result = it->second; @@ -31,15 +31,15 @@ AttributeInstance *ServersideAttributeMap::getInstance(eATTRIBUTE_ID id) AttributeInstance *ServersideAttributeMap::registerAttribute(Attribute *attribute) { - AUTO_VAR(it,attributesById.find(attribute->getId())); - if (it != attributesById.end()) + auto it = attributesById.find(attribute->getId()); + if (it != attributesById.end()) { return it->second; } AttributeInstance *instance = new ModifiableAttributeInstance(this, attribute); attributesById.insert(std::pair<eATTRIBUTE_ID, AttributeInstance *>(attribute->getId(), instance)); - + // 4J: Removed legacy name // If this is a ranged attribute also add to legacy name map /*RangedAttribute *rangedAttribute = dynamic_cast<RangedAttribute*>(attribute); |
