diff options
| -rw-r--r-- | src/server/game/AI/ScriptedAI/ScriptedCreature.cpp | 12 | ||||
| -rwxr-xr-x | src/server/game/Groups/Group.cpp | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 0909954be63..dec6296f823 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -111,8 +111,8 @@ bool SummonList::HasEntry(uint32 entry) ScriptedAI::ScriptedAI(Creature* pCreature) : CreatureAI(pCreature), me(pCreature), IsFleeing(false), - _isCombatMovementAllowed(true), - _evadeCheckCooldown(2500) + _evadeCheckCooldown(2500), + _isCombatMovementAllowed(true) { _isHeroic = me->GetMap()->IsHeroic(); _difficulty = Difficulty(me->GetMap()->GetSpawnMode()); @@ -505,9 +505,11 @@ void Scripted_NoMovementAI::AttackStart(Unit* target) DoStartNoMovement(target); } -BossAI::BossAI(Creature* creature, uint32 bossId) : ScriptedAI(creature) -, _bossId(bossId), summons(creature), instance(creature->GetInstanceScript()) -, _boundary(instance ? instance->GetBossBoundary(bossId) : NULL) +BossAI::BossAI(Creature* creature, uint32 bossId) : ScriptedAI(creature), + instance(creature->GetInstanceScript()), + summons(creature), + _boundary(instance ? instance->GetBossBoundary(bossId) : NULL), + _bossId(bossId) { } diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index d4f0b6a2d04..ce8cc7e4197 100755 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -439,7 +439,7 @@ bool Group::RemoveMember(const uint64 &guid, const RemoveMethod &method /*= GROU CharacterDatabase.PExecute("DELETE FROM group_member WHERE memberGuid=%u", GUID_LOPART(guid)); // Reevaluate group enchanter if the leaving player had enchanting skill or the player is offline - if (player && player->GetSkillValue(SKILL_ENCHANTING) || !player) + if ((player && player->GetSkillValue(SKILL_ENCHANTING)) || !player) ResetMaxEnchantingLevel(); // Remove player from loot rolls |