diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 38ce83cfd4..1416bed636 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -14998,7 +14998,7 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, { if (quest->RequiredItemCount[i] > 0 && (itemTemplate->Bonding == BIND_QUEST_ITEM || itemTemplate->Bonding == BIND_QUEST_ITEM1)) DestroyItemCount(quest->RequiredItemId[i], 9999, true, true); - else + else DestroyItemCount(quest->RequiredItemId[i], quest->RequiredItemCount[i], true, true); } } diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index 5083fc3c41..6ef82f941d 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -435,7 +435,7 @@ void WorldSession::HandleQuestLogRemoveQuest(WorldPacket& recvData) } _player->TakeQuestSourceItem(questId, true); // remove quest src item from player - _player->AbandonQuest(questId); // remove all quest items player received before abandoning quest. Note, this does not remove normal drop items that happen to be quest requirements. + _player->AbandonQuest(questId); // remove all quest items player received before abandoning quest. Note, this does not remove normal drop items that happen to be quest requirements. _player->RemoveActiveQuest(questId); _player->RemoveTimedAchievement(ACHIEVEMENT_TIMED_TYPE_QUEST, questId); diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index bf8ccb6f36..563dfdd9c0 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -474,7 +474,7 @@ int32 SpellEffectInfo::CalcValue(Unit const* caster, int32 const* bp, Unit const level = int32(_spellInfo->MaxLevel); else if (level < int32(_spellInfo->BaseLevel)) level = int32(_spellInfo->BaseLevel); - if (!_spellInfo->IsPassive()) + if (!_spellInfo->IsPassive()) level -= int32(_spellInfo->SpellLevel); basePoints += int32(level * basePointsPerLevel); } diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 04931a4f64..2e70362811 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -1469,7 +1469,7 @@ public: why = CreatureAI::EVADE_REASON_SEQUENCE_BREAK; else if (stricmp(type_str, "FORCE") == 0) force = true; - + if (!force && force_str) if (stricmp(force_str, "FORCE") == 0) force = true; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index ce3e68d9c4..76e32925a6 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -94,7 +94,7 @@ public: { if (Creature* midnight = ObjectAccessor::GetCreature(*me, _midnightGUID)) BossAI::_DespawnAtEvade(Seconds(10), midnight); - + me->DespawnOrUnsummon(); } @@ -130,7 +130,7 @@ public: if (_phase == PHASE_ATTUMEN_ENGAGES && me->HealthBelowPctDamaged(25, damage)) { _phase = PHASE_NONE; - + if (Creature* midnight = ObjectAccessor::GetCreature(*me, _midnightGUID)) midnight->AI()->DoCastAOE(SPELL_MOUNT, true); } diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 7bcf24082f..d2dbb19647 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -1107,7 +1107,7 @@ enum WS WATER = 0x2, EARTH = 0x4, AIR = 0x8 -}; +}; enum WSTexts { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 0fe4c8144c..1beb70260e 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -268,7 +268,7 @@ class npc_pit_of_saron_icicle : public CreatureScript { DoCastSelf(SPELL_ICICLE_FALL_TRIGGER, true); DoCastSelf(SPELL_ICICLE_FALL_VISUAL); - + if (Unit* caster = ObjectAccessor::GetUnit(*me, _summonerGUID)) caster->RemoveDynObject(SPELL_ICICLE_SUMMON); }); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 73257075e5..9d8e624de5 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -198,7 +198,7 @@ public: if (zombie) { zombieToBeEatenGUID = zombie->GetGUID(); // save for later use// the soon-to-be-eaten zombie should stop moving and stop attacking - + // the soon-to-be-eaten zombie should stop moving and stop attacking zombie->AI()->SetData(DATA_ZOMBIE_STATE, STATE_ZOMBIE_TOBE_EATEN); @@ -223,7 +223,7 @@ public: case EVENT_KILL_ZOMBIE_SINGLE: { Creature* zombieToBeEaten = ObjectAccessor::GetCreature(*me, zombieToBeEatenGUID); - if (zombieToBeEaten && zombieToBeEaten->IsAlive() && zombieToBeEaten->IsWithinDistInMap(me, 10.0)) + if (zombieToBeEaten && zombieToBeEaten->IsAlive() && zombieToBeEaten->IsWithinDistInMap(me, 10.0)) DoCast(zombieToBeEaten, SPELL_ZOMBIE_CHOW_SEARCH_SINGLE); // do the killing + healing in done inside by spell script see below. zombieToBeEatenGUID = ObjectGuid::Empty; @@ -247,11 +247,11 @@ public: if (zombie && zombie->IsAlive() && zombie->GetExactDist2d(me) > 18.0) zombie = nullptr; } - + if (zombie) // cast the aoe spell only if at least one zombie is found nearby { Talk(EMOTE_DEVOURS_ALL); - DoCastAOE(SPELL_ZOMBIE_CHOW_SEARCH_MULTI); + DoCastAOE(SPELL_ZOMBIE_CHOW_SEARCH_MULTI); } break; } @@ -267,7 +267,7 @@ public: me->GetMotionMaster()->MoveIdle(); events.ScheduleEvent(EVENT_KILL_ZOMBIE_SINGLE, Seconds(1)); } - + } void DoAction(int32 action) override @@ -432,10 +432,10 @@ public: { me->SetReactState(ReactStates::REACT_PASSIVE); me->AttackStop(); - me->SetTarget(ObjectGuid::Empty); + me->SetTarget(ObjectGuid::Empty); // at this point, the zombie should be non attacking and non moving. - me->SetWalk(true); // it doesnt seem to work with MoveFollow() (but it does work with MovePoint()). + me->SetWalk(true); // it doesnt seem to work with MoveFollow() (but it does work with MovePoint()). //me->SetSpeed(UnitMoveType::MOVE_RUN, baseMoveSpeed[UnitMoveType::MOVE_WALK] / baseMoveSpeed[UnitMoveType::MOVE_RUN]); // Hack to stay in run mode but with walk speed in case using MoveFollow() timer = 1000; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 785048bf50..cb2a90bcd1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -264,7 +264,7 @@ public: _JustDied(); Talk(SAY_DEATH); } - + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (events.IsInPhase(PHASE_ONE)) @@ -432,7 +432,7 @@ public: if (Is25ManRaid()) events.ScheduleEvent(EVENT_CHAINS, randtime(Seconds(60), Seconds(80)), 0, PHASE_TWO); break; - + case EVENT_FROSTBOLT_VOLLEY: DoCastAOE(SPELL_FROSTBOLT_VOLLEY); events.Repeat(randtime(Seconds(16), Seconds(18))); @@ -624,7 +624,7 @@ struct npc_kelthuzad_minionAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); return; } - + if (me->CanStartAttack(who, false) && me->GetDistance2d(who) <= MINION_AGGRO_DISTANCE) EnterCombat(who); } @@ -641,7 +641,7 @@ struct npc_kelthuzad_minionAI : public ScriptedAI return pocketId; return 0; } - + void MovementInform(uint32 /*type*/, uint32 id) override { if (id == MOVEMENT_MINION_RANDOM) @@ -665,7 +665,7 @@ struct npc_kelthuzad_minionAI : public ScriptedAI protected: InstanceScript* const instance; uint32 pocketId; - + private: uint32 _movementTimer; Position const _home; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 8a90590e99..ee0e4292b5 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -548,7 +548,7 @@ class spell_sapphiron_frost_breath : public SpellScriptLoader toRemove.push_back(target); continue; } - + bool found = false; for (GameObject* block : blocks) if (block->IsInBetween(GetCaster(), target, 2.0f) && GetCaster()->GetExactDist2d(block) + 5 >= GetCaster()->GetExactDist2d(target)) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 30b3fd6768..cf70032956 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -389,7 +389,7 @@ class boss_high_astromancer_solarian : public CreatureScript else VoidBolt_Timer -= diff; } - + //When Solarian reaches 20% she will transform into a huge void walker. if (Phase != 4 && me->HealthBelowPct(20)) { @@ -403,7 +403,7 @@ class boss_high_astromancer_solarian : public CreatureScript me->SetDisplayId(MODEL_VOIDWALKER); me->SetObjectScale(defaultsize*2.5f); } - + DoMeleeAttackIfReady(); } };