Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Misc: more followups

Browse Source
This commit is contained in:
Ovahlord
2020-07-22 19:20:54 +02:00
parent 1d02149384
commit 2c88471fe3
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -664,6 +664,13 @@ void Creature::Update(uint32 diff)
if (m_deathState != CORPSE)
break;
if (IsEngaged())
{
m_AI_locked = true;
i_AI->UpdateAI(diff);
m_AI_locked = false;
}
if (m_groupLootTimer && lootingGroupLowGUID)
{
if (m_groupLootTimer <= diff)
@@ -759,7 +766,6 @@ void Creature::Update(uint32 diff)
{
// do not allow the AI to be changed during update
m_AI_locked = true;
i_AI->UpdateAI(diff);
m_AI_locked = false;
}
@@ -2448,8 +2454,9 @@ bool Creature::CanCreatureAttack(Unit const* victim, bool /*force*/) const
if (!victim->isInAccessiblePlaceFor(this))
return false;
if (IsAIEnabled && !AI()->CanAIAttack(victim))
return false;
if (CreatureAI* ai = AI())
if (!ai->CanAIAttack(victim))
return false;
if (GetMap()->IsDungeon())
return true;
@@ -3230,7 +3237,7 @@ void Creature::AtDisengage()
Unit::AtDisengage();
ClearUnitState(UNIT_STATE_ATTACK_PLAYER);
if (HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_TAPPED))
if (IsAlive() && HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_TAPPED))
SetUInt32Value(UNIT_DYNAMIC_FLAGS, GetCreatureTemplate()->dynamicflags);
}

1
src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
View File

@@ -331,6 +331,7 @@ class boss_lord_marrowgar : public CreatureScript
_boneSpikeImmune.clear();
break;
case ACTION_TALK_ENTER_ZONE:
if (me->IsAlive())
Talk(SAY_ENTER_ZONE);
break;
default:

8
src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
View File

@@ -254,6 +254,14 @@ class boss_professor_putricide : public CreatureScript
}
}
void EnterEvadeMode(EvadeReason why = EVADE_REASON_OTHER) override
{
if (why == EVADE_REASON_BOUNDARY && (events.IsInPhase(PHASE_ROTFACE) || events.IsInPhase(PHASE_FESTERGUT)))
return;
BossAI::EnterEvadeMode(why);
}
void JustEngagedWith(Unit* who) override
{
if (events.IsInPhase(PHASE_ROTFACE) || events.IsInPhase(PHASE_FESTERGUT))