nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-31 09:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
ZhengPeiRu21
2022-09-13 18:48:47 -06:00
committed by GitHub
parent 8791645166 f01459553f
commit 76f4f741d8
11 changed files with 2403 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/Entities/GameObject/GameObject.cpp
View File

@@ -2788,13 +2788,17 @@ void GameObject::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player* t
case GAMEOBJECT_TYPE_CHEST:
case GAMEOBJECT_TYPE_GOOBER:
if (ActivateToQuest(target))
dynFlags |= GO_DYNFLAG_LO_ACTIVATE | GO_DYNFLAG_LO_SPARKLE;
{
dynFlags |= GO_DYNFLAG_LO_ACTIVATE;
if (sWorld->getBoolConfig(CONFIG_OBJECT_SPARKLES))
dynFlags |= GO_DYNFLAG_LO_SPARKLE;
}
else if (targetIsGM)
dynFlags |= GO_DYNFLAG_LO_ACTIVATE;
break;
case GAMEOBJECT_TYPE_SPELL_FOCUS:
case GAMEOBJECT_TYPE_GENERIC:
if (ActivateToQuest(target))
if (ActivateToQuest(target) && sWorld->getBoolConfig(CONFIG_OBJECT_SPARKLES))
dynFlags |= GO_DYNFLAG_LO_SPARKLE;
break;
case GAMEOBJECT_TYPE_TRANSPORT:

8
src/server/game/Entities/Pet/Pet.cpp
View File

@@ -1281,6 +1281,12 @@ bool Guardian::InitStatsForLevel(uint8 petlevel)
AddAura(SPELL_FERAL_SPIRIT_SCALING_01, this);
AddAura(SPELL_FERAL_SPIRIT_SCALING_02, this);
AddAura(SPELL_FERAL_SPIRIT_SCALING_03, this);
if (owner->getRace() == RACE_ORC)
{
CastSpell(this, SPELL_ORC_RACIAL_COMMAND_SHAMAN, true, nullptr, nullptr, owner->GetGUID());
}
break;
}
case NPC_MIRROR_IMAGE: // Mirror Image
@@ -1357,7 +1363,7 @@ bool Guardian::InitStatsForLevel(uint8 petlevel)
// xinef: fixes orc death knight command racial
if (owner->getRace() == RACE_ORC)
CastSpell(this, SPELL_ORC_RACIAL_COMMAND, true, nullptr, nullptr, owner->GetGUID());
CastSpell(this, SPELL_ORC_RACIAL_COMMAND_DK, true, nullptr, nullptr, owner->GetGUID());
// Avoidance, Night of the Dead
if (Aura* aur = AddAura(SPELL_NIGHT_OF_THE_DEAD_AVOIDANCE, this))

3
src/server/game/Entities/Pet/PetDefines.h
View File

@@ -162,6 +162,7 @@ enum PetScalingSpells
SPELL_EARTH_ELEMENTAL_SCALING_02 = 65226,
SPELL_EARTH_ELEMENTAL_SCALING_03 = 65227,
SPELL_EARTH_ELEMENTAL_SCALING_04 = 65228,
SPELL_ORC_RACIAL_COMMAND_SHAMAN = 65223,
// Priest
SPELL_SHADOWFIEND_SCALING_01 = 35661,
@@ -182,7 +183,7 @@ enum PetScalingSpells
SPELL_MAGE_PET_SCALING_04 = 35660,
// Death Knight
SPELL_ORC_RACIAL_COMMAND = 65221,
SPELL_ORC_RACIAL_COMMAND_DK = 65221,
SPELL_NIGHT_OF_THE_DEAD_AVOIDANCE = 62137,
SPELL_DK_PET_SCALING_01 = 51996,
SPELL_DK_PET_SCALING_02 = 54566,