ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(Core): Make more use of helpers. (#19835)

Browse source 
* Init.

* Reword.

* Update codestyle script.

Co-Authored-By: Kitzunu <24550914+Kitzunu@users.noreply.github.com>

* Add gameobject type ID check, reorder checks.

* Add helper/codestyle check for unit type.

* `IsUnit()` -> `IsCreature()`

* Add `IsUnit()` method.

* Use type mask.

https: //github.com/TrinityCore/TrinityCore/commit/cc71da35b5dc74abf71f8691161525a23d870bb5
Co-Authored-By: Giacomo Pozzoni <giacomopoz@gmail.com>
Co-Authored-By: Ovahlord <18347559+Ovahlord@users.noreply.github.com>

* Replace instances of `isType` with `IsUnit`.

---------

Co-authored-by: Kitzunu <24550914+Kitzunu@users.noreply.github.com>
Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
Co-authored-by: Ovahlord <18347559+Ovahlord@users.noreply.github.com>
This commit is contained in:
Benjamin Jackson 2024-09-03 13:41:31 -04:00 • committed by GitHub
parent e3e4133e88
commit 1edac37ac3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
165 changed files with 725 additions and 719 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/server/scripts/Spells/spell_quest.cpp
View file

@ -691,7 +691,7 @@ class spell_q11653_youre_not_so_big_now : public SpellScript
{
PreventHitDefaultEffect(effIndex);
Unit* target = GetHitUnit();
if (!target || target->GetTypeId() != TYPEID_UNIT)
if (!target || !target->IsCreature())
return;
static uint32 const spellPlayer[5] =
@ -809,7 +809,7 @@ class spell_q1846_bending_shinbone : public SpellScript
{
Item* target = GetHitItem();
Unit* caster = GetCaster();
if (!target && caster->GetTypeId() != TYPEID_PLAYER)
if (!target && !caster->IsPlayer())
return;
uint32 const spellId = roll_chance_i(20) ? SPELL_BENDING_SHINBONE1 : SPELL_BENDING_SHINBONE2;
@ -1014,7 +1014,7 @@ class spell_q11396_11399_scourging_crystal_controller_dummy : public SpellScript
void HandleDummy(SpellEffIndex /*effIndex*/)
{
if (Unit* target = GetHitUnit())
if (target->GetTypeId() == TYPEID_UNIT)
if (target->IsCreature())
target->RemoveAurasDueToSpell(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3);
}
@ -1704,7 +1704,7 @@ class spell_q12277_wintergarde_mine_explosion : public SpellScript
{
if (Unit* caster = GetCaster())
{
if (caster->GetTypeId() == TYPEID_UNIT)
if (caster->IsCreature())
{
if (Unit* owner = caster->GetOwner())
{
@ -2018,7 +2018,7 @@ enum BearFlankMaster
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_UNIT;
return GetCaster()->IsCreature();
}
void HandleScript(SpellEffIndex /*effIndex*/)
@ -2079,7 +2079,7 @@ class spell_q12690_burst_at_the_seams : public SpellScript
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_UNIT;
return GetCaster()->IsCreature();
}
void HandleKnockBack(SpellEffIndex /*effIndex*/)