Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge. (spell parts skipped)

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-06-01 15:02:58 -05:00
parent 9cadc5d147 dd99399424
commit 999b49201a
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp
View File

@@ -46,8 +46,8 @@ enum Spells
SPELL_CORROSION = 45866,
SPELL_GAS_NOVA = 45855,
SPELL_ENCAPSULATE_CHANNEL = 45661,
SPELL_ENCAPSULATE_EFFECT = 45665,
SPELL_ENCAPSULATE_AOE = 45662,
// SPELL_ENCAPSULATE_EFFECT = 45665,
// SPELL_ENCAPSULATE_AOE = 45662,
//Flight phase
SPELL_VAPOR_SELECT = 45391, // fel to player, force cast 45392, 50000y selete target
@@ -474,7 +474,6 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
if(Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true))
{
m_creature->CastSpell(target, SPELL_ENCAPSULATE_CHANNEL, false);
target->CastSpell(target, SPELL_ENCAPSULATE_EFFECT, true);// linked aura, need core patch to remove this hack
Timer[EVENT_ENCAPSULATE] = 25000 + rand()%5 * 1000;
}break;
case EVENT_FLIGHT:

2
src/game/Object.h
View File

@@ -431,7 +431,7 @@ class TRINITY_DLL_SPEC WorldObject : public Object
float GetObjectSize() const
{
return ( m_valuesCount > UNIT_FIELD_BOUNDINGRADIUS ) ? m_floatValues[UNIT_FIELD_BOUNDINGRADIUS] : DEFAULT_WORLD_OBJECT_SIZE;
return ( m_valuesCount > UNIT_FIELD_COMBATREACH ) ? m_floatValues[UNIT_FIELD_COMBATREACH] : DEFAULT_WORLD_OBJECT_SIZE;
}
bool IsPositionValid() const;
void UpdateGroundPositionZ(float x, float y, float &z) const;