nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-05 03:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/GameObjects): Lockpicking timer on gameobjects should reset … (#9203)

Browse Source 
* fix(Core/GameObjects): Lockpicking timer on gameobjects should reset after 10 minutes.

Fixes #8936
This commit is contained in:
UltraNix
2021-11-22 16:07:55 +01:00
committed by GitHub
parent 4099c38072
commit dc9c3a5fe4
2 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/server/game/Entities/GameObject/GameObject.cpp
View File

@@ -430,6 +430,22 @@ void GameObject::Update(uint32 diff)
} }
} }
for (std::unordered_map<ObjectGuid, int32>::iterator itr = m_SkillupList.begin(); itr != m_SkillupList.end();)
{
if (itr->second > 0)
{
if (itr->second > static_cast<int32>(diff))
{
itr->second -= static_cast<int32>(diff);
++itr;
}
else
{
itr = m_SkillupList.erase(itr);
}
}
}
switch (m_lootState) switch (m_lootState)
{ {
case GO_NOT_READY: case GO_NOT_READY:
@@ -2848,3 +2864,22 @@ SpellInfo const* GameObject::GetSpellForLock(Player const* player) const
return nullptr; return nullptr;
} }
void GameObject::AddToSkillupList(ObjectGuid playerGuid)
{
int32 timer = GetMap()->IsDungeon() ? -1 : 10 * MINUTE * IN_MILLISECONDS;
m_SkillupList[playerGuid] = timer;
}
bool GameObject::IsInSkillupList(ObjectGuid playerGuid) const
{
for (auto const& itr : m_SkillupList)
{
if (itr.first == playerGuid)
{
return true;
}
}
return false;
}

14
src/server/game/Entities/GameObject/GameObject.h
View File

@@ -854,16 +854,8 @@ public:
void RemoveLootMode(uint16 lootMode) { m_LootMode &= ~lootMode; } void RemoveLootMode(uint16 lootMode) { m_LootMode &= ~lootMode; }
void ResetLootMode() { m_LootMode = LOOT_MODE_DEFAULT; } void ResetLootMode() { m_LootMode = LOOT_MODE_DEFAULT; }
void AddToSkillupList(ObjectGuid playerGuid) { m_SkillupList.push_back(playerGuid); } void AddToSkillupList(ObjectGuid playerGuid);
[[nodiscard]] bool IsInSkillupList(ObjectGuid playerGuid) const [[nodiscard]] bool IsInSkillupList(ObjectGuid playerGuid) const;
{
for (ObjectGuid const& guid : m_SkillupList)
if (guid == playerGuid)
return true;
return false;
}
void ClearSkillupList() { m_SkillupList.clear(); }
void AddUniqueUse(Player* player); void AddUniqueUse(Player* player);
void AddUse() { ++m_usetimes; } void AddUse() { ++m_usetimes; }
@@ -991,7 +983,7 @@ protected:
bool m_spawnedByDefault; bool m_spawnedByDefault;
uint32 m_cooldownTime; // used as internal reaction delay time store (not state change reaction). uint32 m_cooldownTime; // used as internal reaction delay time store (not state change reaction).
// For traps this: spell casting cooldown, for doors/buttons: reset time. // For traps this: spell casting cooldown, for doors/buttons: reset time.
GuidList m_SkillupList; std::unordered_map<ObjectGuid, int32> m_SkillupList;
ObjectGuid m_ritualOwnerGUID; // used for GAMEOBJECT_TYPE_SUMMONING_RITUAL where GO is not summoned (no owner) ObjectGuid m_ritualOwnerGUID; // used for GAMEOBJECT_TYPE_SUMMONING_RITUAL where GO is not summoned (no owner)
GuidSet m_unique_users; GuidSet m_unique_users;