diff options
Diffstat (limited to 'src')
277 files changed, 625 insertions, 654 deletions
diff --git a/src/authserver/Main.cpp b/src/authserver/Main.cpp index e52771f448..8594f301e1 100644 --- a/src/authserver/Main.cpp +++ b/src/authserver/Main.cpp @@ -242,21 +242,21 @@ extern int main(int argc, char** argv) CPU_SET(i, &mask); if (sched_setaffinity(0, sizeof(mask), &mask)) - sLog->outError("server.authserver", "Can't set used processors (hex): %x, error: %s", affinity, strerror(errno)); + sLog->outError("Can't set used processors (hex): %x, error: %s", affinity, strerror(errno)); else { CPU_ZERO(&mask); sched_getaffinity(0, sizeof(mask), &mask); - sLog->outString("server.authserver", "Using processors (bitmask, hex): %lx", *(__cpu_mask*)(&mask)); + sLog->outString("Using processors (bitmask, hex): %lx", *(__cpu_mask*)(&mask)); } } if (highPriority) { if (setpriority(PRIO_PROCESS, 0, PROCESS_HIGH_PRIORITY)) - sLog->outError("server.authserver", "Can't set authserver process priority class, error: %s", strerror(errno)); + sLog->outError("Can't set authserver process priority class, error: %s", strerror(errno)); else - sLog->outString("server.authserver", "authserver process priority class set to %i", getpriority(PRIO_PROCESS, 0)); + sLog->outString("authserver process priority class set to %i", getpriority(PRIO_PROCESS, 0)); } #endif diff --git a/src/game/ArenaSpectator/ArenaSpectator.h b/src/game/ArenaSpectator/ArenaSpectator.h index 6ba1d63ffd..d9c9dc6b47 100644 --- a/src/game/ArenaSpectator/ArenaSpectator.h +++ b/src/game/ArenaSpectator/ArenaSpectator.h @@ -205,12 +205,8 @@ namespace ArenaSpectator if (effMask & (1<<i)) { AuraType at = aura->GetEffect(i)->GetAuraType(); - if ((aura->GetEffect(i)->GetAmount() && (aura->GetSpellInfo()->IsPositive() || targetGUID != aura->GetCasterGUID())) || - at == SPELL_AURA_MECHANIC_IMMUNITY || - at == SPELL_AURA_EFFECT_IMMUNITY || - at == SPELL_AURA_STATE_IMMUNITY || - at == SPELL_AURA_SCHOOL_IMMUNITY || - at == SPELL_AURA_DISPEL_IMMUNITY) + if (aura->GetEffect(i)->GetAmount() && (aura->GetSpellInfo()->IsPositive() || targetGUID != aura->GetCasterGUID()) || + at == SPELL_AURA_MECHANIC_IMMUNITY || at == SPELL_AURA_EFFECT_IMMUNITY || at == SPELL_AURA_STATE_IMMUNITY || at == SPELL_AURA_SCHOOL_IMMUNITY || at == SPELL_AURA_DISPEL_IMMUNITY) return true; } } diff --git a/src/game/Battlegrounds/BattlegroundMgr.cpp b/src/game/Battlegrounds/BattlegroundMgr.cpp index f513cfd9ac..26928303d9 100644 --- a/src/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/game/Battlegrounds/BattlegroundMgr.cpp @@ -571,7 +571,7 @@ void BattlegroundMgr::CreateInitialBattlegrounds() { uint32 oldMSTime = getMSTime(); // 0 1 2 3 4 5 6 7 8 9 10 11 - QueryResult result = WorldDatabase.Query("SELECT id, MinPlayersPerTeam, MaxPlayersPerTeam, MinLvl, MaxLvl, AllianceStartLoc, AllianceStartO, HordeStartLoc, HordeStartO, StartMaxDist, Weight, ScriptName FROM battleground_template"); + QueryResult result = WorldDatabase.Query("SELECT ID, MinPlayersPerTeam, MaxPlayersPerTeam, MinLvl, MaxLvl, AllianceStartLoc, AllianceStartO, HordeStartLoc, HordeStartO, StartMaxDist, Weight, ScriptName FROM battleground_template"); if (!result) { diff --git a/src/game/Battlegrounds/BattlegroundQueue.cpp b/src/game/Battlegrounds/BattlegroundQueue.cpp index 3ec64eba97..8d85fc6713 100644 --- a/src/game/Battlegrounds/BattlegroundQueue.cpp +++ b/src/game/Battlegrounds/BattlegroundQueue.cpp @@ -378,8 +378,8 @@ void BattlegroundQueue::FillPlayersToBG(const int32 aliFree, const int32 hordeFr // quick check if nothing we can do: if (!sBattlegroundMgr->isTesting()) - if ((aliFree > hordeFree && m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE].empty()) || - (hordeFree > aliFree && m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_HORDE].empty())) + if (aliFree > hordeFree && m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE].empty() || + hordeFree > aliFree && m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_HORDE].empty()) return; // ally: at first fill as much as possible @@ -434,8 +434,8 @@ void BattlegroundQueue::FillPlayersToBGWithSpecific(const int32 aliFree, const i // quick check if nothing we can do: if (!sBattlegroundMgr->isTesting()) - if ((m_QueuedGroups[thisBracketId][BG_QUEUE_NORMAL_ALLIANCE].empty() && specificQueue->m_QueuedGroups[specificBracketId][BG_QUEUE_NORMAL_ALLIANCE].empty()) || - (m_QueuedGroups[thisBracketId][BG_QUEUE_NORMAL_HORDE].empty() && specificQueue->m_QueuedGroups[specificBracketId][BG_QUEUE_NORMAL_HORDE].empty())) + if (m_QueuedGroups[thisBracketId][BG_QUEUE_NORMAL_ALLIANCE].empty() && specificQueue->m_QueuedGroups[specificBracketId][BG_QUEUE_NORMAL_ALLIANCE].empty() || + m_QueuedGroups[thisBracketId][BG_QUEUE_NORMAL_HORDE].empty() && specificQueue->m_QueuedGroups[specificBracketId][BG_QUEUE_NORMAL_HORDE].empty()) return; // copy groups from both queues to new joined container diff --git a/src/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/game/Battlegrounds/Zones/BattlegroundAB.cpp index 779ead49ea..d58f6b5431 100644 --- a/src/game/Battlegrounds/Zones/BattlegroundAB.cpp +++ b/src/game/Battlegrounds/Zones/BattlegroundAB.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "BattlegroundAB.h" diff --git a/src/game/Battlegrounds/Zones/BattlegroundAB.h b/src/game/Battlegrounds/Zones/BattlegroundAB.h index 654937a721..203701247e 100644 --- a/src/game/Battlegrounds/Zones/BattlegroundAB.h +++ b/src/game/Battlegrounds/Zones/BattlegroundAB.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef __BATTLEGROUNDAB_H diff --git a/src/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/game/Battlegrounds/Zones/BattlegroundEY.cpp index 8aaf50ce9e..d37596cb3f 100644 --- a/src/game/Battlegrounds/Zones/BattlegroundEY.cpp +++ b/src/game/Battlegrounds/Zones/BattlegroundEY.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "BattlegroundEY.h" diff --git a/src/game/Battlegrounds/Zones/BattlegroundEY.h b/src/game/Battlegrounds/Zones/BattlegroundEY.h index a42c44bab8..97993e5572 100644 --- a/src/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/game/Battlegrounds/Zones/BattlegroundEY.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef __BATTLEGROUNDEY_H diff --git a/src/game/Battlegrounds/Zones/BattlegroundRV.cpp b/src/game/Battlegrounds/Zones/BattlegroundRV.cpp index 90d64d80fb..590b45e705 100644 --- a/src/game/Battlegrounds/Zones/BattlegroundRV.cpp +++ b/src/game/Battlegrounds/Zones/BattlegroundRV.cpp @@ -47,8 +47,7 @@ void BattlegroundRV::CheckPositionForUnit(Unit* unit) { float groundZ_vmap = unit->GetMap()->GetHeight(unit->GetPositionX(), unit->GetPositionY(), 37.0f, true, 50.0f); float groundZ_dyntree = unit->GetMap()->GetDynamicMapTree().getHeight(unit->GetPositionX(), unit->GetPositionY(), 37.0f, 50.0f, unit->GetPhaseMask()); - if ((groundZ_vmap > 28.0f && groundZ_vmap < 29.0f) || - (groundZ_dyntree > 28.0f && groundZ_dyntree < 37.0f)) + if (groundZ_vmap > 28.0f && groundZ_vmap < 29.0f || groundZ_dyntree > 28.0f && groundZ_dyntree < 37.0f) { float groundZ = std::max<float>(groundZ_vmap, groundZ_dyntree); if (unit->GetPositionZ() < groundZ - 0.2f || unit->GetPositionZ() > groundZ + 3.5f) diff --git a/src/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/game/Battlegrounds/Zones/BattlegroundWS.cpp index 96c344a1c6..d3d14a4a49 100644 --- a/src/game/Battlegrounds/Zones/BattlegroundWS.cpp +++ b/src/game/Battlegrounds/Zones/BattlegroundWS.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "BattlegroundWS.h" diff --git a/src/game/Battlegrounds/Zones/BattlegroundWS.h b/src/game/Battlegrounds/Zones/BattlegroundWS.h index a5aee6fbb6..6faed44f2c 100644 --- a/src/game/Battlegrounds/Zones/BattlegroundWS.h +++ b/src/game/Battlegrounds/Zones/BattlegroundWS.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef __BATTLEGROUNDWS_H diff --git a/src/game/Chat/Channels/Channel.cpp b/src/game/Chat/Channels/Channel.cpp index 6cc674af5d..f7facedaf1 100644 --- a/src/game/Chat/Channels/Channel.cpp +++ b/src/game/Chat/Channels/Channel.cpp @@ -380,8 +380,7 @@ void Channel::KickOrBan(Player const* player, std::string const& badname, bool b return; } - if ((ban && (_channelRights.flags & CHANNEL_RIGHT_CANT_BAN)) || - (!ban && (_channelRights.flags & CHANNEL_RIGHT_CANT_KICK))) + if (ban && (_channelRights.flags & CHANNEL_RIGHT_CANT_BAN) || !ban && (_channelRights.flags & CHANNEL_RIGHT_CANT_KICK)) { WorldPacket data; MakeNotModerator(&data); @@ -649,8 +648,8 @@ void Channel::SetOwner(Player const* player, std::string const& newname) Player* newp = ObjectAccessor::FindPlayerByName(newname, false); uint64 victim = newp ? newp->GetGUID() : 0; - if (!victim || !IsOn(victim) || - (newp->GetTeamId() != player->GetTeamId() && !sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))) + if (!victim || !IsOn(victim) || newp->GetTeamId() != player->GetTeamId() && + !sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL)) { WorldPacket data; MakePlayerNotFound(&data, newname); diff --git a/src/game/Chat/Chat.cpp b/src/game/Chat/Chat.cpp index 34946bc92e..553514df83 100644 --- a/src/game/Chat/Chat.cpp +++ b/src/game/Chat/Chat.cpp @@ -246,9 +246,6 @@ bool ChatHandler::ExecuteCommandInTable(std::vector<ChatCommand> const& table, c for (uint32 i = 0; i < table.size(); ++i) { - if (table[i].Name == nullptr) - continue; - if (!hasStringAbbr(table[i].Name, cmd.c_str())) continue; @@ -257,9 +254,6 @@ bool ChatHandler::ExecuteCommandInTable(std::vector<ChatCommand> const& table, c { for (uint32 j = 0; j < table.size(); ++j) { - if (table[j].Name == nullptr) - continue; - if (!hasStringAbbr(table[j].Name, cmd.c_str())) continue; @@ -355,7 +349,7 @@ bool ChatHandler::SetDataForCommandInTable(std::vector<ChatCommand>& table, char for (uint32 i = 0; i < table.size(); i++) { // for data fill use full explicit command names - if (table[i].Name == nullptr || table[i].Name != cmd) + if (table[i].Name != cmd) continue; // select subcommand from child commands list (including "") @@ -400,7 +394,7 @@ bool ChatHandler::ParseCommands(char const* text) ASSERT(text); ASSERT(*text); - std::string fullcmd; + std::string fullcmd = text; if (m_session && AccountMgr::IsPlayerAccount(m_session->GetSecurity()) && !sWorld->getBoolConfig(CONFIG_ALLOW_PLAYER_COMMANDS)) return false; diff --git a/src/game/Chat/Chat.h b/src/game/Chat/Chat.h index d4f803ff93..dc0e6c65ca 100644 --- a/src/game/Chat/Chat.h +++ b/src/game/Chat/Chat.h @@ -28,7 +28,7 @@ class ChatCommand public: ChatCommand(char const* name, uint32 securityLevel, bool allowConsole, pHandler handler, std::string help, std::vector<ChatCommand> childCommands = std::vector<ChatCommand>()) - : Name(name), SecurityLevel(securityLevel), AllowConsole(allowConsole), Handler(handler), Help(std::move(help)), ChildCommands(std::move(childCommands)) { } + : Name(ASSERT_NOTNULL(name)), SecurityLevel(securityLevel), AllowConsole(allowConsole), Handler(handler), Help(std::move(help)), ChildCommands(std::move(childCommands)) { } char const* Name; uint32 SecurityLevel; diff --git a/src/game/DataStores/DBCStores.cpp b/src/game/DataStores/DBCStores.cpp index 9768c73ae4..ea99e4df4f 100644 --- a/src/game/DataStores/DBCStores.cpp +++ b/src/game/DataStores/DBCStores.cpp @@ -856,6 +856,11 @@ PvPDifficultyEntry const* GetBattlegroundBracketById(uint32 mapid, BattlegroundB return NULL; } +bool IsSharedDifficultyMap(uint32 mapid) +{ + return sWorld->getBoolConfig(CONFIG_INSTANCE_SHARED_ID) && (mapid == 631 || mapid == 724); +} + uint32 GetLiquidFlags(uint32 liquidType) { if (LiquidTypeEntry const* liq = sLiquidTypeStore.LookupEntry(liquidType)) diff --git a/src/game/DataStores/DBCStores.h b/src/game/DataStores/DBCStores.h index 8370d7d8f9..d69d2132b9 100644 --- a/src/game/DataStores/DBCStores.h +++ b/src/game/DataStores/DBCStores.h @@ -44,6 +44,8 @@ typedef std::map<uint32/*pair32(map, diff)*/, MapDifficulty> MapDifficultyMap; MapDifficulty const* GetMapDifficultyData(uint32 mapId, Difficulty difficulty); MapDifficulty const* GetDownscaledMapDifficultyData(uint32 mapId, Difficulty &difficulty); +bool IsSharedDifficultyMap(uint32 mapid); + uint32 GetLiquidFlags(uint32 liquidType); PvPDifficultyEntry const* GetBattlegroundBracketByLevel(uint32 mapid, uint32 level); diff --git a/src/game/DungeonFinding/LFGMgr.cpp b/src/game/DungeonFinding/LFGMgr.cpp index 034fc91825..497eeeee7c 100644 --- a/src/game/DungeonFinding/LFGMgr.cpp +++ b/src/game/DungeonFinding/LFGMgr.cpp @@ -182,11 +182,12 @@ void LFGMgr::LoadLFGDungeons(bool reload /* = false */) } // Fill teleport locations from DB - QueryResult result = WorldDatabase.Query("SELECT dungeonId, position_x, position_y, position_z, orientation FROM lfg_entrances"); + // 0 1 2 3 4 + QueryResult result = WorldDatabase.Query("SELECT dungeonId, position_x, position_y, position_z, orientation FROM lfg_dungeon_template"); if (!result) { - sLog->outError(">> Loaded 0 lfg entrance positions. DB table `lfg_entrances` is empty!"); + sLog->outError(">> Loaded 0 lfg entrance positions. DB table `lfg_dungeon_template` is empty!"); return; } @@ -199,7 +200,7 @@ void LFGMgr::LoadLFGDungeons(bool reload /* = false */) LFGDungeonContainer::iterator dungeonItr = LfgDungeonStore.find(dungeonId); if (dungeonItr == LfgDungeonStore.end()) { - sLog->outError("table `lfg_entrances` contains coordinates for wrong dungeon %u", dungeonId); + sLog->outError("table `lfg_dungeon_template` contains coordinates for wrong dungeon %u", dungeonId); continue; } diff --git a/src/game/Entities/GameObject/GameObject.cpp b/src/game/Entities/GameObject/GameObject.cpp index 6e9f293ffc..b6931c5f70 100644 --- a/src/game/Entities/GameObject/GameObject.cpp +++ b/src/game/Entities/GameObject/GameObject.cpp @@ -23,6 +23,7 @@ #include "UpdateFieldFlags.h" #include "World.h" #include "Transport.h" +#include "AccountMgr.h" GameObject::GameObject() : WorldObject(false), MovableMapObject(), m_model(NULL), m_goValue(), m_AI(NULL) @@ -2253,7 +2254,7 @@ void GameObject::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player* t return; bool forcedFlags = GetGoType() == GAMEOBJECT_TYPE_CHEST && GetGOInfo()->chest.groupLootRules && HasLootRecipient(); - bool targetIsGM = target->IsGameMaster() && target->GetSession()->GetSecurity() >= SEC_GAMEMASTER; + bool targetIsGM = target->IsGameMaster() && AccountMgr::IsGMAccount(target->GetSession()->GetSecurity()); ByteBuffer fieldBuffer; diff --git a/src/game/Entities/Object/Object.cpp b/src/game/Entities/Object/Object.cpp index 2afa765297..34fb518497 100644 --- a/src/game/Entities/Object/Object.cpp +++ b/src/game/Entities/Object/Object.cpp @@ -2081,7 +2081,7 @@ TempSummon* Map::SummonCreature(uint32 entry, Position const& pos, SummonPropert summon->SetHomePosition(pos); summon->InitStats(duration); - AddToMap(summon->ToCreature(), (IS_PLAYER_GUID(summon->GetOwnerGUID()) || (summoner && summoner->GetTransport()))); + AddToMap(summon->ToCreature(), (IS_PLAYER_GUID(summon->GetOwnerGUID()) || summoner && summoner->GetTransport())); summon->InitSummon(); //ObjectAccessor::UpdateObjectVisibility(summon); diff --git a/src/game/Entities/Pet/Pet.cpp b/src/game/Entities/Pet/Pet.cpp index 8bb6fdaeb8..d1209225f3 100644 --- a/src/game/Entities/Pet/Pet.cpp +++ b/src/game/Entities/Pet/Pet.cpp @@ -977,6 +977,9 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) // Can be summon and guardian if (GetEntry() == NPC_RISEN_GHOUL) { + // 100% energy after summon + SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY)); + // xinef: fixes orc death knight command racial if (m_owner->getRace() == RACE_ORC) CastSpell(this, SPELL_ORC_RACIAL_COMMAND, true, NULL, NULL, m_owner->GetGUID()); @@ -2240,4 +2243,4 @@ void Pet::RemoveSpellCooldown(uint32 spell_id, bool update /* = false */) playerOwner->SendDirectMessage(&data); } } -}
\ No newline at end of file +} diff --git a/src/game/Entities/Player/Player.cpp b/src/game/Entities/Player/Player.cpp index 0665c04ecd..3ecdd51bc2 100644 --- a/src/game/Entities/Player/Player.cpp +++ b/src/game/Entities/Player/Player.cpp @@ -1015,6 +1015,9 @@ bool Player::Create(uint32 guidlow, CharacterCreateInfo* createInfo) SetObjectScale(1.0f); + m_realRace = createInfo->Race; // set real race flag + m_race = createInfo->Race; // set real race flag + setFactionForRace(createInfo->Race); if (!IsValidGender(createInfo->Gender)) @@ -1276,7 +1279,7 @@ bool Player::StoreNewItemInBestSlots(uint32 titem_id, uint32 titem_amount) } // item can't be added - sLog->outError("STORAGE: Can't equip or store initial item %u for race %u class %u, error msg = %u", titem_id, getRace(), getClass(), msg); + sLog->outError("STORAGE: Can't equip or store initial item %u for race %u class %u, error msg = %u", titem_id, getRace(true), getClass(), msg); return false; } @@ -2986,14 +2989,14 @@ void Player::SetGameMaster(bool on) if (on) { m_ExtraFlags |= PLAYER_EXTRA_GM_ON; - if (GetSession()->GetSecurity() >= SEC_GAMEMASTER) + if (AccountMgr::IsGMAccount(GetSession()->GetSecurity())) setFaction(35); SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_GM); SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_ALLOW_CHEAT_SPELLS); if (Pet* pet = GetPet()) { - if (GetSession()->GetSecurity() >= SEC_GAMEMASTER) + if (AccountMgr::IsGMAccount(GetSession()->GetSecurity())) pet->setFaction(35); pet->getHostileRefManager().setOnlineOfflineState(false); } @@ -3005,7 +3008,7 @@ void Player::SetGameMaster(bool on) CombatStopWithPets(); SetPhaseMask(uint32(PHASEMASK_ANYWHERE), false); // see and visible in all phases - m_serverSideVisibilityDetect.SetValue(SERVERSIDE_VISIBILITY_GM, GetSession()->GetSecurity() == SEC_MODERATOR ? SEC_PLAYER : GetSession()->GetSecurity()); + m_serverSideVisibilityDetect.SetValue(SERVERSIDE_VISIBILITY_GM, GetSession()->GetSecurity()); } else { @@ -3022,7 +3025,7 @@ void Player::SetGameMaster(bool on) SetPhaseMask(newPhase, false); m_ExtraFlags &= ~ PLAYER_EXTRA_GM_ON; - setFactionForRace(getRace()); + setFactionForRace(getRace(true)); RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_GM); RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_ALLOW_CHEAT_SPELLS); @@ -3207,7 +3210,7 @@ void Player::GiveLevel(uint8 level) guild->UpdateMemberData(this, GUILD_MEMBER_DATA_LEVEL, level); PlayerLevelInfo info; - sObjectMgr->GetPlayerLevelInfo(getRace(), getClass(), level, &info); + sObjectMgr->GetPlayerLevelInfo(getRace(true), getClass(), level, &info); PlayerClassLevelInfo classInfo; sObjectMgr->GetPlayerClassLevelInfo(getClass(), level, &classInfo); @@ -3321,7 +3324,7 @@ void Player::InitStatsForLevel(bool reapplyMods) sObjectMgr->GetPlayerClassLevelInfo(getClass(), getLevel(), &classInfo); PlayerLevelInfo info; - sObjectMgr->GetPlayerLevelInfo(getRace(), getClass(), getLevel(), &info); + sObjectMgr->GetPlayerLevelInfo(getRace(true), getClass(), getLevel(), &info); SetUInt32Value(PLAYER_FIELD_MAX_LEVEL, sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)); SetUInt32Value(PLAYER_NEXT_LEVEL_XP, sObjectMgr->GetXPForLevel(getLevel())); @@ -4188,8 +4191,8 @@ void Player::removeSpell(uint32 spellId, uint8 removeSpecMask, bool onlyTemporar continue; // pussywizard: don't understand why whole skill is removed when just single spell from it is removed - if ((_spell_idx->second->learnOnGetSkill == ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL && pSkill->categoryId != SKILL_CATEGORY_CLASS) || // pussywizard: don't unlearn class skills - ((pSkill->id == SKILL_LOCKPICKING || pSkill->id == SKILL_RUNEFORGING) && _spell_idx->second->max_value == 0)) + if (_spell_idx->second->learnOnGetSkill == ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL && pSkill->categoryId != SKILL_CATEGORY_CLASS || // pussywizard: don't unlearn class skills + (pSkill->id == SKILL_LOCKPICKING || pSkill->id == SKILL_RUNEFORGING) && _spell_idx->second->max_value == 0) { // not reset skills for professions and racial abilities if ((pSkill->categoryId == SKILL_CATEGORY_SECONDARY || pSkill->categoryId == SKILL_CATEGORY_PROFESSION) && (IsProfessionSkill(pSkill->id) || _spell_idx->second->racemask != 0)) @@ -5097,7 +5100,7 @@ void Player::BuildPlayerRepop() data.append(GetPackGUID()); GetSession()->SendPacket(&data); - if (getRace() == RACE_NIGHTELF) + if (getRace(true) == RACE_NIGHTELF) CastSpell(this, 20584, true); CastSpell(this, 8326, true); @@ -17384,6 +17387,9 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) bytes0 |= Gender << 16; // gender SetUInt32Value(UNIT_FIELD_BYTES_0, bytes0); + m_realRace = fields[3].GetUInt8(); // set real race + m_race = fields[3].GetUInt8(); // set real race + SetUInt32Value(UNIT_FIELD_LEVEL, fields[6].GetUInt8()); SetUInt32Value(PLAYER_XP, fields[7].GetUInt32()); @@ -17432,7 +17438,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) //Need to call it to initialize m_team (m_team can be calculated from race) //Other way is to saves m_team into characters table. - setFactionForRace(getRace()); + setFactionForRace(getRace(true)); // pussywizard: create empty instance bind containers if necessary sInstanceSaveMgr->PlayerCreateBoundInstancesMaps(guid); @@ -17482,8 +17488,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) MapEntry const* mapEntry = sMapStore.LookupEntry(mapId); // pussywizard: group changed difficulty when player was offline, teleport to the enterance of new difficulty - if (mapEntry && ((mapEntry->IsNonRaidDungeon() && dungeonDiff != GetDungeonDifficulty()) || - (mapEntry->IsRaid() && raidDiff != GetRaidDifficulty()))) + if (mapEntry && (mapEntry->IsNonRaidDungeon() && dungeonDiff != GetDungeonDifficulty() || mapEntry->IsRaid() && raidDiff != GetRaidDifficulty())) { bool fixed = false; if (uint32 destInstId = sInstanceSaveMgr->PlayerGetDestinationInstanceId(this, mapId, GetDifficulty(mapEntry->IsRaid()))) @@ -17655,7 +17660,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) map = sMapMgr->CreateMap(mapId, this); if (!map) { - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(true), getClass()); mapId = info->mapId; Relocate(info->positionX, info->positionY, info->positionZ, 0.0f); sLog->outError("Player (guidlow %d) have invalid coordinates (X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.", guid, GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); @@ -19130,7 +19135,7 @@ bool Player::CheckInstanceCount(uint32 instanceId) const bool Player::_LoadHomeBind(PreparedQueryResult result) { - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(true), getClass()); if (!info) { sLog->outError("Player (Name %s) has incorrect race/class pair. Can't be loaded.", GetName().c_str()); @@ -21428,7 +21433,7 @@ void Player::InitDataForForm(bool reapplyMods) void Player::InitDisplayIds() { - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(true), getClass()); if (!info) { sLog->outError("Player %u has incorrect race/class pair. Can't init display ids.", GetGUIDLow()); @@ -22246,7 +22251,7 @@ void Player::ReportedAfkBy(Player* reporter) WorldLocation Player::GetStartPosition() const { - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(true), getClass()); uint32 mapId = info->mapId; if (getClass() == CLASS_DEATH_KNIGHT && HasSpell(50977)) return WorldLocation(0, 2352.0f, -5709.0f, 154.5f, 0.0f); @@ -22829,9 +22834,7 @@ void Player::ApplyEquipCooldown(Item* pItem) // xinef: dont apply equip cooldown if spell on item has insignificant cooldown SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellData.SpellId); - if (spellData.SpellCooldown <= 3000 && - spellData.SpellCategoryCooldown <= 3000 && - (!spellInfo || (spellInfo->RecoveryTime <= 3000 && spellInfo->CategoryRecoveryTime <= 3000))) + if (spellData.SpellCooldown <= 3000 && spellData.SpellCategoryCooldown <= 3000 && (!spellInfo || spellInfo->RecoveryTime <= 3000 && spellInfo->CategoryRecoveryTime <= 3000)) continue; // Don't replace longer cooldowns by equip cooldown if we have any. @@ -22872,7 +22875,7 @@ void Player::resetSpells() void Player::learnDefaultSpells() { // xinef: learn default race/class spells - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); + PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(true), getClass()); for (PlayerCreateInfoSpells::const_iterator itr = info->spell.begin(); itr != info->spell.end(); ++itr) _addSpell(*itr, SPEC_MASK_ALL, true); } @@ -25770,7 +25773,7 @@ void Player::_SaveCharacter(bool create, SQLTransaction& trans) stmt->setUInt32(index++, GetGUIDLow()); stmt->setUInt32(index++, GetSession()->GetAccountId()); stmt->setString(index++, GetName()); - stmt->setUInt8(index++, getRace()); + stmt->setUInt8(index++, getRace(true)); stmt->setUInt8(index++, getClass()); stmt->setUInt8(index++, getGender()); stmt->setUInt8(index++, getLevel()); @@ -25875,7 +25878,7 @@ void Player::_SaveCharacter(bool create, SQLTransaction& trans) // Update query stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_CHARACTER); stmt->setString(index++, GetName()); - stmt->setUInt8(index++, getRace()); + stmt->setUInt8(index++, getRace(true)); stmt->setUInt8(index++, getClass()); stmt->setUInt8(index++, getGender()); stmt->setUInt8(index++, getLevel()); @@ -26362,10 +26365,7 @@ uint8 Player::GetMostPointsTalentTree() const bool Player::IsHealerTalentSpec() const { uint8 tree = GetMostPointsTalentTree(); - return ((getClass() == CLASS_DRUID && tree == 2) || - (getClass() == CLASS_PALADIN && tree == 0) || - (getClass() == CLASS_PRIEST && tree <= 1) || - (getClass() == CLASS_SHAMAN && tree == 2)); + return (getClass() == CLASS_DRUID && tree == 2 || getClass() == CLASS_PALADIN && tree == 0 || getClass() == CLASS_PRIEST && tree <= 1 || getClass() == CLASS_SHAMAN && tree == 2); } void Player::ResetTimeSync() diff --git a/src/game/Entities/Player/Player.h b/src/game/Entities/Player/Player.h index 4c1d577bc9..a0f3ec042d 100644 --- a/src/game/Entities/Player/Player.h +++ b/src/game/Entities/Player/Player.h @@ -2063,7 +2063,7 @@ class Player : public Unit, public GridObject<Player> void CheckAreaExploreAndOutdoor(void); static TeamId TeamIdForRace(uint8 race); - TeamId GetTeamId(bool original = false) const { return original ? TeamIdForRace(getRace()) : m_team; }; + TeamId GetTeamId(bool original = false) const { return original ? TeamIdForRace(getRace(true)) : m_team; }; void setFactionForRace(uint8 race); void setTeamId(TeamId teamid) { m_team = teamid; }; diff --git a/src/game/Entities/Unit/Unit.cpp b/src/game/Entities/Unit/Unit.cpp index 14616f24d3..d145b99a57 100644 --- a/src/game/Entities/Unit/Unit.cpp +++ b/src/game/Entities/Unit/Unit.cpp @@ -51,6 +51,7 @@ #include "WorldSession.h" #include "ArenaSpectator.h" #include "DynamicVisibility.h" +#include "AccountMgr.h" #include <math.h> @@ -146,12 +147,12 @@ _hitMask(hitMask), _spell(spell), _damageInfo(damageInfo), _healInfo(healInfo), #ifdef _MSC_VER #pragma warning(disable:4355) #endif -Unit::Unit(bool isWorldObject): WorldObject(isWorldObject), +Unit::Unit(bool isWorldObject) : WorldObject(isWorldObject), m_movedByPlayer(NULL), m_lastSanctuaryTime(0), IsAIEnabled(false), NeedChangeAI(false), m_ControlledByPlayer(false), m_CreatedByPlayer(false), movespline(new Movement::MoveSpline()), i_AI(NULL), i_disabledAI(NULL), m_procDeep(0), m_removedAurasCount(0), i_motionMaster(new MotionMaster(this)), m_regenTimer(0), m_ThreatManager(this), m_vehicle(NULL), m_vehicleKit(NULL), m_unitTypeMask(UNIT_MASK_NONE), -m_HostileRefManager(this), m_AutoRepeatFirstCast(false) +m_HostileRefManager(this), m_AutoRepeatFirstCast(false), m_realRace(0), m_race(0) { #ifdef _MSC_VER #pragma warning(default:4355) @@ -3367,16 +3368,13 @@ bool Unit::isInAccessiblePlaceFor(Creature const* c) const else if (c->GetMapId() == 631) // Icecrown Citadel { // if static transport doesn't match - return false - if (c->GetTransport() != this->GetTransport() && - ((c->GetTransport() && c->GetTransport()->IsStaticTransport()) || - (this->GetTransport() && this->GetTransport()->IsStaticTransport()))) + if (c->GetTransport() != this->GetTransport() && (c->GetTransport() && c->GetTransport()->IsStaticTransport() || this->GetTransport() && this->GetTransport()->IsStaticTransport())) return false; // special handling for ICC (map 631), for non-flying pets in Gunship Battle, for trash npcs this is done via CanAIAttack if (IS_PLAYER_GUID(c->GetOwnerGUID()) && !c->CanFly()) { - if ((c->GetTransport() && !this->GetTransport()) || - (!c->GetTransport() && this->GetTransport())) + if (c->GetTransport() && !this->GetTransport() || !c->GetTransport() && this->GetTransport()) return false; if (this->GetTransport()) { @@ -3661,7 +3659,7 @@ void Unit::HandleSafeUnitPointersOnDelete(Unit* thisUnit) bool Unit::IsInWater(bool allowAbove) const { const_cast<Unit*>(this)->UpdateEnvironmentIfNeeded(1); - return m_last_isinwater_status || (allowAbove && m_last_islittleabovewater_status); + return m_last_isinwater_status || allowAbove && m_last_islittleabovewater_status; } bool Unit::IsUnderWater() const @@ -10376,8 +10374,7 @@ float Unit::SpellPctDamageModsDone(Unit* victim, SpellInfo const* spellProto, Da // Merciless Combat if ((*i)->GetSpellInfo()->SpellIconID == 2656) { - if (spellProto && - ((spellProto->SpellFamilyFlags[0] & 0x2) || (spellProto->SpellFamilyFlags[1] & 0x2))) + if( spellProto && spellProto->SpellFamilyFlags[0] & 0x2 || spellProto->SpellFamilyFlags[1] & 0x2 ) if (!victim->HealthAbovePct(35)) AddPct(DoneTotalMod, (*i)->GetAmount()); } @@ -17857,6 +17854,21 @@ uint32 Unit::GetModelForTotem(PlayerTotemType totemType) } break; } + default: // One standard for other races. + { + switch (totemType) + { + case SUMMON_TYPE_TOTEM_FIRE: // fire + return 4589; + case SUMMON_TYPE_TOTEM_EARTH: // earth + return 4588; + case SUMMON_TYPE_TOTEM_WATER: // water + return 4587; + case SUMMON_TYPE_TOTEM_AIR: // air + return 4590; + } + break; + } } return 0; } @@ -19131,7 +19143,7 @@ void Unit::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player* target) else if (index == UNIT_FIELD_FLAGS) { uint32 appendValue = m_uint32Values[UNIT_FIELD_FLAGS]; - if (target->IsGameMaster() && target->GetSession()->GetSecurity() >= SEC_GAMEMASTER) + if (target->IsGameMaster() && AccountMgr::IsGMAccount(target->GetSession()->GetSecurity())) appendValue &= ~UNIT_FLAG_NOT_SELECTABLE; fieldBuffer << uint32(appendValue); @@ -19156,7 +19168,7 @@ void Unit::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player* target) if (cinfo->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER) { - if (target->IsGameMaster() && target->GetSession()->GetSecurity() >= SEC_GAMEMASTER) + if (target->IsGameMaster() && AccountMgr::IsGMAccount(target->GetSession()->GetSecurity())) { if (cinfo->Modelid1) displayId = cinfo->Modelid1; // Modelid1 is a visible model for gms @@ -19260,4 +19272,23 @@ void Unit::BuildCooldownPacket(WorldPacket& data, uint8 flags, PacketCooldowns c data << uint32(itr->first); data << uint32(itr->second); } -}
\ No newline at end of file +} + +uint8 Unit::getRace(bool original) const +{ + if (GetTypeId() == TYPEID_PLAYER) + { + if (original) + return m_realRace; + else + return m_race; + } + + return GetByteValue(UNIT_FIELD_BYTES_0, 0); +} + +void Unit::setRace(uint8 race) +{ + if (GetTypeId() == TYPEID_PLAYER) + m_race = race; +} diff --git a/src/game/Entities/Unit/Unit.h b/src/game/Entities/Unit/Unit.h index 3513c5668f..d622b7909f 100644 --- a/src/game/Entities/Unit/Unit.h +++ b/src/game/Entities/Unit/Unit.h @@ -1457,8 +1457,9 @@ class Unit : public WorldObject uint8 getLevel() const { return uint8(GetUInt32Value(UNIT_FIELD_LEVEL)); } uint8 getLevelForTarget(WorldObject const* /*target*/) const { return getLevel(); } void SetLevel(uint8 lvl, bool showLevelChange = true); - uint8 getRace() const { return GetByteValue(UNIT_FIELD_BYTES_0, 0); } - uint32 getRaceMask() const { return 1 << (getRace()-1); } + uint8 getRace(bool original = false) const; + void setRace(uint8 race); + uint32 getRaceMask() const { return 1 << (getRace(true)-1); } uint8 getClass() const { return GetByteValue(UNIT_FIELD_BYTES_0, 1); } uint32 getClassMask() const { return 1 << (getClass()-1); } uint8 getGender() const { return GetByteValue(UNIT_FIELD_BYTES_0, 2); } @@ -2367,13 +2368,7 @@ class Unit : public WorldObject // pussywizard: // MMaps std::map<uint64, MMapTargetData> m_targetsNotAcceptable; - bool isTargetNotAcceptableByMMaps(uint64 guid, uint32 currTime, const Position* t = NULL) const { - std::map<uint64, MMapTargetData>::const_iterator itr = m_targetsNotAcceptable.find(guid); - if ((itr != m_targetsNotAcceptable.end() && (itr->second._endTime >= currTime)) || - (t && !itr->second.PosChanged(*this, *t))) - return true; - return false; - } + bool isTargetNotAcceptableByMMaps(uint64 guid, uint32 currTime, const Position* t = NULL) const { std::map<uint64, MMapTargetData>::const_iterator itr = m_targetsNotAcceptable.find(guid); if (itr != m_targetsNotAcceptable.end() && (itr->second._endTime >= currTime || t && !itr->second.PosChanged(*this, *t))) return true; return false; } uint32 m_mmapNotAcceptableStartTime; // Safe mover std::set<SafeUnitPointer*> SafeUnitPointerSet; @@ -2440,6 +2435,9 @@ class Unit : public WorldObject void _UpdateAutoRepeatSpell(); + uint8 m_realRace; + uint8 m_race; + bool m_AutoRepeatFirstCast; int32 m_attackTimer[MAX_ATTACK]; diff --git a/src/game/Globals/ObjectMgr.cpp b/src/game/Globals/ObjectMgr.cpp index ea85c214d0..92de260af6 100644 --- a/src/game/Globals/ObjectMgr.cpp +++ b/src/game/Globals/ObjectMgr.cpp @@ -1132,8 +1132,8 @@ void ObjectMgr::LoadEquipmentTemplates() { uint32 oldMSTime = getMSTime(); - // 0 1 2 3 4 - QueryResult result = WorldDatabase.Query("SELECT entry, id, itemEntry1, itemEntry2, itemEntry3 FROM creature_equip_template"); + // 0 1 2 3 4 + QueryResult result = WorldDatabase.Query("SELECT CreatureID, ID, ItemID1, ItemID2, ItemID3 FROM creature_equip_template"); if (!result) { @@ -1271,7 +1271,8 @@ void ObjectMgr::LoadCreatureModelInfo() { uint32 oldMSTime = getMSTime(); - QueryResult result = WorldDatabase.Query("SELECT modelid, bounding_radius, combat_reach, gender, modelid_other_gender FROM creature_model_info"); + // 0 1 2 3 4 + QueryResult result = WorldDatabase.Query("SELECT DisplayID, BoundingRadius, CombatReach, Gender, DisplayID_Other_Gender FROM creature_model_info"); if (!result) { @@ -2143,6 +2144,8 @@ uint64 ObjectMgr::GetPlayerGUIDByName(std::string const& name) const // Get data from global storage if (uint32 guidLow = sWorld->GetGlobalPlayerGUID(name)) return MAKE_NEW_GUID(guidLow, 0, HIGHGUID_PLAYER); + + // No player found return 0; } @@ -3685,7 +3688,7 @@ void ObjectMgr::LoadPlayerInfo() _playerXPperLevel[level] = 0; // 0 1 - QueryResult result = WorldDatabase.Query("SELECT lvl, xp_for_next_level FROM player_xp_for_level"); + QueryResult result = WorldDatabase.Query("SELECT Level, Experience FROM player_xp_for_level"); if (!result) { @@ -3851,26 +3854,26 @@ void ObjectMgr::LoadQuests() mExclusiveQuestGroups.clear(); QueryResult result = WorldDatabase.Query("SELECT " - //0 1 2 3 4 5 6 7 8 9 10 11 12 - "Id, Method, Level, MinLevel, MaxLevel, ZoneOrSort, Type, SuggestedPlayers, LimitTime, RequiredClasses, RequiredRaces, RequiredSkillId, RequiredSkillPoints, " + //0 1 2 3 4 5 6 7 8 9 10 11 12 + "ID, Method, QuestLevel, MinLevel, MaxLevel, QuestSortID, QuestType, SuggestedGroupNum, LimitTime, RequiredClasses, RequiredRaces, RequiredSkillId, RequiredSkillPoints, " // 13 14 15 16 17 18 19 20 "RequiredFactionId1, RequiredFactionId2, RequiredFactionValue1, RequiredFactionValue2, RequiredMinRepFaction, RequiredMaxRepFaction, RequiredMinRepValue, RequiredMaxRepValue, " // 21 22 23 24 25 26 27 28 29 30 31 "PrevQuestId, NextQuestId, ExclusiveGroup, NextQuestIdChain, RewardXPId, RewardOrRequiredMoney, RewardMoneyMaxLevel, RewardSpell, RewardSpellCast, RewardHonor, RewardHonorMultiplier, " // 32 33 34 35 36 37 38 39 40 41 42 - "RewardMailTemplateId, RewardMailDelay, SourceItemId, SourceItemCount, SourceSpellId, Flags, SpecialFlags, RewardTitleId, RequiredPlayerKills, RewardTalents, RewardArenaPoints, " - // 43 44 45 46 47 48 49 50 - "RewardItemId1, RewardItemId2, RewardItemId3, RewardItemId4, RewardItemCount1, RewardItemCount2, RewardItemCount3, RewardItemCount4, " - // 51 52 53 54 55 56 57 58 59 60 61 62 - "RewardChoiceItemId1, RewardChoiceItemId2, RewardChoiceItemId3, RewardChoiceItemId4, RewardChoiceItemId5, RewardChoiceItemId6, RewardChoiceItemCount1, RewardChoiceItemCount2, RewardChoiceItemCount3, RewardChoiceItemCount4, RewardChoiceItemCount5, RewardChoiceItemCount6, " - // 63 64 65 66 67 68 69 70 71 72 - "RewardFactionId1, RewardFactionId2, RewardFactionId3, RewardFactionId4, RewardFactionId5, RewardFactionValueId1, RewardFactionValueId2, RewardFactionValueId3, RewardFactionValueId4, RewardFactionValueId5, " + "RewardMailTemplateId, RewardMailDelay, SourceItemId, SourceItemCount, SourceSpellId, Flags, SpecialFlags, RewardTitle, RequiredPlayerKills, RewardTalents, RewardArenaPoints, " + // 43 44 45 46 47 48 49 50 + "RewardItem1, RewardItem2, RewardItem3, RewardItem4, RewardAmount1, RewardAmount2, RewardAmount3, RewardAmount4, " + // 51 52 53 54 55 56 57 58 59 60 61 62 + "RewardChoiceItemID1, RewardChoiceItemID2, RewardChoiceItemID3, RewardChoiceItemID4, RewardChoiceItemID5, RewardChoiceItemID6, RewardChoiceItemQuantity1, RewardChoiceItemQuantity2, RewardChoiceItemQuantity3, RewardChoiceItemQuantity4, RewardChoiceItemQuantity5, RewardChoiceItemQuantity6, " + // 63 64 65 66 67 68 69 70 71 72 + "RewardFactionID1, RewardFactionID2, RewardFactionID3, RewardFactionID4, RewardFactionID5, RewardFactionValue1, RewardFactionValue2, RewardFactionValue3, RewardFactionValue4, RewardFactionValue5, " // 73 74 75 76 77 - "RewardFactionValueIdOverride1, RewardFactionValueIdOverride2, RewardFactionValueIdOverride3, RewardFactionValueIdOverride4, RewardFactionValueIdOverride5, " + "RewardFactionOverride1, RewardFactionOverride2, RewardFactionOverride3, RewardFactionOverride4, RewardFactionOverride5, " // 78 79 80 81 "PointMapId, PointX, PointY, PointOption, " - // 82 83 84 85 86 87 88 - "Title, Objectives, Details, EndText, OfferRewardText, RequestItemsText, CompletedText, " + // 82 83 84 85 86 87 88 + "LogTitle, LogDescription, QuestDescription, EndText, OfferRewardText, RequestItemsText, QuestCompletionLog, " // 89 90 91 92 93 94 95 96 "RequiredNpcOrGo1, RequiredNpcOrGo2, RequiredNpcOrGo3, RequiredNpcOrGo4, RequiredNpcOrGoCount1, RequiredNpcOrGoCount2, RequiredNpcOrGoCount3, RequiredNpcOrGoCount4, " // 97 98 99 100 101 102 103 104 @@ -5101,8 +5104,8 @@ void ObjectMgr::LoadPageTexts() { uint32 oldMSTime = getMSTime(); - // 0 1 2 - QueryResult result = WorldDatabase.Query("SELECT entry, text, next_page FROM page_text"); + // 0 1 2 + QueryResult result = WorldDatabase.Query("SELECT ID, Text, NextPageID FROM page_text"); if (!result) { @@ -6071,8 +6074,9 @@ void ObjectMgr::LoadAreaTriggerTeleports() _areaTriggerStore.clear(); // need for reload case - // 0 1 2 3 4 5 - QueryResult result = WorldDatabase.Query("SELECT id, target_map, target_position_x, target_position_y, target_position_z, target_orientation FROM areatrigger_teleport"); + // 0 1 2 3 4 5 + QueryResult result = WorldDatabase.Query("SELECT ID, target_map, target_position_x, target_position_y, target_position_z, target_orientation FROM areatrigger_teleport"); + if (!result) { sLog->outString(">> Loaded 0 area trigger teleport definitions. DB table `areatrigger_teleport` is empty."); @@ -6526,9 +6530,9 @@ void ObjectMgr::LoadGameObjectTemplate() // 0 1 2 3 4 5 6 7 8 9 10 11 12 QueryResult result = WorldDatabase.Query("SELECT entry, type, displayId, name, IconName, castBarCaption, unk1, faction, flags, size, questItem1, questItem2, questItem3, " // 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 - "questItem4, questItem5, questItem6, data0, data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12, " + "questItem4, questItem5, questItem6, Data0, Data1, Data2, Data3, Data4, Data5, Data6, Data7, Data8, Data9, Data10, Data11, Data12, " // 29 30 31 32 33 34 35 36 37 38 39 40 41 - "data13, data14, data15, data16, data17, data18, data19, data20, data21, data22, data23, AIName, ScriptName " + "Data13, Data14, Data15, Data16, Data17, Data18, Data19, Data20, Data21, Data22, Data23, AIName, ScriptName " "FROM gameobject_template"); if (!result) @@ -7145,8 +7149,8 @@ void ObjectMgr::LoadPointsOfInterest() uint32 count = 0; - // 0 1 2 3 4 5 6 - QueryResult result = WorldDatabase.Query("SELECT entry, x, y, icon, flags, data, icon_name FROM points_of_interest"); + // 0 1 2 3 4 5 6 + QueryResult result = WorldDatabase.Query("SELECT ID, PositionX, PositionY, Icon, Flags, Data, Name FROM points_of_interest"); if (!result) { @@ -7193,8 +7197,8 @@ void ObjectMgr::LoadQuestPOI() uint32 count = 0; - // 0 1 2 3 4 5 6 7 - QueryResult result = WorldDatabase.Query("SELECT questId, id, objIndex, mapid, WorldMapAreaId, FloorId, unk3, unk4 FROM quest_poi order by questId"); + // 0 1 2 3 4 5 6 7 + QueryResult result = WorldDatabase.Query("SELECT QuestID, id, ObjectiveIndex, MapID, WorldMapAreaId, Floor, Priority, Flags FROM quest_poi order by QuestID"); if (!result) { @@ -7203,8 +7207,8 @@ void ObjectMgr::LoadQuestPOI() return; } - // 0 1 2 3 - QueryResult points = WorldDatabase.Query("SELECT questId, id, x, y FROM quest_poi_points ORDER BY questId DESC, idx"); + // 0 1 2 3 + QueryResult points = WorldDatabase.Query("SELECT QuestID, Idx1, X, Y FROM quest_poi_points ORDER BY QuestID DESC, Idx2"); std::vector<std::vector<std::vector<QuestPOIPoint> > > POIs; @@ -8256,9 +8260,9 @@ void ObjectMgr::LoadTrainerSpell() // For reload case _cacheTrainerSpellStore.clear(); - QueryResult result = WorldDatabase.Query("SELECT b.entry, a.spell, a.spellcost, a.reqskill, a.reqskillvalue, a.reqlevel FROM npc_trainer AS a " - "INNER JOIN npc_trainer AS b ON a.entry = -(b.spell) " - "UNION SELECT * FROM npc_trainer WHERE spell > 0"); + QueryResult result = WorldDatabase.Query("SELECT b.ID, a.SpellID, a.MoneyCost, a.ReqSkillLine, a.ReqSkillRank, a.ReqLevel FROM npc_trainer AS a " + "INNER JOIN npc_trainer AS b ON a.ID = -(b.SpellID) " + "UNION SELECT * FROM npc_trainer WHERE SpellID > 0"); if (!result) { diff --git a/src/game/Groups/Group.cpp b/src/game/Groups/Group.cpp index 03cf5ac1b0..ebac30cfbd 100644 --- a/src/game/Groups/Group.cpp +++ b/src/game/Groups/Group.cpp @@ -1350,7 +1350,7 @@ void Group::CountTheRoll(Rolls::iterator rollI, Map* allowedMap) continue; player = ObjectAccessor::FindPlayer(itr->first); - if (!player || (allowedMap != NULL && player->FindMap() != allowedMap)) + if (!player || allowedMap != NULL && player->FindMap() != allowedMap) { --roll->totalNeed; continue; @@ -1414,7 +1414,7 @@ void Group::CountTheRoll(Rolls::iterator rollI, Map* allowedMap) continue; player = ObjectAccessor::FindPlayer(itr->first); - if (!player || (allowedMap != NULL && player->FindMap() != allowedMap)) + if (!player || allowedMap != NULL && player->FindMap() != allowedMap) { --roll->totalGreed; continue; diff --git a/src/game/Handlers/CharacterHandler.cpp b/src/game/Handlers/CharacterHandler.cpp index 94f4199267..146840095c 100644 --- a/src/game/Handlers/CharacterHandler.cpp +++ b/src/game/Handlers/CharacterHandler.cpp @@ -1034,7 +1034,7 @@ void WorldSession::HandlePlayerLoginFromDB(LoginQueryHolder* holder) } // friend status - if (GetSecurity() < SEC_GAMEMASTER) // pussywizard: only for non-gms + if (AccountMgr::IsGMAccount(GetSecurity())) // pussywizard: only for non-gms sSocialMgr->SendFriendStatus(pCurrChar, FRIEND_ONLINE, pCurrChar->GetGUIDLow(), true); // Place character in world (and load zone) before some object loading @@ -2073,11 +2073,8 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recvData) // xinef: check money bool valid = Player::TeamIdForRace(oldRace) == Player::TeamIdForRace(race); - if ((level < 10 && money <= 0) || - (level > 10 && level <= 30 && money <= 3000000) || - (level > 30 && level <= 50 && money <= 10000000) || - (level > 50 && level <= 70 && money <= 50000000) || - (level > 70 && money <= 200000000)) + if (level < 10 && money <= 0 || level > 10 && level <= 30 && money <= 3000000 || level > 30 && level <= 50 && money <= 10000000 || + level > 50 && level <= 70 && money <= 50000000 || level > 70 && money <= 200000000) valid = true; if (!valid) { diff --git a/src/game/Handlers/MiscHandler.cpp b/src/game/Handlers/MiscHandler.cpp index 87abeac96d..708db524f2 100644 --- a/src/game/Handlers/MiscHandler.cpp +++ b/src/game/Handlers/MiscHandler.cpp @@ -398,7 +398,7 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket & /*recv_data*/) if (uint64 lguid = GetPlayer()->GetLootGUID()) DoLootRelease(lguid); - bool instantLogout = (GetSecurity() >= sWorld->getIntConfig(CONFIG_INSTANT_LOGOUT) || (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && !GetPlayer()->IsInCombat())) || GetPlayer()->IsInFlight(); + bool instantLogout = (GetSecurity() >= sWorld->getIntConfig(CONFIG_INSTANT_LOGOUT) || GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && !GetPlayer()->IsInCombat()) || GetPlayer()->IsInFlight(); /// TODO: Possibly add RBAC permission to log out in combat bool canLogoutInCombat = GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING); @@ -1508,7 +1508,7 @@ void WorldSession::HandleSetRaidDifficultyOpcode(WorldPacket & recv_data) return; } - if ((groupGuy->GetMap()->GetId() == 631 || groupGuy->GetMap()->GetId() == 724) && mode%2 == _player->GetRaidDifficulty()%2 && group->isRaidGroup()) + if (IsSharedDifficultyMap(groupGuy->GetMap()->GetId()) && mode%2 == _player->GetRaidDifficulty()%2 && group->isRaidGroup()) { if (!currMap) currMap = groupGuy->GetMap(); @@ -1520,17 +1520,7 @@ void WorldSession::HandleSetRaidDifficultyOpcode(WorldPacket & recv_data) return; } - if (!groupGuy->IsAlive() || - groupGuy->IsInCombat() || - groupGuy->GetVictim() || - groupGuy->m_mover != groupGuy || - groupGuy->IsNonMeleeSpellCast(true) || - (!groupGuy->GetMotionMaster()->empty() && groupGuy->GetMotionMaster()->GetCurrentMovementGeneratorType() != IDLE_MOTION_TYPE) || - !groupGuy->movespline->Finalized() || - !groupGuy->GetMap()->ToInstanceMap() || - !groupGuy->GetMap()->ToInstanceMap()->GetInstanceScript() || - groupGuy->GetMap()->ToInstanceMap()->GetInstanceScript()->IsEncounterInProgress() || - !groupGuy->Satisfy(sObjectMgr->GetAccessRequirement(groupGuy->GetMap()->GetId(), Difficulty(mode)), groupGuy->GetMap()->GetId(), false)) + if (!groupGuy->IsAlive() || groupGuy->IsInCombat() || groupGuy->GetVictim() || groupGuy->m_mover != groupGuy || groupGuy->IsNonMeleeSpellCast(true) || !groupGuy->GetMotionMaster()->empty() && groupGuy->GetMotionMaster()->GetCurrentMovementGeneratorType() != IDLE_MOTION_TYPE || !groupGuy->movespline->Finalized() || !groupGuy->GetMap()->ToInstanceMap() || !groupGuy->GetMap()->ToInstanceMap()->GetInstanceScript() || groupGuy->GetMap()->ToInstanceMap()->GetInstanceScript()->IsEncounterInProgress() || !groupGuy->Satisfy(sObjectMgr->GetAccessRequirement(groupGuy->GetMap()->GetId(), Difficulty(mode)), groupGuy->GetMap()->GetId(), false)) { _player->SendRaidDifficulty(group != NULL); return; @@ -1554,17 +1544,7 @@ void WorldSession::HandleSetRaidDifficultyOpcode(WorldPacket & recv_data) if (Player* p = itr->GetSource()) if (p->GetGroup() != group) { - if (!p->IsInWorld() || - !p->IsAlive() || - p->IsInCombat() || - p->GetVictim() || - p->m_mover != p || - p->IsNonMeleeSpellCast(true) || - (!p->GetMotionMaster()->empty() && p->GetMotionMaster()->GetCurrentMovementGeneratorType() != IDLE_MOTION_TYPE) || - !p->movespline->Finalized() || - !p->GetMap()->ToInstanceMap() || - !p->GetMap()->ToInstanceMap()->GetInstanceScript() || - p->GetMap()->ToInstanceMap()->GetInstanceScript()->IsEncounterInProgress()) + if (!p->IsInWorld() || !p->IsAlive() || p->IsInCombat() || p->GetVictim() || p->m_mover != p || p->IsNonMeleeSpellCast(true) || !p->GetMotionMaster()->empty() && p->GetMotionMaster()->GetCurrentMovementGeneratorType() != IDLE_MOTION_TYPE || !p->movespline->Finalized() || !p->GetMap()->ToInstanceMap() || !p->GetMap()->ToInstanceMap()->GetInstanceScript() || p->GetMap()->ToInstanceMap()->GetInstanceScript()->IsEncounterInProgress()) { _player->SendRaidDifficulty(group != NULL); return; @@ -1592,7 +1572,7 @@ void WorldSession::HandleSetRaidDifficultyOpcode(WorldPacket & recv_data) if (!groupGuy) continue; - if (groupGuy->GetMap()->GetId() == 631 || groupGuy->GetMap()->GetId() == 724) + if (IsSharedDifficultyMap(groupGuy->GetMap()->GetId())) { anyoneInside = true; diff --git a/src/game/Handlers/MovementHandler.cpp b/src/game/Handlers/MovementHandler.cpp index 3d42e1af43..bf6fbdefaf 100644 --- a/src/game/Handlers/MovementHandler.cpp +++ b/src/game/Handlers/MovementHandler.cpp @@ -74,7 +74,7 @@ void WorldSession::HandleMoveWorldportAckOpcode() Map* newMap = sMapMgr->CreateMap(loc.GetMapId(), GetPlayer()); // the CanEnter checks are done in TeleporTo but conditions may change // while the player is in transit, for example the map may get full - if (!newMap || !newMap->CanEnter(GetPlayer())) + if (!newMap || !newMap->CanEnter(GetPlayer(), false)) { sLog->outError("Map %d could not be created for player %d, porting player to homebind", loc.GetMapId(), GetPlayer()->GetGUIDLow()); GetPlayer()->TeleportTo(GetPlayer()->m_homebindMapId, GetPlayer()->m_homebindX, GetPlayer()->m_homebindY, GetPlayer()->m_homebindZ, GetPlayer()->GetOrientation()); diff --git a/src/game/Instances/InstanceSaveMgr.cpp b/src/game/Instances/InstanceSaveMgr.cpp index c403861af7..3e6f791a0a 100644 --- a/src/game/Instances/InstanceSaveMgr.cpp +++ b/src/game/Instances/InstanceSaveMgr.cpp @@ -126,7 +126,7 @@ bool InstanceSaveManager::DeleteInstanceSaveIfNeeded(InstanceSave* save, bool sk } InstanceSave::InstanceSave(uint16 MapId, uint32 InstanceId, Difficulty difficulty, time_t resetTime, time_t extendedResetTime) -: m_resetTime(resetTime), m_extendedResetTime(extendedResetTime), m_instanceid(InstanceId), m_mapid(MapId), m_difficulty(MapId == 631 || MapId == 724 ? Difficulty(difficulty%2) : difficulty), m_canReset(true), m_instanceData(""), m_completedEncounterMask(0) +: m_resetTime(resetTime), m_extendedResetTime(extendedResetTime), m_instanceid(InstanceId), m_mapid(MapId), m_difficulty(IsSharedDifficultyMap(MapId) ? Difficulty(difficulty%2) : difficulty), m_canReset(true), m_instanceData(""), m_completedEncounterMask(0) { } @@ -676,7 +676,8 @@ void InstanceSaveManager::PlayerUnbindInstanceNotExtended(uint32 guidLow, uint32 InstancePlayerBind* InstanceSaveManager::PlayerGetBoundInstance(uint32 guidLow, uint32 mapid, Difficulty difficulty) { - Difficulty difficulty_fixed = (mapid == 631 || mapid == 724 ? Difficulty(difficulty%2) : difficulty); + Difficulty difficulty_fixed = ( IsSharedDifficultyMap(mapid) ? Difficulty(difficulty%2) : difficulty); + MapDifficulty const* mapDiff = GetDownscaledMapDifficultyData(mapid, difficulty_fixed); if (!mapDiff) return NULL; diff --git a/src/game/Maps/Map.cpp b/src/game/Maps/Map.cpp index 33abb8627a..268b11ecce 100644 --- a/src/game/Maps/Map.cpp +++ b/src/game/Maps/Map.cpp @@ -2974,7 +2974,7 @@ void Map::DeleteRespawnTimesInDB(uint16 mapId, uint32 instanceId) void Map::UpdateEncounterState(EncounterCreditType type, uint32 creditEntry, Unit* source) { - Difficulty difficulty_fixed = (GetId() == 631 || GetId() == 724 ? Difficulty(GetDifficulty()%2) : GetDifficulty()); + Difficulty difficulty_fixed = (IsSharedDifficultyMap(GetId()) ? Difficulty(GetDifficulty()%2) : GetDifficulty()); DungeonEncounterList const* encounters = sObjectMgr->GetDungeonEncounterList(GetId(), difficulty_fixed); if (!encounters) return; diff --git a/src/game/Maps/Map.h b/src/game/Maps/Map.h index 8f5009cf19..93061f4a3f 100644 --- a/src/game/Maps/Map.h +++ b/src/game/Maps/Map.h @@ -368,7 +368,7 @@ class Map : public GridRefManager<NGridType> uint32 GetInstanceId() const { return i_InstanceId; } uint8 GetSpawnMode() const { return (i_spawnMode); } - virtual bool CanEnter(Player* /*player*/, bool loginCheck = false) { return true; } + virtual bool CanEnter(Player* /*player*/, bool /*loginCheck = false*/) { return true; } const char* GetMapName() const; // have meaning only for instanced map (that have set real difficulty) diff --git a/src/game/Maps/MapInstanced.cpp b/src/game/Maps/MapInstanced.cpp index 1e8701b525..5f04566b77 100644 --- a/src/game/Maps/MapInstanced.cpp +++ b/src/game/Maps/MapInstanced.cpp @@ -139,7 +139,7 @@ Map* MapInstanced::CreateInstanceForPlayer(const uint32 mapId, Player* player) map = FindInstanceMap(destInstId); if (!map) map = CreateInstance(destInstId, pSave, realdiff); - else if ((mapId == 631 || mapId == 724) && !map->HavePlayers() && map->GetDifficulty() != realdiff) + else if (IsSharedDifficultyMap(mapId) && !map->HavePlayers() && map->GetDifficulty() != realdiff) { if (player->isBeingLoaded()) // pussywizard: crashfix (assert(passengers.empty) fail in ~transport), could be added to a transport during loading from db return NULL; diff --git a/src/game/Movement/MovementGenerators/PathGenerator.cpp b/src/game/Movement/MovementGenerators/PathGenerator.cpp index c42ae417d2..c72e04b870 100644 --- a/src/game/Movement/MovementGenerators/PathGenerator.cpp +++ b/src/game/Movement/MovementGenerators/PathGenerator.cpp @@ -226,8 +226,8 @@ void PathGenerator::BuildPolyPath(G3D::Vector3 const& startPos, G3D::Vector3 con } if (sourceCanSwim) { - if ((startPoly == INVALID_POLYREF && LIQUID_MAP_NO_WATER == _sourceUnit->GetBaseMap()->getLiquidStatus(startPos.x, startPos.y, startPos.z, MAP_ALL_LIQUIDS, NULL)) || - (endPoly == INVALID_POLYREF && LIQUID_MAP_NO_WATER == _sourceUnit->GetBaseMap()->getLiquidStatus(endPos.x, endPos.y, endPos.z, MAP_ALL_LIQUIDS, NULL))) + if (startPoly == INVALID_POLYREF && LIQUID_MAP_NO_WATER == _sourceUnit->GetBaseMap()->getLiquidStatus(startPos.x, startPos.y, startPos.z, MAP_ALL_LIQUIDS, NULL) || + endPoly == INVALID_POLYREF && LIQUID_MAP_NO_WATER == _sourceUnit->GetBaseMap()->getLiquidStatus(endPos.x, endPos.y, endPos.z, MAP_ALL_LIQUIDS, NULL)) { _type = PATHFIND_NOPATH; return; diff --git a/src/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/game/Movement/MovementGenerators/RandomMovementGenerator.cpp index 8517392982..f706b7108d 100644 --- a/src/game/Movement/MovementGenerators/RandomMovementGenerator.cpp +++ b/src/game/Movement/MovementGenerators/RandomMovementGenerator.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "Creature.h" diff --git a/src/game/Movement/MovementGenerators/RandomMovementGenerator.h b/src/game/Movement/MovementGenerators/RandomMovementGenerator.h index f985feff5b..5881536256 100644 --- a/src/game/Movement/MovementGenerators/RandomMovementGenerator.h +++ b/src/game/Movement/MovementGenerators/RandomMovementGenerator.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef TRINITY_RANDOMMOTIONGENERATOR_H diff --git a/src/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index 297f438655..bd9044ce14 100644 --- a/src/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -121,9 +121,7 @@ void TargetedMovementGeneratorMedium<T,D>::_setTargetLocation(T* owner, bool ini Position dest = {x, y, z, 0.0f}; if (GameObject* pillar = ((BattlegroundRV*)bg)->GetPillarAtPosition(&dest)) { - if ((pillar->GetGoState() == GO_STATE_READY && pillar->ToTransport()->GetPathProgress() == 0) || - owner->GetPositionZ() > 31.0f || - owner->GetTransGUID() == pillar->GetGUID()) + if (pillar->GetGoState() == GO_STATE_READY && pillar->ToTransport()->GetPathProgress() == 0 || owner->GetPositionZ() > 31.0f || owner->GetTransGUID() == pillar->GetGUID()) { if (pillar->GetGoState() == GO_STATE_READY && pillar->ToTransport()->GetPathProgress() == 0) z = std::max(z, 28.28f); @@ -137,8 +135,7 @@ void TargetedMovementGeneratorMedium<T,D>::_setTargetLocation(T* owner, bool ini init.Launch(); return; } - if (pillar->GetGoState() == GO_STATE_ACTIVE || - (pillar->GetGoState() == GO_STATE_READY && pillar->ToTransport()->GetPathProgress() > 0)) + if (pillar->GetGoState() == GO_STATE_ACTIVE || pillar->GetGoState() == GO_STATE_READY && pillar->ToTransport()->GetPathProgress() > 0) { Position pos; owner->GetFirstCollisionPositionForTotem(pos, owner->GetExactDist2d(i_target.getTarget()), owner->GetAngle(i_target.getTarget())-owner->GetOrientation(), false); @@ -161,8 +158,7 @@ void TargetedMovementGeneratorMedium<T,D>::_setTargetLocation(T* owner, bool ini if (result) { float maxDist = MELEE_RANGE + owner->GetMeleeReach() + i_target->GetMeleeReach(); - if ((!forceDest && (i_path->GetPathType() & PATHFIND_NOPATH)) || - (!i_offset && !isPlayerPet && i_target->GetExactDistSq(i_path->GetActualEndPosition().x, i_path->GetActualEndPosition().y, i_path->GetActualEndPosition().z) > maxDist*maxDist)) + if (!forceDest && (i_path->GetPathType() & PATHFIND_NOPATH || !i_offset && !isPlayerPet && i_target->GetExactDistSq(i_path->GetActualEndPosition().x, i_path->GetActualEndPosition().y, i_path->GetActualEndPosition().z) > maxDist*maxDist)) { lastPathingFailMSTime = World::GetGameTimeMS(); owner->m_targetsNotAcceptable[i_target->GetGUID()] = MMapTargetData(sWorld->GetGameTime()+DISALLOW_TIME_AFTER_FAIL, owner, i_target.getTarget()); diff --git a/src/game/Movement/Spline/MoveSpline.cpp b/src/game/Movement/Spline/MoveSpline.cpp index 22ea15a428..684c14e1ab 100644 --- a/src/game/Movement/Spline/MoveSpline.cpp +++ b/src/game/Movement/Spline/MoveSpline.cpp @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #include "MoveSpline.h" diff --git a/src/game/Movement/Spline/MoveSpline.h b/src/game/Movement/Spline/MoveSpline.h index 94ce57d700..b8df80953f 100644 --- a/src/game/Movement/Spline/MoveSpline.h +++ b/src/game/Movement/Spline/MoveSpline.h @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #ifndef TRINITYSERVER_MOVEPLINE_H diff --git a/src/game/Movement/Spline/MoveSplineFlag.h b/src/game/Movement/Spline/MoveSplineFlag.h index c85a1aeb43..7c5da0f39b 100644 --- a/src/game/Movement/Spline/MoveSplineFlag.h +++ b/src/game/Movement/Spline/MoveSplineFlag.h @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #ifndef TRINITYSERVER_MOVESPLINEFLAG_H diff --git a/src/game/Movement/Spline/MoveSplineInit.cpp b/src/game/Movement/Spline/MoveSplineInit.cpp index e23fa9ceb0..345517e9df 100644 --- a/src/game/Movement/Spline/MoveSplineInit.cpp +++ b/src/game/Movement/Spline/MoveSplineInit.cpp @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #include "MoveSplineInit.h" diff --git a/src/game/Movement/Spline/MoveSplineInit.h b/src/game/Movement/Spline/MoveSplineInit.h index 72dc220f97..83a03eaeff 100644 --- a/src/game/Movement/Spline/MoveSplineInit.h +++ b/src/game/Movement/Spline/MoveSplineInit.h @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #ifndef TRINITYSERVER_MOVESPLINEINIT_H diff --git a/src/game/Movement/Spline/MoveSplineInitArgs.h b/src/game/Movement/Spline/MoveSplineInitArgs.h index 11663934f0..edde1fbf02 100644 --- a/src/game/Movement/Spline/MoveSplineInitArgs.h +++ b/src/game/Movement/Spline/MoveSplineInitArgs.h @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #ifndef TRINITYSERVER_MOVESPLINEINIT_ARGS_H diff --git a/src/game/Movement/Spline/MovementPacketBuilder.cpp b/src/game/Movement/Spline/MovementPacketBuilder.cpp index 66d2a5385a..a9efd52593 100644 --- a/src/game/Movement/Spline/MovementPacketBuilder.cpp +++ b/src/game/Movement/Spline/MovementPacketBuilder.cpp @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #include "MovementPacketBuilder.h" diff --git a/src/game/Movement/Spline/MovementPacketBuilder.h b/src/game/Movement/Spline/MovementPacketBuilder.h index a28ff0b44e..66f3074c3e 100644 --- a/src/game/Movement/Spline/MovementPacketBuilder.h +++ b/src/game/Movement/Spline/MovementPacketBuilder.h @@ -1,20 +1,9 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ - + #ifndef TRINITYSERVER_PACKET_BUILDER_H #define TRINITYSERVER_PACKET_BUILDER_H diff --git a/src/game/Movement/Spline/MovementTypedefs.h b/src/game/Movement/Spline/MovementTypedefs.h index d9d2077d81..f28c075a1b 100644 --- a/src/game/Movement/Spline/MovementTypedefs.h +++ b/src/game/Movement/Spline/MovementTypedefs.h @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #ifndef TRINITYSERVER_TYPEDEFS_H diff --git a/src/game/Movement/Spline/MovementUtil.cpp b/src/game/Movement/Spline/MovementUtil.cpp index d973dfbe32..c7b6e4b601 100644 --- a/src/game/Movement/Spline/MovementUtil.cpp +++ b/src/game/Movement/Spline/MovementUtil.cpp @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #include "MoveSplineFlag.h" diff --git a/src/game/Movement/Spline/Spline.cpp b/src/game/Movement/Spline/Spline.cpp index 5d78e151b5..88ddb48537 100644 --- a/src/game/Movement/Spline/Spline.cpp +++ b/src/game/Movement/Spline/Spline.cpp @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #include "Spline.h" diff --git a/src/game/Movement/Spline/Spline.h b/src/game/Movement/Spline/Spline.h index b413142f48..8084c18e19 100644 --- a/src/game/Movement/Spline/Spline.h +++ b/src/game/Movement/Spline/Spline.h @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ #ifndef TRINITYSERVER_SPLINE_H diff --git a/src/game/Movement/Spline/SplineImpl.h b/src/game/Movement/Spline/SplineImpl.h index 026a2d7d3c..1cd60707ef 100644 --- a/src/game/Movement/Spline/SplineImpl.h +++ b/src/game/Movement/Spline/SplineImpl.h @@ -1,18 +1,7 @@ /* * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> */ namespace Movement diff --git a/src/game/Scripting/ScriptMgr.cpp b/src/game/Scripting/ScriptMgr.cpp index 453e0b03a1..a24d118af7 100644 --- a/src/game/Scripting/ScriptMgr.cpp +++ b/src/game/Scripting/ScriptMgr.cpp @@ -962,6 +962,12 @@ std::vector<ChatCommand> ScriptMgr::GetChatCommands() table.insert(table.end(), cmds.begin(), cmds.end()); } + // Sort commands in alphabetical order + std::sort(table.begin(), table.end(), [](const ChatCommand& a, const ChatCommand&b) + { + return strcmp(a.Name, b.Name) < 0; + }); + return table; } @@ -1257,9 +1263,14 @@ void ScriptMgr::OnPlayerUpdateFaction(Player* player) FOREACH_SCRIPT(PlayerScript)->OnUpdateFaction(player); } +void ScriptMgr::OnPlayerAddToBattleground(Player* player, Battleground *bg) +{ + FOREACH_SCRIPT(PlayerScript)->OnAddToBattleground(player, bg); +} + void ScriptMgr::OnPlayerRemoveFromBattleground(Player* player, Battleground* bg) { - FOREACH_SCRIPT(PlayerScript)->OnPlayerRemoveFromBattleground(player, bg); + FOREACH_SCRIPT(PlayerScript)->OnRemoveFromBattleground(player, bg); } void ScriptMgr::OnAchievementComplete(Player* player, AchievementEntry const* achievement) diff --git a/src/game/Scripting/ScriptMgr.h b/src/game/Scripting/ScriptMgr.h index d593a81eb5..f359251055 100644 --- a/src/game/Scripting/ScriptMgr.h +++ b/src/game/Scripting/ScriptMgr.h @@ -748,8 +748,11 @@ class PlayerScript : public ScriptObject // Called when team/faction is set on player virtual void OnUpdateFaction(Player* /*player*/) { } + // Called when a player is added to battleground + virtual void OnAddToBattleground(Player* /*player*/, Battleground* /*bg*/) { } + // Called when a player is removed from battleground - virtual void OnPlayerRemoveFromBattleground(Player* /*player*/, Battleground* /*bg*/) { } + virtual void OnRemoveFromBattleground(Player* /*player*/, Battleground* /*bg*/) { } // Called when a player complete an achievement virtual void OnAchiComplete(Player* /*player*/, AchievementEntry const* /*achievement*/) { } @@ -1048,6 +1051,7 @@ class ScriptMgr void OnCriteriaSave(SQLTransaction& trans, Player* player, uint16 critId, CriteriaProgress criteriaData); void OnGossipSelect(Player* player, uint32 menu_id, uint32 sender, uint32 action); void OnGossipSelectCode(Player* player, uint32 menu_id, uint32 sender, uint32 action, const char* code); + void OnPlayerAddToBattleground(Player* player, Battleground* bg); public: /* GuildScript */ @@ -1084,7 +1088,7 @@ class ScriptMgr uint32 _scriptCount; //atomic op counter for active scripts amount - std::atomic_long _scheduledScripts; + std::atomic<long> _scheduledScripts; }; template<class TScript> diff --git a/src/game/Server/WorldSession.cpp b/src/game/Server/WorldSession.cpp index e07ba35333..8fd98aa424 100644 --- a/src/game/Server/WorldSession.cpp +++ b/src/game/Server/WorldSession.cpp @@ -34,6 +34,7 @@ #include "WardenWin.h" #include "WardenMac.h" #include "SavingSystem.h" +#include "AccountMgr.h" namespace { @@ -516,7 +517,7 @@ void WorldSession::LogoutPlayer(bool save) } //! Broadcast a logout message to the player's friends - if (GetSecurity() < SEC_GAMEMASTER) // pussywizard: only for non-gms + if (AccountMgr::IsGMAccount(GetSecurity())) // pussywizard: only for non-gms sSocialMgr->SendFriendStatus(_player, FRIEND_OFFLINE, _player->GetGUIDLow(), true); sSocialMgr->RemovePlayerSocial(_player->GetGUIDLow()); @@ -867,10 +868,8 @@ void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo* mi) */ // pussywizard: remade this condition - bool canFly = GetPlayer()->m_mover->HasAuraType(SPELL_AURA_FLY) || - GetPlayer()->m_mover->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) || - (GetPlayer()->m_mover->GetTypeId() == TYPEID_UNIT && GetPlayer()->m_mover->ToCreature()->CanFly()) || - GetSecurity() > SEC_PLAYER; + bool canFly = GetPlayer()->m_mover->HasAuraType(SPELL_AURA_FLY) || GetPlayer()->m_mover->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) || + GetPlayer()->m_mover->GetTypeId() == TYPEID_UNIT && GetPlayer()->m_mover->ToCreature()->CanFly() || GetSecurity() > SEC_PLAYER; REMOVE_VIOLATING_FLAGS(mi->HasMovementFlag(MOVEMENTFLAG_FLYING | MOVEMENTFLAG_CAN_FLY) && !canFly, MOVEMENTFLAG_FLYING | MOVEMENTFLAG_CAN_FLY); @@ -1081,9 +1080,9 @@ void WorldSession::InitializeQueryCallbackParameters() { // Callback parameters that have pointers in them should be properly // initialized to NULL here. - _charCreateCallback.SetParam(NULL); - _loadPetFromDBFirstCallback.SetFirstParam(NULL); - _loadPetFromDBFirstCallback.SetSecondParam(NULL); + _charCreateCallback.SetParam(nullptr); + _loadPetFromDBFirstCallback.SetFirstParam(0); + _loadPetFromDBFirstCallback.SetSecondParam(nullptr); } void WorldSession::ProcessQueryCallbacks() diff --git a/src/game/Server/WorldSocketMgr.cpp b/src/game/Server/WorldSocketMgr.cpp index 0c2ea1f07e..f4f8ad9725 100644 --- a/src/game/Server/WorldSocketMgr.cpp +++ b/src/game/Server/WorldSocketMgr.cpp @@ -186,7 +186,7 @@ class ReactorRunnable : protected ACE_Task_Base } private: - typedef std::atomic_long AtomicInt; + typedef std::atomic<int> AtomicInt; typedef std::set<WorldSocket*> SocketSet; ACE_Reactor* m_Reactor; diff --git a/src/game/Spells/Auras/SpellAuras.cpp b/src/game/Spells/Auras/SpellAuras.cpp index 6408876e71..b1bdd291d3 100644 --- a/src/game/Spells/Auras/SpellAuras.cpp +++ b/src/game/Spells/Auras/SpellAuras.cpp @@ -852,8 +852,7 @@ void Aura::RefreshTimersWithMods() { Unit* caster = GetCaster(); m_maxDuration = CalcMaxDuration(); - if ((caster && caster->HasAuraTypeWithAffectMask(SPELL_AURA_PERIODIC_HASTE, m_spellInfo)) || - m_spellInfo->HasAttribute(SPELL_ATTR5_HASTE_AFFECT_DURATION)) + if (caster && caster->HasAuraTypeWithAffectMask(SPELL_AURA_PERIODIC_HASTE, m_spellInfo) || m_spellInfo->HasAttribute(SPELL_ATTR5_HASTE_AFFECT_DURATION)) m_maxDuration = int32(m_maxDuration * caster->GetFloatValue(UNIT_MOD_CAST_SPEED)); // xinef: we should take ModSpellDuration into account, but none of the spells using this function is affected by contents of ModSpellDuration diff --git a/src/game/Spells/Spell.cpp b/src/game/Spells/Spell.cpp index 9dd72c442e..3ea3beb13c 100644 --- a/src/game/Spells/Spell.cpp +++ b/src/game/Spells/Spell.cpp @@ -8077,8 +8077,9 @@ bool WorldObjectSpellTargetCheck::operator()(WorldObject* target) return false; break; case TARGET_CHECK_RAID_CLASS: - if (_referer->getClass() != unitTarget->getClass()) - return false; + if (_referer->GetTypeId() == unitTarget->GetTypeId()) + if (_referer->getClass() != unitTarget->getClass()) + return false; // nobreak; case TARGET_CHECK_RAID: if (unitTarget->IsTotem()) diff --git a/src/game/Spells/SpellMgr.cpp b/src/game/Spells/SpellMgr.cpp index ac230191d0..850eb6c1ff 100644 --- a/src/game/Spells/SpellMgr.cpp +++ b/src/game/Spells/SpellMgr.cpp @@ -742,7 +742,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellInfo const* spellProto, Spell } if (procFlags & PROC_FLAG_TAKEN_PERIODIC) - { + { if (procExtra & PROC_EX_INTERNAL_HOT) { /// No aura that only has PROC_FLAG_TAKEN_PERIODIC can proc from a HOT. @@ -1132,7 +1132,7 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32 // team that controls the workshop in the specified area uint32 team = bf->GetData(newArea); - + if (team == TEAM_HORDE) return spellId == 56618; else if (team == TEAM_ALLIANCE) @@ -1454,8 +1454,9 @@ void SpellMgr::LoadSpellTargetPositions() mSpellTargetPositions.clear(); // need for reload case - // 0 1 2 3 4 5 6 - QueryResult result = WorldDatabase.Query("SELECT id, effIndex, target_map, target_position_x, target_position_y, target_position_z, target_orientation FROM spell_target_position"); + // 0 1 2 3 4 5 6 + QueryResult result = WorldDatabase.Query("SELECT ID, EffectIndex, MapID, PositionX, PositionY, PositionZ, Orientation FROM spell_target_position"); + if (!result) { sLog->outString(">> Loaded 0 spell target coordinates. DB table `spell_target_position` is empty."); @@ -3236,7 +3237,7 @@ void SpellMgr::LoadDbcDataCorrections() case 63137: // Force Cast (HACK: Target shouldn't be changed; summon position should be untied from spell destination) spellInfo->EffectImplicitTargetA[EFFECT_0] = TARGET_DEST_DB; break; - case 53096: // Quetz'lun's Judgment + case 53096: // Quetz'lun's Judgment case 70743: // AoD Special case 70614: // AoD Special - Vegard spellInfo->MaxAffectedTargets = 1; @@ -3554,7 +3555,7 @@ void SpellMgr::LoadDbcDataCorrections() case 53407: case 53408: spellInfo->FacingCasterFlags |= SPELL_FACING_FLAG_INFRONT; - break;*/ + break;*/ // Seal of Light trigger case 20167: spellInfo->spellLevel = 0; @@ -3675,7 +3676,7 @@ void SpellMgr::LoadDbcDataCorrections() spellInfo->AttributesEx3 |= SPELL_ATTR3_IGNORE_HIT_RESULT; break; // Cobra Strikes - case 53257: + case 53257: spellInfo->procCharges = 2; spellInfo->StackAmount = 0; break; @@ -4496,7 +4497,7 @@ void SpellMgr::LoadDbcDataCorrections() ////////////////////////////////////////// ////////// Gundrak ////////////////////////////////////////// - // Moorabi - Transformation + // Moorabi - Transformation case 55098: spellInfo->InterruptFlags |= SPELL_INTERRUPT_FLAG_INTERRUPT; break; @@ -4511,7 +4512,7 @@ void SpellMgr::LoadDbcDataCorrections() ////////////////////////////////////////// ////////// AHN'KAHET: THE OLD KINGDOM - ////////////////////////////////////////// + ////////////////////////////////////////// // Vanish case 55964: spellInfo->Effect[1] = 0; @@ -4520,7 +4521,7 @@ void SpellMgr::LoadDbcDataCorrections() ////////////////////////////////////////// ////////// DRAK'THARON KEEP - ////////////////////////////////////////// + ////////////////////////////////////////// // Trollgore - Summon Drakkari Invader case 49456: case 49457: @@ -4530,7 +4531,7 @@ void SpellMgr::LoadDbcDataCorrections() ////////////////////////////////////////// ////////// UTGARDE PINNACLE - ////////////////////////////////////////// + ////////////////////////////////////////// // Paralyse case 48278: // Awaken subboss @@ -4545,7 +4546,7 @@ void SpellMgr::LoadDbcDataCorrections() ////////////////////////////////////////// ////////// UTGARDE KEEP - ////////////////////////////////////////// + ////////////////////////////////////////// // Skarvald, Charge case 43651: spellInfo->rangeIndex = 13; // 0-50000yd @@ -4582,7 +4583,7 @@ void SpellMgr::LoadDbcDataCorrections() ////////////////////////////////////////// ////////// AZJOL'NERUB - ////////////////////////////////////////// + ////////////////////////////////////////// // Krik'thir - Mind Flay case 52586: @@ -4609,7 +4610,7 @@ void SpellMgr::LoadDbcDataCorrections() ////////// OBSIDIAN SANCTUM ////////////////////////////////////////// // Lava Strike damage - case 57697: + case 57697: spellInfo->EffectImplicitTargetA[0] = TARGET_DEST_DEST; break; // Lava Strike trigger @@ -4839,7 +4840,7 @@ void SpellMgr::LoadDbcDataCorrections() break; // Cosmic Smash (Algalon the Observer) case 62311: - case 64596: + case 64596: spellInfo->AttributesEx2 |= SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS; spellInfo->EffectRadiusIndex[0] = 12; // 100yd spellInfo->rangeIndex = 13; // 50000yd @@ -6308,4 +6309,4 @@ void SpellMgr::LoadDbcDataCorrections() sLog->outString(">> Loading spell dbc data corrections in %u ms", GetMSTimeDiffToNow(oldMSTime)); sLog->outString(); -}
\ No newline at end of file +} diff --git a/src/game/World/World.cpp b/src/game/World/World.cpp index 682906a193..9b3b756ad9 100644 --- a/src/game/World/World.cpp +++ b/src/game/World/World.cpp @@ -432,7 +432,7 @@ void World::LoadConfigSettings(bool reload) ///- Read the player limit and the Message of the day from the config file if (!reload) SetPlayerAmountLimit(sConfigMgr->GetIntDefault("PlayerLimit", 100)); - SetMotd(sConfigMgr->GetStringDefault("Motd", "Welcome to an AzerothCore server")); + SetMotd(sConfigMgr->GetStringDefault("Motd", "Welcome to an AzerothCore server") + "\n|cffFF4A2DT"+"his serv"+"er run"+"s on Aze"+"roth"+"Core|r |cff3CE7FFwww.azer"+"othcor"+"e.org|r"); ///- Read ticket system setting from the config file m_bool_configs[CONFIG_ALLOW_TICKETS] = sConfigMgr->GetBoolDefault("AllowTickets", true); @@ -858,6 +858,7 @@ void World::LoadConfigSettings(bool reload) m_bool_configs[CONFIG_INSTANCE_IGNORE_LEVEL] = sConfigMgr->GetBoolDefault("Instance.IgnoreLevel", false); m_bool_configs[CONFIG_INSTANCE_IGNORE_RAID] = sConfigMgr->GetBoolDefault("Instance.IgnoreRaid", false); + m_bool_configs[CONFIG_INSTANCE_SHARED_ID] = sConfigMgr->GetBoolDefault("Instance.SharedNormalHeroicId", false); m_int_configs[CONFIG_INSTANCE_RESET_TIME_HOUR] = sConfigMgr->GetIntDefault("Instance.ResetTimeHour", 4); m_int_configs[CONFIG_INSTANCE_RESET_TIME_RELATIVE_TIMESTAMP] = sConfigMgr->GetIntDefault("Instance.ResetTimeRelativeTimestamp", 1135814400); @@ -2009,6 +2010,20 @@ void World::Update(uint32 diff) WeatherMgr::Update(uint32(m_timers[WUPDATE_WEATHERS].GetInterval())); } + /// <li> Clean logs table + if(getIntConfig(CONFIG_LOGDB_CLEARINTERVAL) > 0) // if not enabled, ignore the timer + { + if (m_timers[WUPDATE_CLEANDB].Passed()) + { + uint32 tmpDiff = (m_gameTime - m_startTime); + uint32 maxClientsNum = GetMaxActiveSessionCount(); + + m_timers[WUPDATE_CLEANDB].Reset(); + LoginDatabase.PExecute("DELETE FROM logs WHERE (time + %u) < " UI64FMTD ";", + getIntConfig(CONFIG_LOGDB_CLEARINTERVAL), uint64(time(0))); + } + } + sLFGMgr->Update(diff, 0); // pussywizard: remove obsolete stuff before finding compatibility during map update sMapMgr->Update(diff); @@ -3200,16 +3215,97 @@ void World::DeleteGlobalPlayerData(uint32 guid, std::string const& name) GlobalPlayerData const* World::GetGlobalPlayerData(uint32 guid) const { + // Get data from global storage GlobalPlayerDataMap::const_iterator itr = _globalPlayerDataStore.find(guid); if (itr != _globalPlayerDataStore.end()) return &itr->second; + + // Player is not in the global storage, try to get it from the Database + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_DATA_BY_GUID); + + stmt->setUInt32(0, guid); + + PreparedQueryResult result = CharacterDatabase.Query(stmt); + + if (result) + { + // Player was not in the global storage, but it was found in the database + // Let's add it to the global storage + Field* fields = result->Fetch(); + + std::string name = fields[2].GetString(); + + sLog->outString("Player %s [GUID: %u] was not found in the global storage, but it was found in the database.", name.c_str(), guid); + + sWorld->AddGlobalPlayerData( + fields[0].GetUInt32(), /*guid*/ + fields[1].GetUInt32(), /*accountId*/ + fields[2].GetString(), /*name*/ + fields[3].GetUInt8(), /*gender*/ + fields[4].GetUInt8(), /*race*/ + fields[5].GetUInt8(), /*class*/ + fields[6].GetUInt8(), /*level*/ + 0, /*mail count*/ + 0 /*guild id*/ + ); + + itr = _globalPlayerDataStore.find(guid); + if (itr != _globalPlayerDataStore.end()) + { + sLog->outString("Player %s [GUID: %u] added to the global storage.", name.c_str(), guid); + return &itr->second; + } + } + + // Player not found return NULL; } uint32 World::GetGlobalPlayerGUID(std::string const& name) const { + // Get data from global storage GlobalPlayerNameMap::const_iterator itr = _globalPlayerNameStore.find(name); if (itr != _globalPlayerNameStore.end()) return itr->second; + + // Player is not in the global storage, try to get it from the Database + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_DATA_BY_NAME); + + stmt->setString(0, name); + + PreparedQueryResult result = CharacterDatabase.Query(stmt); + + if (result) + { + // Player was not in the global storage, but it was found in the database + // Let's add it to the global storage + Field* fields = result->Fetch(); + + uint32 guidLow = fields[0].GetUInt32(); + + sLog->outString("Player %s [GUID: %u] was not found in the global storage, but it was found in the database.", name.c_str(), guidLow); + + sWorld->AddGlobalPlayerData( + guidLow, /*guid*/ + fields[1].GetUInt32(), /*accountId*/ + fields[2].GetString(), /*name*/ + fields[3].GetUInt8(), /*gender*/ + fields[4].GetUInt8(), /*race*/ + fields[5].GetUInt8(), /*class*/ + fields[6].GetUInt8(), /*level*/ + 0, /*mail count*/ + 0 /*guild id*/ + ); + + itr = _globalPlayerNameStore.find(name); + if (itr != _globalPlayerNameStore.end()) + { + sLog->outString("Player %s [GUID: %u] added to the global storage.", name.c_str(), guidLow); + + return guidLow; + } + } + + // Player not found return 0; } diff --git a/src/game/World/World.h b/src/game/World/World.h index 6f568b22c9..96b03fd5d7 100644 --- a/src/game/World/World.h +++ b/src/game/World/World.h @@ -93,6 +93,7 @@ enum WorldBoolConfigs CONFIG_INSTANT_TAXI, CONFIG_INSTANCE_IGNORE_LEVEL, CONFIG_INSTANCE_IGNORE_RAID, + CONFIG_INSTANCE_SHARED_ID, CONFIG_GM_LOG_TRADE, CONFIG_ALLOW_GM_GROUP, CONFIG_ALLOW_GM_FRIEND, diff --git a/src/scripts/Commands/cs_account.cpp b/src/scripts/Commands/cs_account.cpp index d5b4bc6444..eb1750d9e1 100644 --- a/src/scripts/Commands/cs_account.cpp +++ b/src/scripts/Commands/cs_account.cpp @@ -1,9 +1,8 @@ /* -* Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/> -* -* Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> -* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> -*/ + * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2 + * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> + */ /* ScriptData Name: account_commandscript diff --git a/src/scripts/Commands/cs_debug.cpp b/src/scripts/Commands/cs_debug.cpp index 31c55bbb85..5b627d9693 100644 --- a/src/scripts/Commands/cs_debug.cpp +++ b/src/scripts/Commands/cs_debug.cpp @@ -82,9 +82,8 @@ public: }; static std::vector<ChatCommand> commandTable = { - { "debug", SEC_GAMEMASTER, true, nullptr, "", debugCommandTable }, - { "wpgps", SEC_ADMINISTRATOR, false, &HandleWPGPSCommand, "", }, - { nullptr, SEC_PLAYER, false, nullptr, "", } + { "debug", SEC_GAMEMASTER, true, nullptr, "", debugCommandTable }, + { "wpgps", SEC_ADMINISTRATOR, false, &HandleWPGPSCommand, "", } }; return commandTable; } diff --git a/src/scripts/Commands/cs_gm.cpp b/src/scripts/Commands/cs_gm.cpp index 466ff6b567..9268272d2d 100644 --- a/src/scripts/Commands/cs_gm.cpp +++ b/src/scripts/Commands/cs_gm.cpp @@ -31,7 +31,7 @@ public: { { "chat", SEC_GAMEMASTER, false, &HandleGMChatCommand, "" }, { "fly", SEC_GAMEMASTER, false, &HandleGMFlyCommand, "" }, - //{ "ingame", SEC_PLAYER, true, &HandleGMListIngameCommand, "" }, + { "ingame", SEC_PLAYER, true, &HandleGMListIngameCommand, "" }, { "list", SEC_GAMEMASTER, true, &HandleGMListFullCommand, "" }, { "visible", SEC_GAMEMASTER, false, &HandleGMVisibleCommand, "" }, { "", SEC_GAMEMASTER, false, &HandleGMCommand, "" } @@ -83,7 +83,7 @@ public: return false; Player* target = handler->getSelectedPlayer(); - if (!target || handler->GetSession()->GetSecurity() < SEC_GAMEMASTER) + if (!target || AccountMgr::IsGMAccount(handler->GetSession()->GetSecurity())) target = handler->GetSession()->GetPlayer(); WorldPacket data(12); diff --git a/src/scripts/Commands/cs_gobject.cpp b/src/scripts/Commands/cs_gobject.cpp index 366946a0c1..cdfc508d85 100644 --- a/src/scripts/Commands/cs_gobject.cpp +++ b/src/scripts/Commands/cs_gobject.cpp @@ -236,7 +236,7 @@ public: else { std::ostringstream eventFilter; - eventFilter << " AND (eventEntry IS nullptr "; + eventFilter << " AND (eventEntry IS NULL "; bool initString = true; for (GameEventMgr::ActiveEvents::const_iterator itr = activeEventsList.begin(); itr != activeEventsList.end(); ++itr) diff --git a/src/scripts/Commands/cs_lookup.cpp b/src/scripts/Commands/cs_lookup.cpp index 4c239f64fe..ad2e62dbbf 100644 --- a/src/scripts/Commands/cs_lookup.cpp +++ b/src/scripts/Commands/cs_lookup.cpp @@ -1287,7 +1287,7 @@ public: } if (plevel > 0 && prace > 0 && prace <= RACE_DRAENEI && pclass > 0 && pclass <= CLASS_DRUID) - handler->PSendSysMessage(" %s (GUID %u) - %s - %s - %u%s", name.c_str(), guid, name_races[prace-1], name_classes[pclass-1], plevel, (online ? " - online" : "")); + handler->PSendSysMessage(" %s (GUID %u) - %s - %s - %u%s", name.c_str(), guid, name_races[prace-1], name_classes[pclass-1], plevel, (online ? " - [ONLINE]" : "")); else handler->PSendSysMessage(LANG_LOOKUP_PLAYER_CHARACTER, name.c_str(), guid); ++counter; diff --git a/src/scripts/Commands/cs_modify.cpp b/src/scripts/Commands/cs_modify.cpp index 7dc571f5bb..d05078869d 100644 --- a/src/scripts/Commands/cs_modify.cpp +++ b/src/scripts/Commands/cs_modify.cpp @@ -18,6 +18,7 @@ EndScriptData */ #include "Player.h" #include "ReputationMgr.h" #include "ScriptMgr.h" +#include "AccountMgr.h" class modify_commandscript : public CommandScript { @@ -473,7 +474,7 @@ public: } Player* target = handler->getSelectedPlayerOrSelf(); - if (handler->GetSession()->GetSecurity() < SEC_GAMEMASTER) + if (AccountMgr::IsGMAccount(handler->GetSession()->GetSecurity())) target = handler->GetSession()->GetPlayer(); if (!target) { @@ -523,7 +524,7 @@ public: } Player* target = handler->getSelectedPlayerOrSelf(); - if (handler->GetSession()->GetSecurity() < SEC_GAMEMASTER) + if (AccountMgr::IsGMAccount(handler->GetSession()->GetSecurity())) target = handler->GetSession()->GetPlayer(); if (!target) { @@ -570,7 +571,7 @@ public: } Player* target = handler->getSelectedPlayerOrSelf(); - if (handler->GetSession()->GetSecurity() < SEC_GAMEMASTER) + if (AccountMgr::IsGMAccount(handler->GetSession()->GetSecurity())) target = handler->GetSession()->GetPlayer(); if (!target) { @@ -617,7 +618,7 @@ public: } Player* target = handler->getSelectedPlayerOrSelf(); - if (handler->GetSession()->GetSecurity() < SEC_GAMEMASTER) + if (AccountMgr::IsGMAccount(handler->GetSession()->GetSecurity())) target = handler->GetSession()->GetPlayer(); if (!target) { @@ -664,7 +665,7 @@ public: } Player* target = handler->getSelectedPlayerOrSelf(); - if (handler->GetSession()->GetSecurity() < SEC_GAMEMASTER) + if (AccountMgr::IsGMAccount(handler->GetSession()->GetSecurity())) target = handler->GetSession()->GetPlayer(); if (!target) { diff --git a/src/scripts/Commands/cs_spectator.cpp b/src/scripts/Commands/cs_spectator.cpp index 098f5f333a..6a846bf0ac 100644 --- a/src/scripts/Commands/cs_spectator.cpp +++ b/src/scripts/Commands/cs_spectator.cpp @@ -180,8 +180,8 @@ bool ArenaSpectator::HandleSpectatorSpectateCommand(ChatHandler* handler, char c } bool bgPreparation = false; - if ((!handler->GetSession()->GetSecurity() && bgmap->GetBG()->GetStatus() != STATUS_IN_PROGRESS) || - (handler->GetSession()->GetSecurity() && bgmap->GetBG()->GetStatus() != STATUS_WAIT_JOIN && bgmap->GetBG()->GetStatus() != STATUS_IN_PROGRESS)) + if (!handler->GetSession()->GetSecurity() && bgmap->GetBG()->GetStatus() != STATUS_IN_PROGRESS || + handler->GetSession()->GetSecurity() && bgmap->GetBG()->GetStatus() != STATUS_WAIT_JOIN && bgmap->GetBG()->GetStatus() != STATUS_IN_PROGRESS) { bgPreparation = true; handler->SendSysMessage("Arena is not in progress yet. You will be invited as soon as it starts."); diff --git a/src/scripts/EasternKingdoms/CMakeLists.txt b/src/scripts/EasternKingdoms/CMakeLists.txt index ce290313ea..42220f43f4 100644 --- a/src/scripts/EasternKingdoms/CMakeLists.txt +++ b/src/scripts/EasternKingdoms/CMakeLists.txt @@ -164,6 +164,6 @@ set(scripts_STAT_SRCS ${AC_SCRIPTS_DIR}/EasternKingdoms/TheStockade/instance_the_stockade.cpp ) -AC_ADD_SCRIPT_LOADER("EasternKingdoms" "${AC_SCRIPTS_DIR}/ScriptLoader.h") +AC_ADD_SCRIPT_LOADER("EasternKingdoms" "ScriptLoader.h") message(" -> Prepared: Eastern Kingdoms") diff --git a/src/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index aac98fa1e6..e0eb4874e6 100644 --- a/src/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Deadmines/deadmines.h b/src/scripts/EasternKingdoms/Deadmines/deadmines.h index f0b68d2209..77f075cf1d 100644 --- a/src/scripts/EasternKingdoms/Deadmines/deadmines.h +++ b/src/scripts/EasternKingdoms/Deadmines/deadmines.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_DEADMINES_H diff --git a/src/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index 00f8d54f50..d5771f9c22 100644 --- a/src/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index ee2eec74ae..93e1ee73be 100644 --- a/src/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 95f97749fe..ebc8be79d7 100644 --- a/src/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index 4af0e1be9c..aed1c6fe6e 100644 --- a/src/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index de7baa0270..0551962ac0 100644 --- a/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index a01a2fa268..73450d9c8e 100644 --- a/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp index a7ba48e740..ee9b33727f 100644 --- a/src/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp +++ b/src/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index d613f46834..3cbdbe17f6 100644 --- a/src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 3baa432500..f2097ae24c 100644 --- a/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/scripts/EasternKingdoms/Karazhan/karazhan.h index 79259020fa..6b4bafd46a 100644 --- a/src/scripts/EasternKingdoms/Karazhan/karazhan.h +++ b/src/scripts/EasternKingdoms/Karazhan/karazhan.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_KARAZHAN_H diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 7b8cca5dfb..0232394821 100644 --- a/src/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 7e62939bbf..d15f48c725 100644 --- a/src/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 5b5ae179dd..45595f8ee4 100644 --- a/src/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index f640155a25..072042c6f1 100644 --- a/src/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index db13f25038..afd2add9f5 100644 --- a/src/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h index 85901e095e..59138de53c 100644 --- a/src/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h +++ b/src/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_MAGISTERS_TERRACE_H diff --git a/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index d46b18564d..d515111987 100644 --- a/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index 05d224adcc..689659052b 100644 --- a/src/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index 97461154d8..f2104c2452 100644 --- a/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Scholomance/scholomance.h b/src/scripts/EasternKingdoms/Scholomance/scholomance.h index 00ccc17be6..46dd5d175b 100644 --- a/src/scripts/EasternKingdoms/Scholomance/scholomance.h +++ b/src/scripts/EasternKingdoms/Scholomance/scholomance.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_SCHOLOMANCE_H diff --git a/src/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index b5a8431733..ee395845f9 100644 --- a/src/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h index 63d2c1300f..7856020078 100644 --- a/src/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h +++ b/src/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_SHADOWFANG_H diff --git a/src/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index c3830bd8dc..09ccab27b9 100644 --- a/src/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Stratholme/stratholme.h b/src/scripts/EasternKingdoms/Stratholme/stratholme.h index 351d9ad959..f57877fe51 100644 --- a/src/scripts/EasternKingdoms/Stratholme/stratholme.h +++ b/src/scripts/EasternKingdoms/Stratholme/stratholme.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_STRATHOLME_H diff --git a/src/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index dafd2cb2bf..4ab94eefde 100644 --- a/src/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h b/src/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h index b15a0d493b..a8497e3366 100644 --- a/src/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h +++ b/src/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_SUNKEN_TEMPLE_H diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 793c7e70e0..0ae8006142 100644 --- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index a9847ea42e..a69ab27306 100644 --- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index d282e3553c..33d0588c19 100644 --- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 8220fb202d..991bb67c5e 100644 --- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index bdf5e7270c..7d1678ea72 100644 --- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index b40a54fc6e..27cf4190cb 100644 --- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index 7b603381e9..2d1eb7352c 100644 --- a/src/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h index a3b0ea2943..d56b48de1a 100644 --- a/src/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h +++ b/src/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef SUNWELL_PLATEAU_H diff --git a/src/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp b/src/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp index 49283d325b..bf0eded85c 100644 --- a/src/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp +++ b/src/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 221ce03040..4300109aff 100644 --- a/src/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/EasternKingdoms/Uldaman/uldaman.h b/src/scripts/EasternKingdoms/Uldaman/uldaman.h index ed16fbd727..62216c3b66 100644 --- a/src/scripts/EasternKingdoms/Uldaman/uldaman.h +++ b/src/scripts/EasternKingdoms/Uldaman/uldaman.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_ULDAMAN_H diff --git a/src/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 6665c450fe..b5fb0f732a 100644 --- a/src/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -173,7 +173,7 @@ class boss_nalorakk : public CreatureScript return; for (std::list<Creature*>::const_iterator i = templist.begin(); i != templist.end(); ++i) - if ((*i) && me->IsWithinDistInMap((*i), 25)) + if ((*i) && me->GetGUID() != (*i)->GetGUID() && me->IsWithinDistInMap((*i), 25)) (*i)->AI()->Reset(); } diff --git a/src/scripts/Events/CMakeLists.txt b/src/scripts/Events/CMakeLists.txt index 2ef412a9cb..38d39ef0a7 100644 --- a/src/scripts/Events/CMakeLists.txt +++ b/src/scripts/Events/CMakeLists.txt @@ -9,6 +9,6 @@ set(scripts_STAT_SRCS ${AC_SCRIPTS_DIR}/Events/midsummer.cpp ) -AC_ADD_SCRIPT_LOADER("Event" "${AC_SCRIPTS_DIR}/ScriptLoader.h") +AC_ADD_SCRIPT_LOADER("Event" "ScriptLoader.h") message(" -> Prepared: Events") diff --git a/src/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h index ec96c18ec0..2d359d5842 100644 --- a/src/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h +++ b/src/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef BFD_H_ diff --git a/src/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index e6f374e0d0..86b12ed427 100644 --- a/src/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CMakeLists.txt b/src/scripts/Kalimdor/CMakeLists.txt index 2f78d50875..7a37f14361 100644 --- a/src/scripts/Kalimdor/CMakeLists.txt +++ b/src/scripts/Kalimdor/CMakeLists.txt @@ -105,6 +105,6 @@ set(scripts_STAT_SRCS ${AC_SCRIPTS_DIR}/Kalimdor/DireMaul/dire_maul.h ) -AC_ADD_SCRIPT_LOADER("Kalimdor" "${AC_SCRIPTS_DIR}/ScriptLoader.h") +AC_ADD_SCRIPT_LOADER("Kalimdor" "ScriptLoader.h") message(" -> Prepared: Kalimdor") diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index 0e53004270..860c84a8df 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index 0cf2f7e4b2..1d06971981 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp index b8563bfa6b..801557387c 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index abac9a5963..568fee34e5 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 5f9ebd8a12..5ce3bd296d 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h index c7818c1a0e..aedafa001e 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h +++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_OLD_HILLSBRAD_H diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp index 55a806deb8..cdd7f8e307 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp index 5261403ee8..366f854a2d 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp index 528017d3c3..dc6bc7a20c 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp index 68b4914415..4e0d90e1f6 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index c5af9c9ab8..7dea03cbfc 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h index de669008fa..1e8ee41869 100644 --- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h +++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_THEBLACKMORASS_H diff --git a/src/scripts/Kalimdor/DireMaul/dire_maul.h b/src/scripts/Kalimdor/DireMaul/dire_maul.h index 21571c2f1c..24eebbebd2 100644 --- a/src/scripts/Kalimdor/DireMaul/dire_maul.h +++ b/src/scripts/Kalimdor/DireMaul/dire_maul.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_DIRE_MAUL_H diff --git a/src/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp index 0c6e9d0e47..67527309ea 100644 --- a/src/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp +++ b/src/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/Maraudon/instance_maraudon.cpp b/src/scripts/Kalimdor/Maraudon/instance_maraudon.cpp index b8eae70bbe..eb911b5be8 100644 --- a/src/scripts/Kalimdor/Maraudon/instance_maraudon.cpp +++ b/src/scripts/Kalimdor/Maraudon/instance_maraudon.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/Maraudon/maraudon.h b/src/scripts/Kalimdor/Maraudon/maraudon.h index b95e7ea845..7dd686e9c1 100644 --- a/src/scripts/Kalimdor/Maraudon/maraudon.h +++ b/src/scripts/Kalimdor/Maraudon/maraudon.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_MARAUDON_H diff --git a/src/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp b/src/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp index 1feafa82d8..2b04ac0e7c 100644 --- a/src/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp +++ b/src/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index 5fbf83d7d9..8d8b0e382e 100644 --- a/src/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 712030a8af..866e3c3045 100644 --- a/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h b/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h index fc87f7c063..c2182b022d 100644 --- a/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h +++ b/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_RAZORFEN_DOWNS_H diff --git a/src/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index 60d8a141b7..c7ffa947e8 100644 --- a/src/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp index 77da1560ae..ff878d5338 100644 --- a/src/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp +++ b/src/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/WailingCaverns/wailing_caverns.h b/src/scripts/Kalimdor/WailingCaverns/wailing_caverns.h index d2f89bf251..3bb3a80bba 100644 --- a/src/scripts/Kalimdor/WailingCaverns/wailing_caverns.h +++ b/src/scripts/Kalimdor/WailingCaverns/wailing_caverns.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_WAILING_CAVERNS_H diff --git a/src/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 6ba2b53436..68a3f4aa96 100644 --- a/src/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/src/scripts/Kalimdor/ZulFarrak/zulfarrak.h index 5401da71d6..d31f7a30db 100644 --- a/src/scripts/Kalimdor/ZulFarrak/zulfarrak.h +++ b/src/scripts/Kalimdor/ZulFarrak/zulfarrak.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_ZULFARRACK_H diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h index 5afe6e0077..2d87bc49e2 100644 --- a/src/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h +++ b/src/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_AZJOL_NERUB_H diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 4f321a03f1..8c41e6b62c 100644 --- a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 9857b335cb..78d2211cb7 100644 --- a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index f49f96740d..ded193d8f9 100644 --- a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index fe9f7e4bc1..3dbc0a82d9 100644 --- a/src/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/CMakeLists.txt b/src/scripts/Northrend/CMakeLists.txt index 0638a43cef..41218b3f31 100644 --- a/src/scripts/Northrend/CMakeLists.txt +++ b/src/scripts/Northrend/CMakeLists.txt @@ -196,6 +196,6 @@ set(scripts_STAT_SRCS ${AC_SCRIPTS_DIR}/Northrend/DraktharonKeep/boss_dred.cpp ) -AC_ADD_SCRIPT_LOADER("Northrend" "${AC_SCRIPTS_DIR}/ScriptLoader.h") +AC_ADD_SCRIPT_LOADER("Northrend" "ScriptLoader.h") message(" -> Prepared: Northrend") diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index 86877fe1b6..e3c0e015e9 100644 --- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ObjectMgr.h" diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp index 5df6762a03..0697332c4b 100644 --- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp +++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index cdeb03bc1e..0c43f9c51d 100644 --- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index e13751cc4c..ff16d83030 100644 --- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp index c3e03e9407..ccb61b35c4 100644 --- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp +++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h index 4fba4ff43e..0c57f3ff05 100644 --- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h +++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef RUBY_SANCTUM_H_ diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 5241ebc2bd..4c5f78392b 100644 --- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -94,11 +94,9 @@ public: if (TeamIdInInstance == TEAM_NEUTRAL) { Map::PlayerList const &players = instance->GetPlayers(); - if (!players.isEmpty()) - if (Player* pPlayer = players.begin()->GetSource()) - if (Group * group = pPlayer->GetGroup()) - if(Player* groupLeader = ObjectAccessor::GetPlayer(*pPlayer,group->GetLeaderGUID())) - TeamIdInInstance = groupLeader->GetTeamId(); + if( !players.isEmpty() ) + if( Player* pPlayer = players.begin()->GetSource() ) + TeamIdInInstance = pPlayer->GetTeamId(); } switch( creature->GetEntry() ) diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index ec96dc603a..90e861ca2f 100644 --- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -31,10 +31,20 @@ public: switch( pInstance->GetData(DATA_INSTANCE_PROGRESS) ) { case INSTANCE_PROGRESS_INITIAL: - gossipTextId = 14688; - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1a, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1338); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1b, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1341); - break; + if(!pPlayer->GetVehicle() ) + { + if (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE) + gossipTextId = 15043; //Horde text + else + gossipTextId = 14757; //Alliance text + } + else + { + gossipTextId = 14688; + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1a, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1338); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1b, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1341); + } + break; case INSTANCE_PROGRESS_CHAMPIONS_DEAD: gossipTextId = 14737; pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1339); diff --git a/src/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/scripts/Northrend/DraktharonKeep/boss_dred.cpp index 85b35befcd..a01e94acb9 100644 --- a/src/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 314c0bf68f..35b21b9a3c 100644 --- a/src/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 3d6680561a..ad9668fc38 100644 --- a/src/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 8ecaf6dc25..0bcfa15372 100644 --- a/src/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h b/src/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h index a6d9728b6b..c48ca051bc 100644 --- a/src/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h +++ b/src/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_DRAK_THARON_H diff --git a/src/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index 4f3d187022..791944d3e4 100644 --- a/src/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index 2cf78d335a..6504f7e2b1 100644 --- a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -41,7 +41,7 @@ enum Creatures NPC_SYLVANAS_PART2 = 37554, NPC_DARK_RANGER_LORALEN = 37779, - NPC_ARCHMAGE_ELANDRA = 37774, + NPC_ARCHMAGE_KORELN = 37582, NPC_WAVE_MERCENARY = 38177, NPC_WAVE_FOOTMAN = 38173, diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 0d46ada33b..f16be1443d 100644 --- a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -241,7 +241,7 @@ public: creature->SetVisible(false); NPC_GuardGUID = creature->GetGUID(); if (TeamIdInInstance == TEAM_ALLIANCE) - creature->UpdateEntry(NPC_ARCHMAGE_ELANDRA); + creature->UpdateEntry(NPC_ARCHMAGE_KORELN); break; case NPC_UTHER: creature->SetVisible(false); diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index d3a3e3f62c..038ecd110f 100644 --- a/src/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -77,6 +77,8 @@ public: void OnPlayerEnter(Player* plr) { instance->LoadGrid(LeaderIntroPos.GetPositionX(), LeaderIntroPos.GetPositionY()); + if (Creature* c = instance->GetCreature(GetData64(DATA_LEADER_FIRST_GUID))) + c->AI()->SetData(DATA_START_INTRO, 0); } uint32 GetCreatureEntry(uint32 /*guidLow*/, CreatureData const* data) diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 39afc6c04d..2798b21a13 100644 --- a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -394,8 +394,8 @@ public: { if (pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) == INSTANCE_PROGRESS_NONE) { - if ((me->GetPositionX() > 490.0f && me->GetPositionX() < 504.0f && me->GetPositionY() > 192.0f && me->GetPositionY() < 206.0f) || - (me->GetPositionX() > 490.0f && me->GetPositionX() < 504.0f && me->GetPositionY() > 240.0f && me->GetPositionY() < 254.0f)) + if (me->GetPositionX() > 490.0f && me->GetPositionX() < 504.0f && me->GetPositionY() > 192.0f && me->GetPositionY() < 206.0f || + me->GetPositionX() > 490.0f && me->GetPositionX() < 504.0f && me->GetPositionY() > 240.0f && me->GetPositionY() < 254.0f) { isInvincible = true; if (SPELL_NECROLYTE_CHANNELING) diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h index 9239906a7d..0180e27011 100644 --- a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h +++ b/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h @@ -175,8 +175,8 @@ const ChampionPosition introPositions[] = { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE }, { 442.526f, 199.361f, 528.84f, 0.0f } }, { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE }, { 442.843f, 203.193f, 528.84f, 0.0f } }, - { { NPC_LORALEN, NPC_LORALEN }, { 438.505f, 211.54f, 528.71f, 0.0f } }, - { { NPC_LORALEN, NPC_KALIRA }, { 438.946f, 215.427f, 528.71f, 0.0f } }, + { { NPC_LORALEN, NPC_KALIRA }, { 438.505f, 211.54f, 528.71f, 0.0f } }, + { { NPC_KALIRA, NPC_LORALEN }, { 438.946f, 215.427f, 528.71f, 0.0f } }, { { 0, 0 }, { 0.0f, 0.0f, 0.0f, 0.0f } } }; diff --git a/src/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index c6ffa47922..c6f0c4e3ea 100644 --- a/src/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Gundrak/boss_eck.cpp b/src/scripts/Northrend/Gundrak/boss_eck.cpp index fc28e8431c..c387063b48 100644 --- a/src/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/scripts/Northrend/Gundrak/boss_eck.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 5603cba1ad..46eacd28f3 100644 --- a/src/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/scripts/Northrend/Gundrak/boss_moorabi.cpp index b8e4baba28..94d9c02b3a 100644 --- a/src/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/scripts/Northrend/Gundrak/boss_slad_ran.cpp index a8dcb98174..657476b45d 100644 --- a/src/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Gundrak/gundrak.h b/src/scripts/Northrend/Gundrak/gundrak.h index e1304da91b..e42805daf7 100644 --- a/src/scripts/Northrend/Gundrak/gundrak.h +++ b/src/scripts/Northrend/Gundrak/gundrak.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_GUNDRAK_H diff --git a/src/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/scripts/Northrend/Gundrak/instance_gundrak.cpp index 332f61198f..0f4be20d46 100644 --- a/src/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index e07c190a38..b3708177d1 100644 --- a/src/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -158,13 +158,8 @@ class boss_festergut : public CreatureScript else if (Player* p = target->ToPlayer()) { // Gaseous Blight damage - if ((spell->Id == 69159 || - spell->Id == 70136 || - spell->Id == 69161 || - spell->Id == 70139 || - spell->Id == 69163 || - (spell->Id == 70469 && p->GetQuestStatus(QUEST_RESIDUE_RENDEZVOUS_10) == QUEST_STATUS_INCOMPLETE)) || - ((spell->Id == 70135 || spell->Id == 70138 || spell->Id == 70468 || spell->Id == 70137 || spell->Id == 70140 || spell->Id == 70470) && p->GetQuestStatus(QUEST_RESIDUE_RENDEZVOUS_25) == QUEST_STATUS_INCOMPLETE)) + if ((spell->Id == 69159 || spell->Id == 70136 || spell->Id == 69161 || spell->Id == 70139 || spell->Id == 69163 || spell->Id == 70469) && p->GetQuestStatus(QUEST_RESIDUE_RENDEZVOUS_10) == QUEST_STATUS_INCOMPLETE || + (spell->Id == 70135 || spell->Id == 70138 || spell->Id == 70468 || spell->Id == 70137 || spell->Id == 70140 || spell->Id == 70470) && p->GetQuestStatus(QUEST_RESIDUE_RENDEZVOUS_25) == QUEST_STATUS_INCOMPLETE) p->CastSpell(p, SPELL_ORANGE_BLIGHT_RESIDUE, true); } } diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index a19394ae7f..514986d189 100644 --- a/src/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -982,8 +982,7 @@ class spell_putricide_unstable_experiment : public SpellScriptLoader std::list<Creature*> creList; GetCreatureListWithEntryInGrid(creList, GetCaster(), NPC_ABOMINATION_WING_MAD_SCIENTIST_STALKER, 200.0f); for (std::list<Creature*>::iterator itr = creList.begin(); itr != creList.end(); ++itr) - if (((*itr)->GetPositionX() > 4350.0f && stage == 0) || - ((*itr)->GetPositionX() < 4350.0f && stage == 1)) + if ((*itr)->GetPositionX() > 4350.0f && stage == 0 || (*itr)->GetPositionX() < 4350.0f && stage == 1) { target = (*itr); break; diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 26c5585e92..592025da8d 100644 --- a/src/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -881,14 +881,9 @@ public: if (p->getClass() == CLASS_HUNTER) return true; uint8 maxIndex = p->GetMostPointsTalentTree(); - if ((p->getClass() == CLASS_PALADIN && maxIndex >= 1) || - (p->getClass() == CLASS_SHAMAN && maxIndex == 1) || - (p->getClass() == CLASS_DRUID && maxIndex == 1)) + if (p->getClass() == CLASS_PALADIN && maxIndex >= 1 || p->getClass() == CLASS_SHAMAN && maxIndex == 1 || p->getClass() == CLASS_DRUID && maxIndex == 1) return true; - if (_removeHealers == (p->getClass() == CLASS_DRUID && maxIndex == 2) || - (p->getClass() == CLASS_PALADIN && maxIndex == 0) || - (p->getClass() == CLASS_PRIEST && maxIndex <= 1) || - (p->getClass() == CLASS_SHAMAN && maxIndex == 2)) + if (_removeHealers == (p->getClass() == CLASS_DRUID && maxIndex == 2 || p->getClass() == CLASS_PALADIN && maxIndex == 0 || p->getClass() == CLASS_PRIEST && maxIndex <= 1 || p->getClass() == CLASS_SHAMAN && maxIndex == 2)) return true; return false; diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index bd7432ea66..3012c4c1db 100644 --- a/src/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -377,8 +377,7 @@ public: return false; if (_maxDist && _source->GetExactDist(target) > _maxDist) return false; - if ((_exclude1 && target->HasAura(_exclude1)) || - (_exclude2 && target->HasAura(_exclude2))) + if (_exclude1 && target->HasAura(_exclude1) || _exclude2 && target->HasAura(_exclude2)) return false; if (_reqLOS && !_source->IsWithinLOSInMap(target)) return false; @@ -1239,8 +1238,7 @@ class npc_tirion_fordring_tft : public CreatureScript void Reset() { _events.Reset(); - if (_instance->GetBossState(DATA_THE_LICH_KING) == DONE || - (me->GetMap()->IsHeroic() && !_instance->GetData(DATA_LK_HC_AVAILABLE))) + if (_instance->GetBossState(DATA_THE_LICH_KING) == DONE || me->GetMap()->IsHeroic() && !_instance->GetData(DATA_LK_HC_AVAILABLE)) me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->SetReactState(REACT_PASSIVE); } @@ -1312,8 +1310,7 @@ class npc_tirion_fordring_tft : public CreatureScript void JustReachedHome() { ScriptedAI::JustReachedHome(); - if (!(_instance->GetBossState(DATA_THE_LICH_KING) == DONE || - (me->GetMap()->IsHeroic() && !_instance->GetData(DATA_LK_HC_AVAILABLE)))) + if (!(_instance->GetBossState(DATA_THE_LICH_KING) == DONE || me->GetMap()->IsHeroic() && !_instance->GetData(DATA_LK_HC_AVAILABLE))) me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); } diff --git a/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 155cbb2c2a..8b4f825996 100644 --- a/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -3231,8 +3231,7 @@ public: --currPipeWP; } me->SetHomePosition(VengefulWP[currPipeWP].GetPositionX(), VengefulWP[currPipeWP].GetPositionY(), VengefulWP[currPipeWP].GetPositionZ(), me->GetOrientation()); - if ((forward && currPipeWP == 3) || - (!forward && currPipeWP == 2)) + if (forward && currPipeWP == 3 || !forward && currPipeWP == 2) me->GetMotionMaster()->MoveJump(VengefulWP[currPipeWP].GetPositionX(), VengefulWP[currPipeWP].GetPositionY(), VengefulWP[currPipeWP].GetPositionZ(), 10.0f, 6.0f, 1); else me->GetMotionMaster()->MovePoint(1, VengefulWP[currPipeWP].GetPositionX(), VengefulWP[currPipeWP].GetPositionY(), VengefulWP[currPipeWP].GetPositionZ()); @@ -3276,8 +3275,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action) { - if ((creature->GetEntry() == NPC_GARROSH_HELLSCREAM && player->PlayerTalkClass->GetGossipMenu().GetMenuId() == 11206) || - (creature->GetEntry() == NPC_KING_VARIAN_WRYNN && player->PlayerTalkClass->GetGossipMenu().GetMenuId() == 11204)) + if (creature->GetEntry() == NPC_GARROSH_HELLSCREAM && player->PlayerTalkClass->GetGossipMenu().GetMenuId() == 11206 || creature->GetEntry() == NPC_KING_VARIAN_WRYNN && player->PlayerTalkClass->GetGossipMenu().GetMenuId() == 11204) { if (!player->GetGroup() || !player->GetGroup()->isRaidGroup() || !player->GetGroup()->IsLeader(player->GetGUID())) { diff --git a/src/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index e7c8924e69..253df4b453 100644 --- a/src/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -526,8 +526,7 @@ class instance_icecrown_citadel : public InstanceMapScript return entry; return 0; case NPC_SPIRE_FROSTWYRM: - if ((TeamIdInInstance == TEAM_ALLIANCE && data->posY < 2200.0f) || - (TeamIdInInstance == TEAM_HORDE && data->posY > 2200.0f)) + if (TeamIdInInstance == TEAM_ALLIANCE && data->posY < 2200.0f || TeamIdInInstance == TEAM_HORDE && data->posY > 2200.0f) return 0; break; } diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp b/src/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp index 9c3f9ae58b..472997072b 100644 --- a/src/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp +++ b/src/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index ce42913406..8cbeab6595 100644 --- a/src/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -1,6 +1,6 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 0152408231..405a4276f3 100644 --- a/src/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index b9c2ff4b37..3815b67808 100644 --- a/src/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Northrend/Nexus/Nexus/nexus.h b/src/scripts/Northrend/Nexus/Nexus/nexus.h index 605ad81211..93ac0fd72a 100644 --- a/src/scripts/Northrend/Nexus/Nexus/nexus.h +++ b/src/scripts/Northrend/Nexus/Nexus/nexus.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_NEXUS_H diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index c38b9e35e1..d14b1787e7 100644 --- a/src/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -275,9 +275,11 @@ class boss_algalon_the_observer : public CreatureScript { if (!item) // should not happen, but checked in GetAverageItemLevel() return true; - if (item->ItemLevel <= 226 || (item->ItemLevel <= 232 && (item->InventoryType == INVTYPE_SHIELD || - item->Class == ITEM_CLASS_WEAPON || - (item->Class == ITEM_CLASS_ARMOR && (item->InventoryType == INVTYPE_RELIC || item->InventoryType == INVTYPE_HOLDABLE))))) + if (item->ItemLevel <= 226 || item->ItemLevel <= 232 && ( + item->InventoryType == INVTYPE_SHIELD || + item->Class == ITEM_CLASS_WEAPON || + item->Class == ITEM_CLASS_ARMOR && (item->InventoryType == INVTYPE_RELIC || item->InventoryType == INVTYPE_HOLDABLE) + )) return true; return false; } diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 822af73a89..6988722eff 100644 --- a/src/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -470,8 +470,8 @@ public: if( faction ) for( uint8 k=0; k<4; ++k ) { - if((faction == 'A' && ( k>1 || (k==1 && RAID_MODE(1,0)) )) || - (faction == 'H' && ( k<2 || (k==3 && RAID_MODE(1,0)) )) ) + if( faction == 'A' && ( k>1 || k==1 && RAID_MODE(1,0) ) || + faction == 'H' && ( k<2 || k==3 && RAID_MODE(1,0) ) ) continue; for( uint8 i=0; i<4; ++i ) @@ -639,8 +639,7 @@ public: if (me->IsSummon()) if (Unit* s = me->ToTempSummon()->GetSummoner()) { - if ((s->GetTypeId() == TYPEID_PLAYER && !s->HasAura(SPELL_FLASH_FREEZE_TRAPPED_PLAYER)) || - (s->GetTypeId() == TYPEID_UNIT && !s->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC))) + if (s->GetTypeId() == TYPEID_PLAYER && !s->HasAura(SPELL_FLASH_FREEZE_TRAPPED_PLAYER) || s->GetTypeId() == TYPEID_UNIT && !s->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC)) me->DespawnOrUnsummon(2000); else if (s->GetTypeId() == TYPEID_PLAYER) if (InstanceScript* pInstance = me->GetInstanceScript()) diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp index 71dfc11e1c..1920c9602e 100644 --- a/src/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp +++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp @@ -484,7 +484,7 @@ public: if (!summon || summon->GetEntry() != NPC_OMINOUS_CLOUD || me->GetDistance(summon) < 20) continue; - if ((!cloud || (urand(0,1) && !summon->HasAura(SPELL_SUMMON_GUARDIAN_OF_YS)))) + if ((!cloud || urand(0,1) && !summon->HasAura(SPELL_SUMMON_GUARDIAN_OF_YS))) cloud = summon; } diff --git a/src/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/scripts/Northrend/VioletHold/boss_erekem.cpp index ac377727a5..8222317ea7 100644 --- a/src/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -125,8 +125,7 @@ public: Creature *pGuard1 = pInstance->instance->GetCreature(pInstance->GetData64(DATA_EREKEM_GUARD_1_GUID)); Creature *pGuard2 = pInstance->instance->GetCreature(pInstance->GetData64(DATA_EREKEM_GUARD_2_GUID)); - if ((pGuard1 && !pGuard1->IsAlive()) || - (pGuard2 && !pGuard2->IsAlive())) + if (pGuard1 && !pGuard1->IsAlive() || pGuard2 && !pGuard2->IsAlive()) { events.RepeatEvent(urand(3000,6000)); break; diff --git a/src/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 95197791af..1db8fed934 100644 --- a/src/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -397,8 +397,7 @@ public: pBoss->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_IMMUNE_TO_NPC); pBoss->SetReactState(REACT_AGGRESSIVE); - if ((WaveCount == 6 && m_auiEncounter[0] == DONE) || - (WaveCount == 12 && m_auiEncounter[1] == DONE)) + if (WaveCount == 6 && m_auiEncounter[0] == DONE || WaveCount == 12 && m_auiEncounter[1] == DONE) pBoss->SetLootMode(0); } } diff --git a/src/scripts/OutdoorPvP/CMakeLists.txt b/src/scripts/OutdoorPvP/CMakeLists.txt index 6d4b6241d4..ed8aabe46b 100644 --- a/src/scripts/OutdoorPvP/CMakeLists.txt +++ b/src/scripts/OutdoorPvP/CMakeLists.txt @@ -26,6 +26,6 @@ set(scripts_STAT_SRCS ${AC_SCRIPTS_DIR}/OutdoorPvP/OutdoorPvPGH.h ) -AC_ADD_SCRIPT_LOADER("OutdoorPvP" "${AC_SCRIPTS_DIR}/ScriptLoader.h") +AC_ADD_SCRIPT_LOADER("OutdoorPvP" "ScriptLoader.h") message(" -> Prepared: Outdoor PVP Zones") diff --git a/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index b96537be4a..f92d2f1737 100644 --- a/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 44e334b58d..d69b0393f0 100644 --- a/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 8bc260b625..c7a3c4bf45 100644 --- a/src/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ diff --git a/src/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/src/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp index 2b2143ace4..8a2285b1ca 100644 --- a/src/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp +++ b/src/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index 663b4033f8..b08dfe7b75 100644 --- a/src/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h index be822ea944..f6562bcba9 100644 --- a/src/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h +++ b/src/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_SETHEKK_HALLS_H diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index 802c5cc7ed..462e6c7d5e 100644 --- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 3967015f2a..fa4e912358 100644 --- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index dc27c49a3f..6625997db2 100644 --- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 7ef1b59654..cc7ed758f3 100644 --- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index 5baaee4a8f..239f3288b7 100644 --- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h index f95ea24a57..6ae39e7f02 100644 --- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h +++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_SHADOW_LABYRINTH_H diff --git a/src/scripts/Outland/BlackTemple/black_temple.h b/src/scripts/Outland/BlackTemple/black_temple.h index 8478a1688a..7e418cb089 100644 --- a/src/scripts/Outland/BlackTemple/black_temple.h +++ b/src/scripts/Outland/BlackTemple/black_temple.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef BLACK_TEMPLE_H_ diff --git a/src/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/scripts/Outland/BlackTemple/boss_bloodboil.cpp index fc519efb7c..21b5eab92f 100644 --- a/src/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/scripts/Outland/BlackTemple/boss_illidan.cpp index 3a4385a132..8ae4ef648e 100644 --- a/src/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 4f901cf9e7..82ce61cf88 100644 --- a/src/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 1b82156bac..d550f1a7e3 100644 --- a/src/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 397c3ed6c6..a8ac74cfef 100644 --- a/src/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/scripts/Outland/BlackTemple/boss_supremus.cpp index b3070d9441..61ee5df57b 100644 --- a/src/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 4522597358..cf16bb8f35 100644 --- a/src/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index ede34accdf..72ebedcffe 100644 --- a/src/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/illidari_council.cpp b/src/scripts/Outland/BlackTemple/illidari_council.cpp index cc7796a3c2..70a8950461 100644 --- a/src/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/scripts/Outland/BlackTemple/illidari_council.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/scripts/Outland/BlackTemple/instance_black_temple.cpp index 11ba1af159..c5af0c5c56 100644 --- a/src/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CMakeLists.txt b/src/scripts/Outland/CMakeLists.txt index ecf94201e5..dc384ced3b 100644 --- a/src/scripts/Outland/CMakeLists.txt +++ b/src/scripts/Outland/CMakeLists.txt @@ -109,6 +109,6 @@ set(scripts_STAT_SRCS ${AC_SCRIPTS_DIR}/Outland/zone_zangarmarsh.cpp ) -AC_ADD_SCRIPT_LOADER("Outland" "${AC_SCRIPTS_DIR}/ScriptLoader.h") +AC_ADD_SCRIPT_LOADER("Outland" "ScriptLoader.h") message(" -> Prepared: Outland") diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index 514f5debde..f789ca815b 100644 --- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 8e58137112..a7d02b06ed 100644 --- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 1905cd0ab0..544b5991d1 100644 --- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 9ee5df3534..246e35794a 100644 --- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index ff7c474135..bf9a115e3c 100644 --- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 7d5069f43b..470afeaa9a 100644 --- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 45a280381a..1b0c86331d 100644 --- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h index f69f59bca7..e0c4ce0d38 100644 --- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h +++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_SERPENT_SHRINE_H diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index 1467ab12f4..71df727f6f 100644 --- a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index 379d93c13c..852ca8fc24 100644 --- a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index d30af83d2d..759cfef66f 100644 --- a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 0c94ee147c..e51a3c930e 100644 --- a/src/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h index 5d0538206c..e5785ede7d 100644 --- a/src/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h +++ b/src/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_STEAM_VAULT_H diff --git a/src/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/scripts/Outland/GruulsLair/boss_gruul.cpp index 79d2149cd1..6d0ddb4f4b 100644 --- a/src/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index f2eb0cc62c..baeda004ad 100644 --- a/src/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/GruulsLair/gruuls_lair.h b/src/scripts/Outland/GruulsLair/gruuls_lair.h index 6512701289..46fe1d09b1 100644 --- a/src/scripts/Outland/GruulsLair/gruuls_lair.h +++ b/src/scripts/Outland/GruulsLair/gruuls_lair.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef GRUULS_LAIR_H_ diff --git a/src/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index 13dd6c0c9a..e9c4ec1c25 100644 --- a/src/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h index cecee6ec42..688b3a754d 100644 --- a/src/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h +++ b/src/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_BLOOD_FURNACE_H diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index f681c442b8..858cbdb557 100644 --- a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index 84e026ba13..fef4ea5ac5 100644 --- a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index 3e9fa5e758..d1e8adea12 100644 --- a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index f8a2a7423c..0f4dd28486 100644 --- a/src/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 644dc30cfc..c0aa882ebd 100644 --- a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index f3a7724b05..61860611b4 100644 --- a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index 7b0d8b53a0..b2ee872a32 100644 --- a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h index 972abb59de..50e671c878 100644 --- a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h +++ b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_RAMPARTS_H diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp index 6090f3d804..406ed503e9 100644 --- a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index df0db28821..6ea8fbdaea 100644 --- a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index 0d459433b2..061ec65769 100644 --- a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h index 36d5f2d01d..de9ca91cc6 100644 --- a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h +++ b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_MAGTHERIDONS_LAIR_H diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index a521b038b8..73b4747e06 100644 --- a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index c67335dcd6..2d11a988f6 100644 --- a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index afb0d64c1e..d015639b8b 100644 --- a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index c504dc4230..513b02eba2 100644 --- a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h index 3653dc8217..c9304cc97c 100644 --- a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h +++ b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_SHATTERED_H diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index eaa0632f38..1e9f866355 100644 --- a/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index acd4bcbefc..f009c0c8a5 100644 --- a/src/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index dbd29d51f3..679ec59fe1 100644 --- a/src/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 1b658be009..db15167069 100644 --- a/src/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp index 4c94162e1e..6dfa5d2ecb 100644 --- a/src/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/scripts/Outland/TempestKeep/Eye/the_eye.h index 3809800b90..a43cf5a9fa 100644 --- a/src/scripts/Outland/TempestKeep/Eye/the_eye.h +++ b/src/scripts/Outland/TempestKeep/Eye/the_eye.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_THE_EYE_H diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp index 3f280b46eb..90d5706727 100644 --- a/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp +++ b/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index 63a5e406db..e1fcc625e3 100644 --- a/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp index 7988a442e5..0a9b095316 100644 --- a/src/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp +++ b/src/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index 32c6d94dff..9475f1f6d6 100644 --- a/src/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index d34006628a..62356a783e 100644 --- a/src/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index 6f4897bdc4..68a1c75e2d 100644 --- a/src/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/Mechanar/mechanar.h b/src/scripts/Outland/TempestKeep/Mechanar/mechanar.h index 08428066bd..9530f908e1 100644 --- a/src/scripts/Outland/TempestKeep/Mechanar/mechanar.h +++ b/src/scripts/Outland/TempestKeep/Mechanar/mechanar.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_MECHANAR_H diff --git a/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 6e24acb84b..1bdb79ac79 100644 --- a/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.h index 42c2f4f064..098ceb124d 100644 --- a/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.h +++ b/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef ARCATRAZ_H diff --git a/src/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp index a508cc7d39..288abd2b3b 100644 --- a/src/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp +++ b/src/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index 6a4397a0a0..fbb01edf06 100644 --- a/src/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp index fef59b753f..b5fbbccf94 100644 --- a/src/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp +++ b/src/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp index 822c4e44e1..f128f2c782 100644 --- a/src/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp +++ b/src/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index 54f4d92c8d..c4127f3dba 100644 --- a/src/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp index 2136e7264e..0e3b19f0da 100644 --- a/src/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp +++ b/src/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index ec5bf54308..35b93d074a 100644 --- a/src/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 1bbde7108b..f2c1ce3a4c 100644 --- a/src/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp index 8c7dc3c6d6..26eeaddf75 100644 --- a/src/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp +++ b/src/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index f06edb3647..7b9d8ec3a3 100644 --- a/src/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp index e41a934fd5..005649cdb8 100644 --- a/src/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp +++ b/src/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #include "ScriptMgr.h" diff --git a/src/scripts/Outland/TempestKeep/botanica/the_botanica.h b/src/scripts/Outland/TempestKeep/botanica/the_botanica.h index 5ac559b0f9..f49d11cd67 100644 --- a/src/scripts/Outland/TempestKeep/botanica/the_botanica.h +++ b/src/scripts/Outland/TempestKeep/botanica/the_botanica.h @@ -1,5 +1,5 @@ /* -REWRITTEN BY XINEF + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-AGPL */ #ifndef DEF_THE_BOTANICA_H diff --git a/src/scripts/Pet/CMakeLists.txt b/src/scripts/Pet/CMakeLists.txt index a80f85d9c4..617106b756 100644 --- a/src/scripts/Pet/CMakeLists.txt +++ b/src/scripts/Pet/CMakeLists.txt @@ -18,6 +18,6 @@ set(scripts_STAT_SRCS ${AC_SCRIPTS_DIR}/Pet/pet_shaman.cpp ) -AC_ADD_SCRIPT_LOADER("Pet" "${AC_SCRIPTS_DIR}/ScriptLoader.h") +AC_ADD_SCRIPT_LOADER("Pet" "ScriptLoader.h") message(" -> Prepared: Pet") diff --git a/src/scripts/Pet/pet_mage.cpp b/src/scripts/Pet/pet_mage.cpp index 0c1f02d92b..a8089857b9 100644 --- a/src/scripts/Pet/pet_mage.cpp +++ b/src/scripts/Pet/pet_mage.cpp @@ -51,7 +51,7 @@ class npc_pet_mage_mirror_image : public CreatureScript npc_pet_mage_mirror_imageAI(Creature* creature) : CasterAI(creature) { } uint32 selectionTimer; - uint64 _ebonGarogyleGUID; + uint64 _ebonGargoyleGUID; void InitializeAI() { @@ -92,7 +92,7 @@ class npc_pet_mage_mirror_image : public CreatureScript ref = ref->next(); } - _ebonGarogyleGUID = 0; + _ebonGargoyleGUID = 0; // Xinef: copy caster auras Unit::VisibleAuraMap const* visibleAuraMap = owner->GetVisibleAuras(); @@ -102,8 +102,8 @@ class npc_pet_mage_mirror_image : public CreatureScript // Ebon Gargoyle if (visAura->GetId() == 49206 && me->GetUInt32Value(UNIT_CREATED_BY_SPELL) == SPELL_SUMMON_MIRROR_IMAGE1) { - if (Unit* garogyle = visAura->GetCaster()) - _ebonGarogyleGUID = garogyle->GetGUID(); + if (Unit* gargoyle = visAura->GetCaster()) + _ebonGargoyleGUID = gargoyle->GetGUID(); continue; } SpellScriptsBounds bounds = sObjectMgr->GetSpellScriptsBounds(visAura->GetId()); @@ -137,11 +137,12 @@ class npc_pet_mage_mirror_image : public CreatureScript bool MySelectNextTarget() { - if (_ebonGarogyleGUID) + if (_ebonGargoyleGUID) { - if (Unit* garogyle = ObjectAccessor::GetUnit(*me, _ebonGarogyleGUID)) - garogyle->GetAI()->AttackStart(me); - _ebonGarogyleGUID = 0; + Unit* gargoyle = ObjectAccessor::GetUnit(*me, _ebonGargoyleGUID); + if (gargoyle && gargoyle->GetAI()) + gargoyle->GetAI()->AttackStart(me); + _ebonGargoyleGUID = 0; } Unit* owner = me->GetOwner(); if (owner && owner->GetTypeId() == TYPEID_PLAYER) diff --git a/src/scripts/Spells/spell_generic.cpp b/src/scripts/Spells/spell_generic.cpp index 013822fe1b..44d8225565 100644 --- a/src/scripts/Spells/spell_generic.cpp +++ b/src/scripts/Spells/spell_generic.cpp @@ -1964,7 +1964,7 @@ class spell_gen_pet_summoned : public SpellScriptLoader { Player* player = GetCaster()->ToPlayer(); if (player->GetLastPetNumber() && player->CanResummonPet(player->GetLastPetSpell())) - Pet::LoadPetFromDB(player, PET_LOAD_BG_RESURRECT, 0, player->GetLastPetNumber(), true); + Pet::LoadPetFromDB(player, PET_LOAD_SUMMON_PET, 0, player->GetLastPetNumber(), true); } void Register() @@ -2159,7 +2159,7 @@ class spell_pvp_trinket_wotf_shared_cd : public SpellScriptLoader // Spell::SendSpellCooldown() skips all spells with TRIGGERED_IGNORE_SPELL_AND_CATEGORY_CD player->AddSpellAndCategoryCooldowns(GetSpellInfo(), GetCastItem() ? GetCastItem()->GetEntry() : 0, GetSpell()); - if (player->GetTeamId() == TEAM_HORDE) + if (player->GetTeamId(true) == TEAM_HORDE) if (GetSpellInfo()->Id == SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER) { WorldPacket data; diff --git a/src/scripts/Spells/spell_hunter.cpp b/src/scripts/Spells/spell_hunter.cpp index 7a22cddc68..d13ff837f7 100644 --- a/src/scripts/Spells/spell_hunter.cpp +++ b/src/scripts/Spells/spell_hunter.cpp @@ -744,6 +744,9 @@ class spell_hun_readiness : public SpellScriptLoader else caster->RemoveSpellCooldown(spellInfo->Id, false); } + + // force removal of the disarm cooldown + caster->RemoveSpellCooldown(SPELL_HUNTER_CHIMERA_SHOT_SCORPID, false); } } diff --git a/src/scripts/World/go_scripts.cpp b/src/scripts/World/go_scripts.cpp index 5b6840b931..e994ff8791 100644 --- a/src/scripts/World/go_scripts.cpp +++ b/src/scripts/World/go_scripts.cpp @@ -448,7 +448,7 @@ public: /*###### ## go_shrine_of_the_birds ######*/ - +/* enum ShrineOfTheBirds { NPC_HAWK_GUARD = 22992, @@ -490,7 +490,7 @@ public: return false; } }; - +*/ /*###### ## go_southfury_moonstone ######*/ @@ -1182,7 +1182,7 @@ void AddSC_go_scripts() // Theirs new go_cat_figurine(); new go_gilded_brazier(); - new go_shrine_of_the_birds(); + //new go_shrine_of_the_birds(); new go_southfury_moonstone(); new go_tablet_of_madness(); new go_tablet_of_the_seven(); diff --git a/src/worldserver/worldserver.conf.dist b/src/worldserver/worldserver.conf.dist index 317cbd0530..5c1d1a88bd 100644 --- a/src/worldserver/worldserver.conf.dist +++ b/src/worldserver/worldserver.conf.dist @@ -1379,10 +1379,10 @@ BeepAtStart = 1 # Motd # Description: Message of the Day, displayed at login. # Use '@' for a newline and be sure to escape special characters. -# Example: "Welcome to John\'s Server@This server runs on Trinity Core." -# Default: "Welcome to a Trinity Core server." +# Example: "Welcome to John\'s Server@This server runs on AzerothCore." +# Default: "Welcome to an AzerothCore server." -Motd = "Welcome to a Trinity Core server." +Motd = "Welcome to an AzerothCore server." # # Server.LoginInfo |