Merge branch '3.3.5' into 4.3.4
Conflicts: sql/base/auth_database.sql sql/updates/world/2015_08_29_00_world.sql sql/updates/world/2015_08_29_01_world.sql sql/updates/world/2015_08_30_00_world.sql sql/updates/world/2015_08_31_01_world.sql sql/updates/world/2015_09_02_00_world.sql sql/updates/world/2015_09_02_01_world.sql sql/updates/world/2015_09_02_04_world.sql sql/updates/world/2015_09_03_00_world.sql sql/updates/world/2015_09_03_01_world.sql sql/updates/world/2015_09_03_02_world.sql sql/updates/world/2015_09_03_03_world.sql sql/updates/world/2015_09_03_04_world.sql sql/updates/world/2015_09_03_06_world.sql sql/updates/world/2015_09_03_07_world.sql sql/updates/world/2015_09_03_08_world.sql sql/updates/world/2015_09_03_09_world.sql sql/updates/world/2015_09_03_10_world.sql sql/updates/world/2015_09_03_11_world.sql sql/updates/world/2015_09_04_00_world.sql sql/updates/world/2015_09_04_01_world.sql sql/updates/world/2015_09_04_02_world.sql sql/updates/world/2015_09_04_03_world.sql sql/updates/world/2015_09_07_00_world.sql sql/updates/world/2015_09_07_01_world.sql sql/updates/world/2015_09_07_02_world.sql sql/updates/world/2015_09_07_03_world.sql sql/updates/world/2015_09_07_04_world.sql sql/updates/world/2015_09_07_05_world.sql sql/updates/world/2015_09_08_00_world.sql src/common/Collision/Management/MMapManager.cpp src/common/Cryptography/Authentication/AuthCrypt.cpp src/common/Cryptography/Authentication/AuthCrypt.h src/common/Cryptography/HMACSHA1.cpp src/common/Cryptography/HMACSHA1.h src/server/CMakeLists.txt src/server/collision/CMakeLists.txt src/server/game/CMakeLists.txt src/server/game/Entities/Object/ObjectGuid.h src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Entities/Unit/Unit.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Quests/QuestDef.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/Auras/SpellAuras.cpp src/server/game/World/World.cpp src/server/scripts/CMakeLists.txt src/server/scripts/Commands/cs_cheat.cpp src/server/scripts/Commands/cs_debug.cpp src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp src/server/scripts/EasternKingdoms/zone_hinterlands.cpp src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp src/server/scripts/Spells/spell_mage.cpp src/server/worldserver/CMakeLists.txt src/server/worldserver/Main.cpp
This commit is contained in:
commit
221f1405b6
252 files changed
+5466
-5950
No files matched your search
@@ -319,6 +319,11 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state)
|
||||
return false;
|
||||
}
|
||||
|
||||
bool InstanceScript::_SkipCheckRequiredBosses(Player const* player /*= nullptr*/) const
|
||||
{
|
||||
return player && player->GetSession()->HasPermission(rbac::RBAC_PERM_SKIP_CHECK_INSTANCE_REQUIRED_BOSSES);
|
||||
}
|
||||
|
||||
void InstanceScript::Load(char const* data)
|
||||
{
|
||||
if (!data)
|
||||
|
||||
Reference in new issue
Block a user