Merge git://github.com/EQEmu/Server into Development

Conflicts:
	changelog.txt
This commit is contained in:
KayenEQ
2014-09-24 20:51:20 -04:00
39 changed files with 12731 additions and 12430 deletions
-1
View File
@@ -2860,7 +2860,6 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
case SE_HealRate:
case SE_SkillDamageTaken:
case SE_FcSpellVulnerability:
case SE_SpellTrigger:
case SE_FcTwincast:
case SE_DelayDeath:
case SE_CastOnFadeEffect: