sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Scripts/Pet): code cleanup (part 8) (#6928)

Browse Source
This commit is contained in:
Francesco Borzì
2021-07-21 19:05:05 +02:00
committed by GitHub
parent e954e3e32a
commit e556560bc1
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Pet/pet_dk.cpp
+7 -5
View File
@@ -13,7 +13,6 @@
#include "CellImpl.h" #include "CellImpl.h"
#include "CombatAI.h" #include "CombatAI.h"
#include "GridNotifiers.h" #include "GridNotifiers.h"
#include "GridNotifiersImpl.h"
#include "PassiveAI.h" #include "PassiveAI.h"
#include "ScriptedCreature.h" #include "ScriptedCreature.h"
#include "ScriptMgr.h" #include "ScriptMgr.h"
@@ -62,10 +61,13 @@ public:
// Xinef: Night of the Dead avoidance // Xinef: Night of the Dead avoidance
if (Aura* aur = me->GetAura(SPELL_DK_NIGHT_OF_THE_DEAD)) if (Aura* aur = me->GetAura(SPELL_DK_NIGHT_OF_THE_DEAD))
if (Unit* owner = me->GetOwner()) if (AuraEffect* aurEff = owner->GetAuraEffect(SPELL_AURA_ADD_FLAT_MODIFIER, SPELLFAMILY_DEATHKNIGHT, 2718, 0))
if (AuraEffect* aurEff = owner->GetAuraEffect(SPELL_AURA_ADD_FLAT_MODIFIER, SPELLFAMILY_DEATHKNIGHT, 2718, 0)) {
if (aur->GetEffect(0)) if (aur->GetEffect(0))
aur->GetEffect(0)->SetAmount(-aurEff->GetSpellInfo()->Effects[EFFECT_2].CalcValue()); {
aur->GetEffect(0)->SetAmount(-aurEff->GetSpellInfo()->Effects[EFFECT_2].CalcValue());
}
}
me->SetCanFly(true); me->SetCanFly(true);
me->SetDisableGravity(true); me->SetDisableGravity(true);
src/server/scripts/Pet/pet_generic.cpp
-1
View File
@@ -12,7 +12,6 @@
#include "CreatureTextMgr.h" #include "CreatureTextMgr.h"
#include "Group.h" #include "Group.h"
#include "PassiveAI.h" #include "PassiveAI.h"
#include "PetAI.h"
#include "Player.h" #include "Player.h"
#include "ScriptedCreature.h" #include "ScriptedCreature.h"
#include "ScriptedGossip.h" #include "ScriptedGossip.h"
src/server/scripts/Pet/pet_hunter.cpp
-5
View File
@@ -21,11 +21,6 @@ enum HunterSpells
SPELL_HUNTER_PET_SCALING = 62915 SPELL_HUNTER_PET_SCALING = 62915
}; };
enum HunterCreatures
{
NPC_HUNTER_VIPER = 19921
};
class npc_pet_hunter_snake_trap : public CreatureScript class npc_pet_hunter_snake_trap : public CreatureScript
{ {
public: public: