Skip to content

Commit

Permalink
merge core (#5)
Browse files Browse the repository at this point in the history
* fix ProcSystemArguments constructor arg mismatch

* [Quest] rework Missing in Action quest using new systems (cmangos#660)

* [Quest] rework Missing in Action quest using new systems

* add changes requested in comments

* SpawnGroup: Implement CREATURE_GROUP_FORMATION_MIRRORING

* Config: Implement config override with env vars (cmangos#502)

* Config: Implement config override with env vars

Implement overriding of configuration from the .conf file with environment variables.
Environment variables keys are autogenerated based on the keys defined in .conf file.
Usage example:
$ export CM_DATA_DIR=/usr
$ CM_WORLD_SERVER_PORT=8080 ./mangosd

* Update env var key format and encapsulated env loading logic.

The new env key format:
Mangosd_Rate_Health
Mangosd_DataDir

* Add suggestions from code review.

* Add missing includes.

* Pet: Tryfix double unsummon crash due to visibility

Close cmangos/mangos-wotlk#508

Credit @insunaa for the general idea

* [Quest] modernize defias brotherhood escort quest
Closes cmangos#662

* [Quest] modernize 'Protect the Shipment' escort quest
Closes cmangos#663

* Remove gameobject los temp fix for playerbots

* G3D: Extend Support for new MacOS Versions (+Apple Silicon)

* Pet: Fix compilation for pch on linux

* Network: Minor rework of code to make it same as wotlk

* Move spell to proper section

* G3D: Fix MacOS/Apple Silicon compile

* Spell/Unit: Remove now redundant default coeff calculation

I am expecting trouble, but we need to threat 0 as 0

Closes cmangos/issues#3685

* AC: Add ignore los to shirrak inhibit magic aoe

* Playerbots: Fix grid loading issue (cmangos#536) - Exxenoz

* Spell/Unit: Fix default for coefficient being 0 and fix coeff for npc pets

Closes cmangos/issues#3685

again

* Playerbots: Handle spell item requirements by the bot system

---------

Co-authored-by: cdkr <[email protected]>
Co-authored-by: _daanieL <[email protected]>
Co-authored-by: killerwife <[email protected]>
Co-authored-by: Anton Popovichenko <[email protected]>
Co-authored-by: insunaa <[email protected]>
Co-authored-by: insunaa <[email protected]>
  • Loading branch information
7 people authored Apr 4, 2024
1 parent 858acad commit 2981427
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions src/game/Spells/Spell.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6757,6 +6757,17 @@ bool Spell::IgnoreItemRequirements() const
if (m_channelOnly || m_ignoreCosts)
return true;

#ifdef ENABLE_PLAYERBOTS
if (m_caster->IsPlayer())
{
PlayerbotAI* bot = ((Player*)m_caster)->GetPlayerbotAI();
if (bot && bot->HasSpellItems(m_spellInfo->Id, m_CastItem))
{
return true;
}
}
#endif

// Workaround for double shard problem
if (m_IsTriggeredSpell || this->m_spellInfo->Id == 46546)
{
Expand Down

0 comments on commit 2981427

Please sign in to comment.