Merge commit 'b58b29c9581327129daaf43b9c368810db850771' - [11700] into 400

[newsbot]

Автор: Xfurry


<pre>m sql/mangos.sql
+ sql/updates/11646_01_mangos_item_expire_convert.sql
+ sql/updates/11661_01_mangos_spell_proc_event.sql
+ sql/updates/11664_01_mangos_spell_proc_event.sql
+ sql/updates/11673_01_mangos_spell_proc_event.sql
+ sql/updates/11678_01_mangos_spell_proc_event.sql
+ sql/updates/11679_01_mangos_spell_proc_event.sql
+ sql/updates/11680_01_mangos_spell_proc_event.sql
+ sql/updates/11681_01_mangos_spell_proc_event.sql
+ sql/updates/11682_01_mangos_spell_proc_event.sql
+ sql/updates/11685_01_mangos_spell_proc_event.sql
+ sql/updates/11686_01_mangos_spell_proc_event.sql
+ sql/updates/11687_01_mangos_spell_proc_event.sql
+ sql/updates/11688_01_mangos_spell_proc_event.sql
+ sql/updates/11689_01_mangos_spell_proc_event.sql
+ sql/updates/11690_01_mangos_spell_proc_event.sql
m src/framework/Utilities/UnorderedMapSet.h
m src/game/BattleGround.cpp
m src/game/BattleGround.h
m src/game/BattleGroundHandler.cpp
m src/game/BattleGroundMgr.cpp
m src/game/CreatureEventAIMgr.cpp
m src/game/GameObject.cpp
m src/game/GameObject.h
m src/game/Item.cpp
m src/game/ItemHandler.cpp
m src/game/ItemPrototype.h
m src/game/Level2.cpp
m src/game/MailHandler.cpp
m src/game/Object.cpp
m src/game/ObjectGuid.h
m src/game/ObjectMgr.cpp
m src/game/ObjectMgr.h
m src/game/ObjectPosSelector.cpp
m src/game/ObjectPosSelector.h
m src/game/PetHandler.cpp
m src/game/Player.cpp
m src/game/Player.h
m src/game/SharedDefines.h
m src/game/Spell.cpp
m src/game/Spell.h
m src/game/SpellAuras.cpp
m src/game/SpellAuras.h
m src/game/SpellEffects.cpp
m src/game/SpellMgr.cpp
m src/game/SpellMgr.h
m src/game/Unit.cpp
m src/game/Unit.h
m src/game/UnitAuraProcHandler.cpp
m src/game/World.cpp
m src/game/World.h
m src/mangosd/mangosd.conf.dist.in
m src/shared/revision_nr.h
m src/shared/revision_sql.h
</pre>
<pre style='white-space:pre-wrap;width:81ex'>Merge commit 'b58b29c9581327129daaf43b9c368810db850771' - [11700] into 400</pre>


Подробнее...