public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 07:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Units): clear emote state on attack rather than on combat st… (#8170)

Browse Source 
- Closes #6281
This commit is contained in:
UltraNix
2021-10-14 16:18:51 +02:00
committed by GitHub
parent 13db23200f
commit cb71cc0131
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -9725,6 +9725,8 @@ bool Unit::Attack(Unit* victim, bool meleeAttack)
creature->SendAIReaction(AI_REACTION_HOSTILE); creature->SendAIReaction(AI_REACTION_HOSTILE);
creature->CallAssistance(); creature->CallAssistance();
creature->SetAssistanceTimer(sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_ASSISTANCE_PERIOD)); creature->SetAssistanceTimer(sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_ASSISTANCE_PERIOD));
SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
} }
// delay offhand weapon attack to next attack time // delay offhand weapon attack to next attack time
@@ -12816,7 +12818,6 @@ void Unit::CombatStart(Unit* victim, bool initialAggro)
SetInCombatWith(victim); SetInCombatWith(victim);
victim->SetInCombatWith(this); victim->SetInCombatWith(this);
victim->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
// Xinef: If pet started combat - put owner in combat // Xinef: If pet started combat - put owner in combat
if (Unit* owner = GetOwner()) if (Unit* owner = GetOwner())

12
src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
View File

@@ -1517,17 +1517,15 @@ public:
{ {
float angle = me->GetAngle(p); float angle = me->GetAngle(p);
if (Unit* vehicle = me->GetVehicleBase())
{
vehicle->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_CUSTOM_SPELL_01);
vehicle->HandleEmoteCommand(EMOTE_STATE_CUSTOM_SPELL_01);
angle -= vehicle->GetOrientation();
}
spinningUpOrientation = (uint32)((angle * 100.0f) / (2 * M_PI)); spinningUpOrientation = (uint32)((angle * 100.0f) / (2 * M_PI));
spinningUpTimer = 1500; spinningUpTimer = 1500;
me->SetFacingTo(angle); me->SetFacingTo(angle);
me->CastSpell(p, SPELL_SPINNING_UP, true); me->CastSpell(p, SPELL_SPINNING_UP, true);
if (Unit* vehicle = me->GetVehicleBase())
{
vehicle->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_CUSTOM_SPELL_01);
vehicle->HandleEmoteCommand(EMOTE_STATE_CUSTOM_SPELL_01);
}
events.RescheduleEvent((Phase == 2 ? EVENT_SPELL_RAPID_BURST : EVENT_HAND_PULSE), 14500); events.RescheduleEvent((Phase == 2 ? EVENT_SPELL_RAPID_BURST : EVENT_HAND_PULSE), 14500);
} }
break; break;