fix(Core): potential crashes/bugs reported by static analysis #2 (#2622)

This commit is contained in:
Kaev
2020-02-03 07:52:27 +01:00
committed by GitHub
parent 8cfdfd0af0
commit 2fa9f5c249
30 changed files with 148 additions and 229 deletions

View File

@@ -2015,7 +2015,7 @@ class at_hor_battered_hilt_throw : public AreaTriggerScript
if (InstanceScript* instance = player->GetInstanceScript())
{
uint32 bhd = instance->GetData(DATA_BATTERED_HILT);
if (bhd == BHSF_NONE || bhd != BHSF_STARTED)
if (bhd != BHSF_STARTED)
return true;
player->CastSpell(player, 70698, true);
player->DestroyItemCount(49766, 1, true);

View File

@@ -129,6 +129,7 @@ public:
n2->GetMotionMaster()->MovePoint(1, NecrolytePos2);
n2->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY1H);
}
// TODO This spell check is invalid
if (SPELL_NECROLYTE_CHANNELING)
{
n1->RemoveAura(SPELL_NECROLYTE_CHANNELING);
@@ -398,6 +399,8 @@ public:
(me->GetPositionX() > 490.0f && me->GetPositionX() < 504.0f && me->GetPositionY() > 240.0f && me->GetPositionY() < 254.0f))
{
isInvincible = true;
// TODO This spell check is invalid
if (SPELL_NECROLYTE_CHANNELING)
me->CastSpell(me, SPELL_NECROLYTE_CHANNELING, false);
@@ -417,6 +420,7 @@ public:
void EnterCombat(Unit* /*who*/)
{
// TODO This spell check is invalid
if (SPELL_NECROLYTE_CHANNELING)
me->RemoveAura(SPELL_NECROLYTE_CHANNELING);
events.Reset();