mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-05-19 23:13:51 +00:00
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
This commit is contained in:
parent
88798b501d
commit
28614b922f
1373 changed files with 20086 additions and 19527 deletions
|
|
@ -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())
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue