diff options
| author | MaxtorCoder <warsongkiller.s8@gmail.com> | 2024-03-13 21:16:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-13 21:16:18 +0100 |
| commit | cfc9cc9ec285e7934f3160047ff87be3c649594f (patch) | |
| tree | be680d4f88fac55274862251c349c644a5d90930 /src/server/game/Entities/GameObject | |
| parent | 46d929cb82b631648ef4a84e75ca7bc174a03fdd (diff) | |
Core/PacketIO: Update to 4.4.0.53627 (#29805)
* Core/PacketIO: Update to 4.4.0.53627
* Core/IO: Remove duplicate declaration of PetSpellDataID
* Core/IO: Assign STATUS_UNHANDLED to some azerite packets
Diffstat (limited to 'src/server/game/Entities/GameObject')
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 5816b1c3707..e6b894b0d32 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -17,8 +17,6 @@ #include "GameObject.h" #include "ArtifactPackets.h" -#include "AzeriteItem.h" -#include "AzeritePackets.h" #include "Battleground.h" #include "BattlegroundPackets.h" #include "CellImpl.h" @@ -2183,7 +2181,7 @@ uint8 GameObject::GetLevelForTarget(WorldObject const* target) const if (GetGoType() == GAMEOBJECT_TYPE_TRAP) { if (Player const* player = target->ToPlayer()) - if (Optional<ContentTuningLevels> userLevels = sDB2Manager.GetContentTuningData(GetGOInfo()->ContentTuningId, player->m_playerData->CtrOptions->ContentTuningConditionMask)) + if (Optional<ContentTuningLevels> userLevels = sDB2Manager.GetContentTuningData(GetGOInfo()->ContentTuningId, 0 /*player->m_playerData->CtrOptions->ContentTuningConditionMask*/)) return uint8(std::clamp<int16>(player->GetLevel(), userLevels->MinLevel, userLevels->MaxLevel)); if (Unit const* targetUnit = target->ToUnit()) @@ -3073,11 +3071,11 @@ void GameObject::Use(Unit* user) return; //required lvl checks! - if (Optional<ContentTuningLevels> userLevels = sDB2Manager.GetContentTuningData(info->ContentTuningId, player->m_playerData->CtrOptions->ContentTuningConditionMask)) + if (Optional<ContentTuningLevels> userLevels = sDB2Manager.GetContentTuningData(info->ContentTuningId, 0 /*player->m_playerData->CtrOptions->ContentTuningConditionMask*/)) if (player->GetLevel() < userLevels->MaxLevel) return; - if (Optional<ContentTuningLevels> targetLevels = sDB2Manager.GetContentTuningData(info->ContentTuningId, targetPlayer->m_playerData->CtrOptions->ContentTuningConditionMask)) + if (Optional<ContentTuningLevels> targetLevels = sDB2Manager.GetContentTuningData(info->ContentTuningId, 0 /*player->m_playerData->CtrOptions->ContentTuningConditionMask*/)) if (targetPlayer->GetLevel() < targetLevels->MaxLevel) return; @@ -3323,18 +3321,6 @@ void GameObject::Use(Unit* user) player->SendDirectMessage(openArtifactForge.Write()); break; } - case 2: // Heart Forge - { - Item const* item = player->GetItemByEntry(ITEM_ID_HEART_OF_AZEROTH, ItemSearchLocation::Everywhere); - if (!item) - return; - - WorldPackets::GameObject::GameObjectInteraction openHeartForge; - openHeartForge.ObjectGUID = GetGUID(); - openHeartForge.InteractionType = PlayerInteractionType::AzeriteForge; - player->SendDirectMessage(openHeartForge.Write()); - break; - } default: break; } |