Merge remote-tracking branch 'origin/3.3.5' into 4.3.4
Conflicts: sql/base/auth_database.sql src/server/game/Instances/InstanceScript.h src/server/scripts/Northrend/isle_of_conquest.cpp src/server/shared/Database/Implementation/LoginDatabase.cpp src/server/shared/Database/Implementation/LoginDatabase.h
This commit is contained in:
commit
5bf55eacfd
39 files changed
+1593
-419
No files matched your search
@@ -1911,6 +1911,11 @@ bool SpellInfo::CheckTargetCreatureType(Unit const* target) const
|
||||
else
|
||||
return true;
|
||||
}
|
||||
|
||||
// if target is magnet (i.e Grounding Totem) the check is skipped
|
||||
if (target->IsMagnet())
|
||||
return true;
|
||||
|
||||
uint32 creatureType = target->GetCreatureTypeMask();
|
||||
return !TargetCreatureType || !creatureType || (creatureType & TargetCreatureType);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user