Merge branch 'master' of https://github.com/EQEmu/Server

Conflicts:
	changelog.txt

zone/merc.cpp

@@ -37,9 +37,11 @@ Merc::Merc(const NPCType* d, float x, float y, float z, float heading)
 	_baseFR = d->FR;
 	_basePR = d->PR;
 	_baseCorrup = d->Corrup;
+	_OwnerClientVersion = EQClientTitanium;
 	RestRegenHP = 0;
 	RestRegenMana = 0;
 	RestRegenEndurance = 0;
+	cur_end = 0;
 
 	_medding = false;
 	_suspended = false;
@@ -2750,7 +2752,7 @@ int16 Merc::GetFocusEffect(focusType type, uint16 spell_id) {
 		int16 focus_max_real = 0;
 
 		//item focus
-		for(int x=0; x<=MAX_WORN_INVENTORY; x++)
+		for(int x  =0; x < MAX_WORN_INVENTORY; ++x)
 		{
 			TempItem = NULL;
 			if (equipment[x] == 0)

zone/mob.cpp

@@ -274,7 +274,7 @@ Mob::Mob(const char*   in_name,
 	
 	memset(&itembonuses, 0, sizeof(StatBonuses));
 	memset(&spellbonuses, 0, sizeof(StatBonuses));
-	//memset(&aabonuses, 0, sizeof(StatBonuses)); //don't need this until we start using Client::CalcAABonuses()
+	memset(&aabonuses, 0, sizeof(StatBonuses));
 	spellbonuses.AggroRange = -1;
 	spellbonuses.AssistRange = -1;
 	pLastChange = 0;

zone/spells.cpp

@@ -2564,6 +2564,22 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
 		if(effect1 != effect2)
 			continue;
 
+        /*
+        Skip check if effect is SE_Limit*
+        skip checking effect2 since we know they are equal
+        */
+        if(effect1 == SE_LimitMaxLevel ||
+            effect1 == SE_LimitResist ||
+            effect1 == SE_LimitTarget ||
+            effect1 == SE_LimitEffect ||
+            effect1 == SE_LimitSpellType ||
+            effect1 == SE_LimitSpell ||
+            effect1 == SE_LimitMinDur ||
+            effect1 == SE_LimitInstant ||
+            effect1 == SE_LimitMinLevel ||
+            effect1 == SE_LimitCastTime)
+            continue;
+
 		/*
 		If target is a npc and caster1 and caster2 exist
 		If Caster1 isn't the same as Caster2 and the effect is a DoT then ignore it.

zone/zonedb.cpp

@@ -1885,7 +1885,6 @@ void ZoneDatabase::LoadMercBuffs(Merc *merc) {
 	}
 
 	safe_delete_array(Query);
-	Query = 0;
 
 	if(errorMessage.empty() && BuffsLoaded) {
 		if(!database.RunQuery(Query, MakeAnyLenString(&Query, "DELETE FROM merc_buffs WHERE MercId = %u", merc->GetMercID()), TempErrorMessageBuffer)) {