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

fix(Core/Spells): Forward core changes (#8841)

Browse Source
This commit is contained in:
acidmanifesto
2021-12-09 22:24:16 +01:00
committed by GitHub
parent 0300cef119
commit 85d2c39a48
14 changed files with 233 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
src/server/game/Grids/Notifiers/GridNotifiers.h
View File

@@ -165,6 +165,29 @@ namespace Acore
// WorldObject searchers & workers
// Generic base class to insert elements into arbitrary containers using push_back
template <typename Type> class ContainerInserter
{
using InserterType = void (*)(void*, Type&&);
void* ref;
InserterType inserter;
// MSVC workaround
template <typename T> static void InserterOf(void* ref, Type&& type)
{
static_cast<T*>(ref)->push_back(std::move(type));
}
protected:
template <typename T> ContainerInserter(T& ref_) : ref(&ref_), inserter(&InserterOf<T>) {}
void Insert(Type type)
{
inserter(ref, std::move(type));
}
};
template<class Check>
struct WorldObjectSearcher
{
@@ -206,15 +229,15 @@ namespace Acore
};
template<class Check>
struct WorldObjectListSearcher
struct WorldObjectListSearcher : ContainerInserter<WorldObject*>
{
uint32 i_mapTypeMask;
uint32 i_phaseMask;
std::list<WorldObject*>& i_objects;
Check& i_check;
WorldObjectListSearcher(WorldObject const* searcher, std::list<WorldObject*>& objects, Check& check, uint32 mapTypeMask = GRID_MAP_TYPE_MASK_ALL)
: i_mapTypeMask(mapTypeMask), i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) {}
template <typename Container> WorldObjectListSearcher(WorldObject const* searcher, Container& container, Check& check, uint32 mapTypeMask = GRID_MAP_TYPE_MASK_ALL)
: ContainerInserter<WorldObject*>(container),
i_mapTypeMask(mapTypeMask), i_phaseMask(searcher->GetPhaseMask()), i_check(check) {}
void Visit(PlayerMapType& m);
void Visit(CreatureMapType& m);
@@ -316,14 +339,14 @@ namespace Acore
};
template<class Check>
struct GameObjectListSearcher
struct GameObjectListSearcher : ContainerInserter<GameObject*>
{
uint32 i_phaseMask;
std::list<GameObject*>& i_objects;
Check& i_check;
GameObjectListSearcher(WorldObject const* searcher, std::list<GameObject*>& objects, Check& check)
: i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) {}
template <typename Container> GameObjectListSearcher(WorldObject const* searcher, Container& container, Check& check)
: ContainerInserter<GameObject*>(container),
i_phaseMask(searcher->GetPhaseMask()), i_check(check) {}
void Visit(GameObjectMapType& m);
@@ -388,14 +411,14 @@ namespace Acore
// All accepted by Check units if any
template<class Check>
struct UnitListSearcher
struct UnitListSearcher : ContainerInserter<Unit*>
{
uint32 i_phaseMask;
std::list<Unit*>& i_objects;
Check& i_check;
UnitListSearcher(WorldObject const* searcher, std::list<Unit*>& objects, Check& check)
: i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) {}
template <typename Container> UnitListSearcher(WorldObject const* searcher, Container& container, Check& check)
: ContainerInserter<Unit*>(container),
i_phaseMask(searcher->GetPhaseMask()), i_check(check) {}
void Visit(PlayerMapType& m);
void Visit(CreatureMapType& m);
@@ -437,14 +460,14 @@ namespace Acore
};
template<class Check>
struct CreatureListSearcher
struct CreatureListSearcher : ContainerInserter<Creature*>
{
uint32 i_phaseMask;
std::list<Creature*>& i_objects;
Check& i_check;
CreatureListSearcher(WorldObject const* searcher, std::list<Creature*>& objects, Check& check)
: i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) {}
template <typename Container> CreatureListSearcher(WorldObject const* searcher, Container& container, Check& check)
: ContainerInserter<Creature*>(container),
i_phaseMask(searcher->GetPhaseMask()), i_check(check) {}
void Visit(CreatureMapType& m);
@@ -488,14 +511,14 @@ namespace Acore
};
template<class Check>
struct PlayerListSearcher
struct PlayerListSearcher : ContainerInserter<Player*>
{
uint32 i_phaseMask;
std::list<Player*>& i_objects;
Check& i_check;
PlayerListSearcher(WorldObject const* searcher, std::list<Player*>& objects, Check& check)
: i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) {}
template <typename Container> PlayerListSearcher(WorldObject const* searcher, Container& container, Check& check)
: ContainerInserter<Player*>(container),
i_phaseMask(searcher->GetPhaseMask()), i_check(check) {}
void Visit(PlayerMapType& m);
@@ -803,20 +826,23 @@ namespace Acore
{
public:
AnyUnfriendlyUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range) : i_obj(obj), i_funit(funit), i_range(range) {}
bool operator()(Unit* u)
bool operator()(Unit* u) const
{
if (u->IsAlive() && i_obj->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u) &&
(i_funit->GetTypeId() != TYPEID_UNIT || !i_funit->ToCreature()->IsAvoidingAOE())) // pussywizard
(i_funit->GetTypeId() != TYPEID_UNIT || !i_funit->ToCreature()->IsAvoidingAOE())) // pussywizard)
{
return true;
else
return false;
}
return false;
}
private:
WorldObject const* i_obj;
Unit const* i_funit;
float i_range;
};
class AnyUnfriendlyNoTotemUnitInObjectRangeCheck
{
public:
@@ -903,9 +929,19 @@ namespace Acore
class AnyGroupedUnitInObjectRangeCheck
{
public:
AnyGroupedUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range, bool raid) : _source(obj), _refUnit(funit), _range(range), _raid(raid) {}
AnyGroupedUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range, bool raid, bool playerOnly = false) : _source(obj), _refUnit(funit), _range(range), _raid(raid), _playerOnly(playerOnly) {}
bool operator()(Unit* u)
{
if (G3D::fuzzyEq(_range, 0.0f))
{
return false;
}
if (_playerOnly && u->GetTypeId() != TYPEID_PLAYER)
{
return false;
}
if (_raid)
{
if (!_refUnit->IsInRaidWith(u))
@@ -922,6 +958,7 @@ namespace Acore
Unit const* _refUnit;
float _range;
bool _raid;
bool _playerOnly;
};
class AnyUnitInObjectRangeCheck
@@ -968,27 +1005,35 @@ namespace Acore
class AnyAoETargetUnitInObjectRangeCheck
{
public:
AnyAoETargetUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range)
: i_obj(obj), i_funit(funit), _spellInfo(nullptr), i_range(range)
AnyAoETargetUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range, SpellInfo const* spellInfo = nullptr)
: i_obj(obj), i_funit(funit), _spellInfo(spellInfo), i_range(range)
{
Unit const* check = i_funit;
Unit const* owner = i_funit->GetOwner();
if (owner)
check = owner;
i_targetForPlayer = (check->GetTypeId() == TYPEID_PLAYER);
if (i_obj->GetTypeId() == TYPEID_DYNAMICOBJECT)
_spellInfo = sSpellMgr->GetSpellInfo(((DynamicObject*)i_obj)->GetSpellId());
if (!_spellInfo)
{
if (DynamicObject const* dynObj = i_obj->ToDynObject())
{
_spellInfo = sSpellMgr->GetSpellInfo(dynObj->GetSpellId());
}
}
}
bool operator()(Unit* u)
{
// Check contains checks for: live, non-selectable, non-attackable flags, flight check and GM check, ignore totems
if (u->GetTypeId() == TYPEID_UNIT && ((Creature*)u)->IsTotem())
if (u->GetTypeId() == TYPEID_UNIT && ((Creature*) u)->IsTotem())
{
return false;
if (i_funit->_IsValidAttackTarget(u, _spellInfo, i_obj->GetTypeId() == TYPEID_DYNAMICOBJECT ? i_obj : nullptr) && i_obj->IsWithinDistInMap(u, i_range))
return true;
return false;
}
if (_spellInfo && _spellInfo->HasAttribute(SPELL_ATTR3_ONLY_ON_PLAYER) && u->GetTypeId() != TYPEID_PLAYER)
{
return false;
}
return i_funit->_IsValidAttackTarget(u, _spellInfo, i_obj->GetTypeId() == TYPEID_DYNAMICOBJECT ? i_obj : nullptr) && i_obj->IsWithinDistInMap(u, i_range);
}
private:
bool i_targetForPlayer;