aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/ServersideAttributeMap.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.World/ServersideAttributeMap.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.World/ServersideAttributeMap.cpp')
-rw-r--r--Minecraft.World/ServersideAttributeMap.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/Minecraft.World/ServersideAttributeMap.cpp b/Minecraft.World/ServersideAttributeMap.cpp
index 901854cc..c7308666 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 == NULL)
+ /*if (result == nullptr)
{
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 != NULL && rangedAttribute->getImportLegacyName() != L"")
+ if (rangedAttribute != nullptr && rangedAttribute->getImportLegacyName() != L"")
{
attributesByLegacy.insert(std::pair<wstring, AttributeInstance*>(rangedAttribute->getImportLegacyName(), instance));
}*/
@@ -69,9 +69,13 @@ unordered_set<AttributeInstance *> *ServersideAttributeMap::getSyncableAttribute
unordered_set<AttributeInstance *> *result = new unordered_set<AttributeInstance *>();
vector<AttributeInstance *> atts;
getAttributes(atts);
- for (int i = 0; i < atts.size(); i++)
+ for (size_t i = 0; i < atts.size(); i++)
{
AttributeInstance *instance = atts.at(i);
+ if (instance == nullptr)
+ {
+ continue;
+ }
if (instance->getAttribute()->isClientSyncable())
{