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

Conflicts:
	changelog.txt
	common/eq_packet_structs.h
	common/patches/underfoot_structs.h
	common/spdat.h
	zone/effects.cpp
	zone/mob.cpp
	zone/spells.cpp
This commit is contained in:
KayenEQ
2014-11-10 10:22:50 -05:00
4 changed files with 11 additions and 5 deletions
+2 -1
View File
@@ -2175,7 +2175,8 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16
break;
}
case TargetRing:{
case TargetRing:
{
entity_list.AESpell(this, nullptr, spell_id, false, resist_adjust);
break;
}