diff options
Diffstat (limited to 'src/server')
6 files changed, 21 insertions, 18 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 7930317bf2..37ac2ff767 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -1810,20 +1810,23 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u break; } case SMART_TARGET_RANDOM_POINT: - if (me) { - float range = (float)e.target.randomPoint.range; - Position srcPos = { e.target.x, e.target.y, e.target.z, e.target.o }; - Position randomPoint = me->GetRandomPoint(srcPos, range); - me->GetMotionMaster()->MovePoint( - e.action.moveToPos.pointId, - randomPoint.m_positionX, - randomPoint.m_positionY, - randomPoint.m_positionZ, - true, - true, - isControlled ? MOTION_SLOT_CONTROLLED : MOTION_SLOT_ACTIVE - ); + if (me) + { + float range = (float)e.target.randomPoint.range; + Position srcPos = { e.target.x, e.target.y, e.target.z, e.target.o }; + Position randomPoint = me->GetRandomPoint(srcPos, range); + me->GetMotionMaster()->MovePoint( + e.action.moveToPos.pointId, + randomPoint.m_positionX, + randomPoint.m_positionY, + randomPoint.m_positionZ, + true, + true, + isControlled ? MOTION_SLOT_CONTROLLED : MOTION_SLOT_ACTIVE + ); + + } break; } diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp index 6f2c14b465..5982599fd9 100644 --- a/src/server/game/Calendar/CalendarMgr.cpp +++ b/src/server/game/Calendar/CalendarMgr.cpp @@ -204,8 +204,8 @@ void CalendarMgr::RemoveEvent(CalendarEvent* calendarEvent, ObjectGuid remover) trans->Append(stmt); CharacterDatabase.CommitTransaction(trans); - delete calendarEvent; _events.erase(calendarEvent); + delete calendarEvent; return; } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 6b5fae927e..4f622546e4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -504,7 +504,7 @@ class spell_doomfire : public AuraScript int32 bp = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); float tickCoef = (static_cast<float>(aurEff->GetTickNumber() - 1) / aurEff->GetTotalTicks()); // Tick moved back to ensure proper damage on each tick int32 damage = bp - (bp*tickCoef); - SpellCastResult result = target->CastCustomSpell(target, SPELL_DOOMFIRE_DOT, &damage, &damage, &damage, true, nullptr, nullptr, target->GetGUID()); + target->CastCustomSpell(target, SPELL_DOOMFIRE_DOT, &damage, &damage, &damage, true, nullptr, nullptr, target->GetGUID()); } void Register() override diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp index bccd14d262..ee667ba0a9 100644 --- a/src/server/scripts/Outland/zone_shattrath_city.cpp +++ b/src/server/scripts/Outland/zone_shattrath_city.cpp @@ -308,7 +308,7 @@ struct npc_shattrath_daily_quest : public NullCreatureAI { Field *fields = result->Fetch(); int quest_id = fields[0].Get<int>(); - uint32 templateID; + uint32 templateID = 0; if (creature == NPC_SHATTRATH_DAILY_H) { diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 47f95c91af..198b469522 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -5221,7 +5221,7 @@ class spell_gen_sober_up : public AuraScript if (!target && !target->ToPlayer()) return; - SpellEffIndex InebriateEffIndex; + SpellEffIndex InebriateEffIndex = EFFECT_0; if (Player* player = target->ToPlayer()) { switch (GetSpellInfo()->Id) diff --git a/src/server/shared/Network/Socket.h b/src/server/shared/Network/Socket.h index 51513ba974..e92f2c42eb 100644 --- a/src/server/shared/Network/Socket.h +++ b/src/server/shared/Network/Socket.h @@ -261,7 +261,7 @@ private: const uint8 addressFamily = readPointer[13]; const uint16 len = (readPointer[14] << 8) | readPointer[15]; - if (len+16 > packet.GetActiveSize()) + if (static_cast<size_t>(len+16) > packet.GetActiveSize()) { AsyncReadProxyHeader(); return; |