Need serious help! Spellls causing crashes! 1585

[Secrets]

Originally Posted by Irreverent

I'm sorry its 1589.

I also went through ALL of my tables and all the contents & columns match up.

I am truely at a loss and this is severly hurting the playability on the server.

I have this fixed on EZ, here's a diff

KLS was supposed to fix it but must've forgot about it; i'll remind someone with commit access.

Index: spell_effects.cpp
===================================================================
--- spell_effects.cpp	(revision 1589)
+++ spell_effects.cpp	(working copy)
@@ -934,13 +934,12 @@
 				uint32 buff_count = GetMaxTotalSlots();
 				for(slot = 0; slot < buff_count; slot++)
 				{
-					if(spells[buffs[slot].spellid].dispel_flag > 0)
-						continue;
 
 					if
 					(
 						buffs[slot].spellid != SPELL_UNKNOWN &&
-						buffs[slot].durationformula != DF_Permanent
+						buffs[slot].durationformula != DF_Permanent &&
+						spells[buffs[slot].spellid].dispel_flag > 0
 				    )
 				    {
 						BuffFadeBySlot(slot);
@@ -959,15 +958,13 @@
 				uint32 buff_count = GetMaxTotalSlots();
 				for(slot = 0; slot < buff_count; slot++)
 				{
-					if(spells[buffs[slot].spellid].dispel_flag > 0)
-						continue;
-
 					if
-					(
+						(
 						buffs[slot].spellid != SPELL_UNKNOWN &&
 						buffs[slot].durationformula != DF_Permanent &&
-				    	IsDetrimentalSpell(buffs[slot].spellid)
-					)
+				    	IsDetrimentalSpell(buffs[slot].spellid) &&
+						spells[buffs[slot].spellid].dispel_flag > 0
+						)
 				    {
 						BuffFadeBySlot(slot);
 						slot = buff_count;