josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source 
--HG--
branch : trunk
This commit is contained in:
silver1ce
2010-01-06 12:27:52 +02:00
parent 6933199257 c454c2a15a
commit 15618563ef
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/6898_world_spell_proc_event.sql
+1 -1
View File
@@ -1,2 +1,2 @@
DELETE FROM spell_proc_event WHERE entry = 58387; DELETE FROM spell_proc_event WHERE entry = 58387;
INSERT INTO spell_proc_event VALUES(58387, 0, 4, 16384, 64, 0, 16, 0, 0, 0, 0); -- Glyph of Sunder Armor INSERT INTO spell_proc_event VALUES(58387, 0, 4, 16384, 64, 0, 16, 0, 0, 0, 0); -- Glyph of Sunder Armor
src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp
+5
View File
@@ -632,6 +632,11 @@ struct TRINITY_DLL_DECL npc_brann_hosAI : public npc_escortAI
bIsLowHP = true; bIsLowHP = true;
} else if (bIsLowHP && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) > 30) } else if (bIsLowHP && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) > 30)
bIsLowHP = false; bIsLowHP = false;
if (!UpdateVictim())
return;
DoMeleeAttackIfReady();
} }
}; };
src/game/Spell.cpp
+2 -2
View File
@@ -1099,9 +1099,9 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
} }
} }
// Do not take combo points on dodge // Do not take combo points on dodge and miss
if (m_needComboPoints && m_targets.getUnitTargetGUID() == target->targetGUID) if (m_needComboPoints && m_targets.getUnitTargetGUID() == target->targetGUID)
if( missInfo != SPELL_MISS_NONE && missInfo != SPELL_MISS_MISS) if (missInfo != SPELL_MISS_NONE)
m_needComboPoints = false; m_needComboPoints = false;
// Trigger info was not filled in spell::preparedatafortriggersystem - we do it now // Trigger info was not filled in spell::preparedatafortriggersystem - we do it now