Core/Auras: Minor optimization for Unit object creation with msvc (not allocating a list end sentinel node for all of the 500 lists stored in Unit for each aura type)

2 files changed, 3 insertions, 2 deletions

diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp
index 7f456fdef22..1121ae323ea 100644
--- a/src/server/scripts/Commands/cs_list.cpp
+++ b/src/server/scripts/Commands/cs_list.cpp
@@ -489,7 +489,7 @@ public:
                 if (!sizeLogged)
                 {
                     sizeLogged = true;
-                    handler->PSendSysMessage(LANG_COMMAND_TARGET_LISTAURATYPE, std::to_string(auraList.size()).c_str(), i);
+                    handler->PSendSysMessage(LANG_COMMAND_TARGET_LISTAURATYPE, std::to_string(std::distance(auraList.begin(), auraList.end())).c_str(), i);
                 }
 
                 handler->PSendSysMessage(LANG_COMMAND_TARGET_AURASIMPLE, effect->GetId(), effect->GetEffIndex(), effect->GetAmount());
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 131fd6bc8b5..273be7a68bb 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -3121,7 +3121,8 @@ class spell_gen_two_forms : public SpellScript
         }
 
         // Player cannot transform to human form if he is forced to be worgen for some reason (Darkflight)
-        if (GetCaster()->GetAuraEffectsByType(SPELL_AURA_WORGEN_ALTERED_FORM).size() > 1)
+        Unit::AuraEffectList const& alteredFormAuras = GetCaster()->GetAuraEffectsByType(SPELL_AURA_WORGEN_ALTERED_FORM);
+        if (std::distance(alteredFormAuras.begin(), alteredFormAuras.end()) > 1)
         {
             SetCustomCastResultMessage(SPELL_CUSTOM_ERROR_CANT_TRANSFORM);
             return SPELL_FAILED_CUSTOM_ERROR;