Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: sql/base/auth_database.sql sql/base/characters_database.sql src/server/game/Entities/Player/Player.cpp src/server/game/Handlers/LFGHandler.cpp src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSession.h src/server/game/Server/WorldSocket.cpp src/server/game/World/World.cpp src/server/scripts/Spells/spell_generic.cpp
This commit is contained in:
commit
12c8cdc26c
54 files changed
+3319
-518
No files matched your search
@@ -7735,13 +7735,7 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea)
|
||||
|
||||
// group update
|
||||
if (Group* group = GetGroup())
|
||||
{
|
||||
SetGroupUpdateFlag(GROUP_UPDATE_FULL);
|
||||
if (GetSession() && group->isLFGGroup() && sLFGMgr->IsTeleported(GetGUID()))
|
||||
for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
|
||||
if (Player* member = itr->getSource())
|
||||
GetSession()->SendNameQueryOpcode(member->GetGUID());
|
||||
}
|
||||
|
||||
m_zoneUpdateId = newZone;
|
||||
m_zoneUpdateTimer = ZONE_UPDATE_INTERVAL;
|
||||
@@ -11769,22 +11763,12 @@ InventoryResult Player::CanUseItem(ItemTemplate const* proto) const
|
||||
|
||||
InventoryResult Player::CanRollForItemInLFG(ItemTemplate const* proto, WorldObject const* lootedObject) const
|
||||
{
|
||||
LfgDungeonSet const& dungeons = sLFGMgr->GetSelectedDungeons(GetGUID());
|
||||
if (dungeons.empty())
|
||||
return EQUIP_ERR_OK; // not using LFG
|
||||
|
||||
if (!GetGroup() || !GetGroup()->isLFGGroup())
|
||||
return EQUIP_ERR_OK; // not in LFG group
|
||||
|
||||
// check if looted object is inside the lfg dungeon
|
||||
bool lootedObjectInDungeon = false;
|
||||
Map const* map = lootedObject->GetMap();
|
||||
if (uint32 dungeonId = sLFGMgr->GetDungeon(GetGroup()->GetGUID(), true))
|
||||
if (LFGDungeonData const* dungeon = sLFGMgr->GetLFGDungeon(dungeonId))
|
||||
if (uint32(dungeon->map) == map->GetId() && dungeon->difficulty == map->GetDifficulty())
|
||||
lootedObjectInDungeon = true;
|
||||
|
||||
if (!lootedObjectInDungeon)
|
||||
if (!sLFGMgr->inLfgDungeonMap(GetGroup()->GetGUID(), map->GetId(), map->GetDifficulty()))
|
||||
return EQUIP_ERR_OK;
|
||||
|
||||
if (!proto)
|
||||
@@ -22167,12 +22151,21 @@ void Player::LeaveBattleground(bool teleportToEntryPoint)
|
||||
}
|
||||
}
|
||||
|
||||
bool Player::CanJoinToBattleground(Battleground const* /*bg*/) const
|
||||
bool Player::CanJoinToBattleground(Battleground const* bg) const
|
||||
{
|
||||
// check Deserter debuff
|
||||
if (HasAura(26013))
|
||||
return false;
|
||||
|
||||
if (bg->isArena() && !GetSession()->HasPermission(RBAC_PERM_JOIN_ARENAS))
|
||||
return false;
|
||||
|
||||
if (bg->IsRandom() && !GetSession()->HasPermission(RBAC_PERM_JOIN_RANDOM_BG))
|
||||
return false;
|
||||
|
||||
if (!GetSession()->HasPermission(RBAC_PERM_JOIN_NORMAL_BG))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -23839,14 +23832,14 @@ PartyResult Player::CanUninviteFromGroup() const
|
||||
if (!sLFGMgr->GetKicksLeft(gguid))
|
||||
return ERR_PARTY_LFG_BOOT_LIMIT;
|
||||
|
||||
LfgState state = sLFGMgr->GetState(gguid);
|
||||
if (state == LFG_STATE_BOOT)
|
||||
lfg::LfgState state = sLFGMgr->GetState(gguid);
|
||||
if (state == lfg::LFG_STATE_BOOT)
|
||||
return ERR_PARTY_LFG_BOOT_IN_PROGRESS;
|
||||
|
||||
if (grp->GetMembersCount() <= LFG_GROUP_KICK_VOTES_NEEDED)
|
||||
if (grp->GetMembersCount() <= lfg::LFG_GROUP_KICK_VOTES_NEEDED)
|
||||
return ERR_PARTY_LFG_BOOT_TOO_FEW_PLAYERS;
|
||||
|
||||
if (state == LFG_STATE_FINISHED_DUNGEON)
|
||||
if (state == lfg::LFG_STATE_FINISHED_DUNGEON)
|
||||
return ERR_PARTY_LFG_BOOT_DUNGEON_COMPLETE;
|
||||
|
||||
if (grp->isRollLootActive())
|
||||
@@ -23876,21 +23869,17 @@ PartyResult Player::CanUninviteFromGroup() const
|
||||
|
||||
bool Player::isUsingLfg()
|
||||
{
|
||||
return sLFGMgr->GetState(GetGUID()) != LFG_STATE_NONE;
|
||||
return sLFGMgr->GetState(GetGUID()) != lfg::LFG_STATE_NONE;
|
||||
}
|
||||
|
||||
bool Player::inRandomLfgDungeon()
|
||||
{
|
||||
if (isUsingLfg())
|
||||
if (sLFGMgr->selectedRandomLfgDungeon(GetGUID()))
|
||||
{
|
||||
const LfgDungeonSet& dungeons = sLFGMgr->GetSelectedDungeons(GetGUID());
|
||||
if (!dungeons.empty())
|
||||
{
|
||||
LFGDungeonData const* dungeon = sLFGMgr->GetLFGDungeon(*dungeons.begin());
|
||||
if (dungeon && (dungeon->type == LFG_TYPE_RANDOM || dungeon->seasonal))
|
||||
return true;
|
||||
}
|
||||
Map const* map = GetMap();
|
||||
return sLFGMgr->inLfgDungeonMap(GetGUID(), map->GetId(), map->GetDifficulty());
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user