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:
megamage
2009-03-22 11:37:59 -06:00
parent ae7a8a0971 763c81de3c
commit 708449298e
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/CMakeLists.txt
+2
View File
@@ -4,4 +4,6 @@ FILE(GLOB _SQL_UPDATES *.sql)
INSTALL(FILES INSTALL(FILES
${_SQL_UPDATES} ${_SQL_UPDATES}
1234_world.sql
1236_world.sql
DESTINATION share/trinity/sql/updates) DESTINATION share/trinity/sql/updates)
src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
+4 -1
View File
@@ -175,7 +175,10 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
Creature *channeler = (Creature*)Unit::GetUnit(*m_creature, Channelers[i]); Creature *channeler = (Creature*)Unit::GetUnit(*m_creature, Channelers[i]);
if(!channeler || channeler->isDead()) if(!channeler || channeler->isDead())
channeler = m_creature->SummonCreature(ENTRY_CHANNELER,ShadowmoonChannelers[i][0],ShadowmoonChannelers[i][1],ShadowmoonChannelers[i][2],ShadowmoonChannelers[i][3],TEMPSUMMON_CORPSE_TIMED_DESPAWN,300000); channeler = m_creature->SummonCreature(ENTRY_CHANNELER,ShadowmoonChannelers[i][0],ShadowmoonChannelers[i][1],ShadowmoonChannelers[i][2],ShadowmoonChannelers[i][3],TEMPSUMMON_CORPSE_TIMED_DESPAWN,300000);
Channelers[i] = channeler->GetGUID(); if(channeler)
Channelers[i] = channeler->GetGUID();
else
Channelers[i] = 0;
} }
} }
src/game/Creature.cpp
+2 -2
View File
@@ -355,8 +355,8 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData *data )
if(isTotem() || isTrigger() if(isTotem() || isTrigger()
|| GetCreatureType() == CREATURE_TYPE_CRITTER) || GetCreatureType() == CREATURE_TYPE_CRITTER)
SetReactState(REACT_PASSIVE); SetReactState(REACT_PASSIVE);
else if(isCivilian()) /*else if(isCivilian())
SetReactState(REACT_DEFENSIVE); SetReactState(REACT_DEFENSIVE);*/
else else
SetReactState(REACT_AGGRESSIVE); SetReactState(REACT_AGGRESSIVE);
src/game/Player.cpp
+5 -1
View File
@@ -18690,7 +18690,7 @@ void Player::UpdateVisibilityOf(T* target, UpdateData& data, std::set<WorldObjec
#endif #endif
} }
} }
else else if(visibleNow.size() < 30)
{ {
if(target->isVisibleForInState(this,false)) if(target->isVisibleForInState(this,false))
{ {
@@ -20073,7 +20073,11 @@ void Player::StopCastingBindSight()
if(WorldObject* target = GetViewpoint()) if(WorldObject* target = GetViewpoint())
{ {
if(target->isType(TYPEMASK_UNIT)) if(target->isType(TYPEMASK_UNIT))
{
((Unit*)target)->RemoveAuraTypeByCaster(SPELL_AURA_BIND_SIGHT, GetGUID()); ((Unit*)target)->RemoveAuraTypeByCaster(SPELL_AURA_BIND_SIGHT, GetGUID());
((Unit*)target)->RemoveAuraTypeByCaster(SPELL_AURA_MOD_POSSESS, GetGUID());
((Unit*)target)->RemoveAuraTypeByCaster(SPELL_AURA_MOD_POSSESS_PET, GetGUID());
}
} }
} }