This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/game/Object/Player.cpp b/src/game/Object/Player.cpp | |
| index 7bc1c3b..3a69cdc 100644 | |
| --- a/src/game/Object/Player.cpp | |
| +++ b/src/game/Object/Player.cpp | |
| @@ -5688,10 +5688,10 @@ void Player::SendMessageToSetInRange(WorldPacket* data, float dist, bool self) c | |
| { GetSession()->SendPacket(data); } | |
| } | |
| -void Player::SendMessageToSetInRange(WorldPacket* data, float dist, bool self, bool own_team_only) const | |
| +void Player::SendMessageToSetInRange(WorldPacket* data, float dist, bool self, bool own_team_only, bool to_gm) const |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/game/Object/SpellMgr.cpp b/src/game/Object/SpellMgr.cpp | |
| index 48880cc..353ec8f 100644 | |
| --- a/src/game/Object/SpellMgr.cpp | |
| +++ b/src/game/Object/SpellMgr.cpp | |
| @@ -47,6 +47,9 @@ bool IsPrimaryProfessionSkill(uint32 skill) | |
| SpellMgr::SpellMgr() | |
| { | |
| + for (SkillRaceClassInfoEntry const* entry : sSkillRaceClassInfoStore) | |
| + if (sSkillLineStore.LookupEntry(entry->skillId)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp | |
| index 6150dbb422..54bba5007e 100644 | |
| --- a/src/server/game/Spells/Spell.cpp | |
| +++ b/src/server/game/Spells/Spell.cpp | |
| @@ -2262,6 +2262,16 @@ void Spell::AddDestTarget(SpellDestination const& dest, uint32 effIndex) | |
| m_destTargets[effIndex] = dest; | |
| } | |
| +bool Spell::TargetInfo::MissedTarget(Spell *spell) | |
| +{ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp | |
| index a831649589..4ee107eb3e 100644 | |
| --- a/src/server/game/AI/SmartScripts/SmartAI.cpp | |
| +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp | |
| @@ -609,6 +609,11 @@ void SmartAI::SpellHit(Unit* unit, SpellInfo const* spellInfo) | |
| { | |
| GetScript()->ProcessEventsFor(SMART_EVENT_SPELLHIT, unit, 0, 0, false, spellInfo); | |
| } | |
| +void SmartAI::SpellHit(GameObject* caster, SpellInfo const* spellInfo) | |
| +{ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp | |
| index a831649589..e921922b24 100644 | |
| --- a/src/server/game/AI/SmartScripts/SmartAI.cpp | |
| +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp | |
| @@ -996,7 +996,8 @@ void SmartGameObjectAI::UpdateAI(uint32 diff) | |
| void SmartGameObjectAI::InitializeAI() | |
| { | |
| GetScript()->OnInitialize(me); | |
| - //Reset(); | |
| + |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp | |
| index 20a93451c9..06c490ad31 100644 | |
| --- a/src/server/game/AI/CoreAI/PetAI.cpp | |
| +++ b/src/server/game/AI/CoreAI/PetAI.cpp | |
| @@ -257,7 +257,6 @@ void PetAI::UpdateAI(uint32 diff) | |
| me->UpdateSpeed(MOVE_RUN); | |
| me->UpdateSpeed(MOVE_WALK); | |
| me->UpdateSpeed(MOVE_FLIGHT); | |
| - | |
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp | |
| index 0acd39162c..5ed939d4bd 100644 | |
| --- a/src/server/game/Entities/Unit/Unit.cpp | |
| +++ b/src/server/game/Entities/Unit/Unit.cpp | |
| @@ -448,8 +448,11 @@ void Unit::Update(uint32 p_time) | |
| ModifyAuraState(AURA_STATE_HEALTH_ABOVE_75_PERCENT, HealthAbovePct(75)); | |
| } | |
| - UpdateSplineMovement(p_time); | |
| - i_motionMaster->Update(p_time); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp | |
| index 30f7a56daf..96006ffa38 100644 | |
| --- a/src/server/game/Battlegrounds/Battleground.cpp | |
| +++ b/src/server/game/Battlegrounds/Battleground.cpp | |
| @@ -810,6 +810,27 @@ void Battleground::EndBattleground(uint32 winner) | |
| player->SendDirectMessage(&data); | |
| player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_BATTLEGROUND, player->GetMapId()); | |
| } | |
| + | |
| + Player* aPlayer = _GetPlayerForTeam(ALLIANCE, m_Players.begin(), "EndBattleground"); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp | |
| index a9a9c78c0b..1dd69d093f 100644 | |
| --- a/src/server/game/Entities/Object/Object.cpp | |
| +++ b/src/server/game/Entities/Object/Object.cpp | |
| @@ -1434,7 +1434,7 @@ void WorldObject::UpdateAllowedPositionZ(float x, float y, float &z) const | |
| if (canSwim) | |
| max_z = GetMapWaterOrGroundLevel(x, y, z, &ground_z); | |
| else | |
| - max_z = ground_z = GetMapHeight(x, y, z); | |
| + max_z = ground_z = GetMapHeight(x, y, z, true, DEFAULT_HEIGHT_SEARCH, GetDistance2d(x, y)/2.0f); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git AL-Game/data/static_data/npcs/npc_templates.xml AL-Game/data/static_data/npcs/npc_templates.xml | |
| index cec0fd5..9db7bae 100644 | |
| --- AL-Game/data/static_data/npcs/npc_templates.xml | |
| +++ AL-Game/data/static_data/npcs/npc_templates.xml | |
| @@ -61693,31 +61693,31 @@ | |
| </stats> | |
| <bound_radius front="1.05" side="0.55" upper="0.98"/> | |
| </npc_template> | |
| - <npc_template npc_id="210138" level="10" name="Starving Worg" name_id="300115" name_desc="Zaif_10_An" height="1.07" rank="DISCIPLINED" rating="NORMAL" race="BEAST" tribe="ZAIF" ai="general" srange="7" arange="2" adelay="1938" arate="1000" hpgauge="3"> | |
| + <npc_template npc_id="210138" level="10" name="Starving Worg" name_id="300115" name_desc="Zaif_10_An" height="1.07" rank="DISCIPLINED" rating="NORMAL" race="BEAST" tribe="ZAIF" ai="aggressive" srange="7" arange="2" adelay="1938" arate="1000" hpgauge="3"> |