pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-10 15:00:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge fix

Browse Source
This commit is contained in:
KimLS
2017-03-26 17:25:01 -07:00
parent cfdbca6f12 940f3b03e8
commit de777fc90f
324 changed files with 13633 additions and 17652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/effects.cpp
+4 -4
View File
@@ -748,7 +748,7 @@ void EntityList::AETaunt(Client* taunter, float range, int32 bonus_hate)
// NPC spells will only affect other NPCs with compatible faction
void EntityList::AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster, int16 resist_adjust)
{
Mob *curmob;
Mob *curmob = nullptr;
float dist = caster->GetAOERange(spell_id);
float dist2 = dist * dist;
@@ -848,7 +848,7 @@ void EntityList::AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_
void EntityList::MassGroupBuff(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster)
{
Mob *curmob;
Mob *curmob = nullptr;
float dist = caster->GetAOERange(spell_id);
float dist2 = dist * dist;
@@ -889,7 +889,7 @@ void EntityList::MassGroupBuff(Mob *caster, Mob *center, uint16 spell_id, bool a
// NPC spells will only affect other NPCs with compatible faction
void EntityList::AEBardPulse(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster)
{
Mob *curmob;
Mob *curmob = nullptr;
float dist = caster->GetAOERange(spell_id);
float dist2 = dist * dist;
@@ -941,7 +941,7 @@ void EntityList::AEBardPulse(Mob *caster, Mob *center, uint16 spell_id, bool aff
//NPCs handle it differently in Mob::Rampage
void EntityList::AEAttack(Mob *attacker, float dist, int Hand, int count, bool IsFromSpell) {
//Dook- Will need tweaking, currently no pets or players or horses
Mob *curmob;
Mob *curmob = nullptr;
float dist2 = dist * dist;