diff options
| -rw-r--r-- | sql/updates/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp | 5 | ||||
| -rw-r--r-- | src/game/Creature.cpp | 4 | ||||
| -rw-r--r-- | src/game/Player.cpp | 6 |
4 files changed, 13 insertions, 4 deletions
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt index 2300dd5c5f3..d8b198cb6e2 100644 --- a/sql/updates/CMakeLists.txt +++ b/sql/updates/CMakeLists.txt @@ -4,4 +4,6 @@ FILE(GLOB _SQL_UPDATES *.sql) INSTALL(FILES ${_SQL_UPDATES} +1234_world.sql +1236_world.sql DESTINATION share/trinity/sql/updates) diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp index 2f8e2738fee..31485690e46 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp @@ -175,7 +175,10 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI Creature *channeler = (Creature*)Unit::GetUnit(*m_creature, Channelers[i]); 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); - Channelers[i] = channeler->GetGUID(); + if(channeler) + Channelers[i] = channeler->GetGUID(); + else + Channelers[i] = 0; } } diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index db502d2cc25..edf32d19cf2 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -355,8 +355,8 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData *data ) if(isTotem() || isTrigger() || GetCreatureType() == CREATURE_TYPE_CRITTER) SetReactState(REACT_PASSIVE); - else if(isCivilian()) - SetReactState(REACT_DEFENSIVE); + /*else if(isCivilian()) + SetReactState(REACT_DEFENSIVE);*/ else SetReactState(REACT_AGGRESSIVE); diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 050ae12b818..28080c58b6d 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -18690,7 +18690,7 @@ void Player::UpdateVisibilityOf(T* target, UpdateData& data, std::set<WorldObjec #endif } } - else + else if(visibleNow.size() < 30) { if(target->isVisibleForInState(this,false)) { @@ -20073,7 +20073,11 @@ void Player::StopCastingBindSight() if(WorldObject* target = GetViewpoint()) { if(target->isType(TYPEMASK_UNIT)) + { ((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()); + } } } |