nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-21 20:56:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Players): Players should nt able to rest in unfriendly taver… (#13493)

Browse Source 
* fix(Core/Players): Players should nt able to rest in unfriendly taverns. Original author: @Rushor

Fixes #13459

* Update.
This commit is contained in:
UltraNix
2022-10-29 12:15:18 +02:00
committed by GitHub
parent b50675dbe9
commit f3820bd375
4 changed files with 141 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Globals/ObjectMgr.cpp
View File

@@ -6320,7 +6320,7 @@ void ObjectMgr::LoadTavernAreaTriggers()
_tavernAreaTriggerStore.clear(); // need for reload case
QueryResult result = WorldDatabase.Query("SELECT id FROM areatrigger_tavern");
QueryResult result = WorldDatabase.Query("SELECT id, faction FROM areatrigger_tavern");
if (!result)
{
@@ -6346,7 +6346,9 @@ void ObjectMgr::LoadTavernAreaTriggers()
continue;
}
_tavernAreaTriggerStore.insert(Trigger_ID);
uint32 faction = fields[1].Get<uint32>();
_tavernAreaTriggerStore.emplace(Trigger_ID, faction);
} while (result->NextRow());
LOG_INFO("server.loading", ">> Loaded {} Tavern Triggers in {} ms", count, GetMSTimeDiffToNow(oldMSTime));

12
src/server/game/Globals/ObjectMgr.h
View File

@@ -840,9 +840,15 @@ public:
return 0;
}
[[nodiscard]] bool IsTavernAreaTrigger(uint32 Trigger_ID) const
[[nodiscard]] bool IsTavernAreaTrigger(uint32 triggerID, uint32 faction) const
{
return _tavernAreaTriggerStore.find(Trigger_ID) != _tavernAreaTriggerStore.end();
auto itr = _tavernAreaTriggerStore.find(triggerID);
if (itr != _tavernAreaTriggerStore.end())
{
return (itr->second & faction) != 0;
}
return false;
}
[[nodiscard]] GossipText const* GetGossipText(uint32 Text_ID) const;
@@ -1448,7 +1454,7 @@ private:
typedef std::unordered_map<uint32, GossipText> GossipTextContainer;
typedef std::unordered_map<uint32, uint32> QuestAreaTriggerContainer;
typedef std::set<uint32> TavernAreaTriggerContainer;
typedef std::unordered_map<uint32, uint32> TavernAreaTriggerContainer;
QuestAreaTriggerContainer _questAreaTriggerStore;
TavernAreaTriggerContainer _tavernAreaTriggerStore;

3
src/server/game/Handlers/MiscHandler.cpp
View File

@@ -747,7 +747,8 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recv_data)
return;
}
bool isTavernAreatrigger = sObjectMgr->IsTavernAreaTrigger(triggerId);
uint32 teamFaction = player->GetTeamId(true) == TEAM_ALLIANCE ? FACTION_MASK_ALLIANCE : FACTION_MASK_HORDE;
bool isTavernAreatrigger = sObjectMgr->IsTavernAreaTrigger(triggerId, teamFaction);
if (!player->IsInAreaTriggerRadius(atEntry, isTavernAreatrigger ? 5.f : 0.f))
{
LOG_DEBUG("network", "HandleAreaTriggerOpcode: Player {} ({}) too far (trigger map: {} player map: {}), ignore Area Trigger ID: {}",