Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build

Browse Source
This commit is contained in:
Ovahlord
2020-07-22 15:21:50 +02:00
parent 2cc36c5eec
commit 280b8dc799
8 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/AI/PlayerAI/PlayerAI.cpp
View File

@@ -1268,7 +1268,7 @@ void SimpleCharmedPlayerAI::UpdateAI(const uint32 diff)
me->CastStop();
me->StopMoving();
me->GetMotionMaster()->Clear();
me->GetMotionMaster()->MoveFollow(charmer, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
me->FollowTarget(target);
}
return;
}

4
src/server/game/Entities/Player/Player.cpp
View File

@@ -10944,7 +10944,7 @@ InventoryResult Player::CanEquipItem(uint8 slot, uint16 &dest, Item* pItem, bool
return EQUIP_ERR_GENERIC_STUNNED;
if (IsCharmed())
return EQUIP_ERR_CANT_DO_RIGHT_NOW; // @todo is this the correct error?
return EQUIP_ERR_CLIENT_LOCKED_OUT; // @todo is this the correct error?
// do not allow equipping gear except weapons, offhands, projectiles, relics in
// - combat
@@ -11103,7 +11103,7 @@ InventoryResult Player::CanUnequipItem(uint16 pos, bool swap) const
return EQUIP_ERR_LOOT_GONE;
if (IsCharmed())
return EQUIP_ERR_CANT_DO_RIGHT_NOW; // @todo is this the correct error?
return EQUIP_ERR_CLIENT_LOCKED_OUT; // @todo is this the correct error?
// do not allow unequipping gear except weapons, offhands, projectiles, relics in
// - combat

4
src/server/game/Instances/InstanceScript.cpp
View File

@@ -362,7 +362,7 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state)
if (bossInfo->state == TO_BE_DECIDED) // loading
{
bossInfo->state = state;
TC_LOG_DEBUG("scripts", "InstanceScript: Initialize boss %u state as %s (map %u, %u).", id, GetBossStateName(state).c_str(), instance->GetId(), instance->GetInstanceId());
TC_LOG_DEBUG("scripts", "InstanceScript: Initialize boss %u state as %s (map %u, %u).", id, GetBossStateName(state), instance->GetId(), instance->GetInstanceId());
return false;
}
@@ -373,7 +373,7 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state)
if (bossInfo->state == DONE)
{
TC_LOG_ERROR("map", "InstanceScript: Tried to set instance state from %s back to %s for map %u, instance id %u. Blocked!", GetBossStateName(bossInfo->state).c_str(), GetBossStateName(state).c_str(), instance->GetId(), instance->GetInstanceId());
TC_LOG_ERROR("map", "InstanceScript: Tried to set instance boss %u state from %s back to %s for map %u, instance id %u. Blocked!", id, GetBossStateName(bossInfo->state), GetBossStateName(state), instance->GetId(), instance->GetInstanceId());
return false;
}

6
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
View File

@@ -131,10 +131,10 @@ class boss_selin_fireheart : public CreatureScript
crystal->KillSelf();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
Talk(SAY_AGGRO);
_EnterCombat();
_JustEngagedWith();
events.SetPhase(PHASE_NORMAL);
events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2100, 0, PHASE_NORMAL);
@@ -267,7 +267,7 @@ class npc_fel_crystal : public CreatureScript
{
if (InstanceScript* instance = me->GetInstanceScript())
{
Creature* Selin = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_SELIN));
Creature* Selin = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_SELIN_FIREHEART));
if (Selin && Selin->IsAlive())
Selin->AI()->DoAction(ACTION_SWITCH_PHASE);
}

14
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
View File

@@ -208,13 +208,13 @@ struct boss_kalecgos : public BossAI
damage = 0;
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
Talk(SAY_EVIL_AGGRO);
_EnterCombat();
_JustEngagedWith();
if (Creature* kalecgosHuman = me->SummonCreature(NPC_KALECGOS_HUMAN, KalecgosSummonPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000))
if (Creature* kalecgosHuman = me->SummonCreature(NPC_KALEC, KalecgosSummonPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000))
if (Creature* sathrovar = instance->GetCreature(DATA_SATHROVARR))
{
sathrovar->SetInCombatWith(kalecgosHuman);
@@ -461,9 +461,9 @@ struct boss_sathrovarr : public BossAI
events.ScheduleEvent(EVENT_CHECK_TIMER, Seconds(1));
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_EnterCombat();
_JustEngagedWith();
Talk(SAY_SATH_AGGRO);
}
@@ -748,7 +748,7 @@ class spell_kalecgos_curse_of_boundless_agony : public AuraScript
if (instance->GetBossState(DATA_KALECGOS) == IN_PROGRESS)
return;
Remove(AURA_REMOVE_BY_CANCEL);
Remove(AuraRemoveFlags::ByCancel);
}
void OnPeriodic(AuraEffect const* aurEff)
@@ -769,7 +769,7 @@ class spell_kalecgos_curse_of_boundless_agony : public AuraScript
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_CANCEL)
if (!GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::ByCancel))
GetTarget()->CastSpell(GetTarget(), SPELL_AGONY_CURSE_ALLY, true);
}

1
src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
View File

@@ -17,6 +17,7 @@
#include "ScriptMgr.h"
#include "AreaBoundary.h"
#include "GameObject.h"
#include "InstanceScript.h"
#include "Log.h"
#include "Map.h"

4
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
View File

@@ -80,9 +80,9 @@ struct boss_blackheart_the_inciter : public BossAI
_Reset();
}
void EnterCombat(Unit* /*who*/) override
void JustEngagedWith(Unit* /*who*/) override
{
_EnterCombat();
_JustEngagedWith();
events.ScheduleEvent(EVENT_INCITE_CHAOS, 20000);
events.ScheduleEvent(EVENT_CHARGE_ATTACK, 5000);
events.ScheduleEvent(EVENT_WAR_STOMP, 15000);

1
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
View File

@@ -16,6 +16,7 @@
*/
#include "ScriptMgr.h"
#include "GameObject.h"
#include "InstanceScript.h"
#include "Map.h"
#include "ScriptedCreature.h"