diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2020-08-28 00:11:16 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-02-04 00:27:14 +0100 |
| commit | 9f97fdd31a3b9a06b6acfa1101d105e43687e824 (patch) | |
| tree | 027f81c18e7733fa3554cf1dd704a0900d254725 /src/server/game/Events/GameEventMgr.cpp | |
| parent | 6e45c371c4098942e0085a71577a07b17725ee93 (diff) | |
Core/Common: Tokenizer -> Trinity::Tokenize (PR: #25327)
(cherry picked from commit 534a2388b7c662c8796aabb1ec8cb424879799b6)
Diffstat (limited to 'src/server/game/Events/GameEventMgr.cpp')
| -rw-r--r-- | src/server/game/Events/GameEventMgr.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 0450104364f..d27b7b12a4e 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -30,6 +30,7 @@ #include "ObjectMgr.h" #include "Player.h" #include "PoolMgr.h" +#include "StringConvert.h" #include "World.h" #include "WorldStatePackets.h" @@ -856,9 +857,9 @@ void GameEventMgr::LoadFromDB() vItem.PlayerConditionId = fields[8].GetUInt32(); vItem.IgnoreFiltering = fields[9].GetBool(); - Tokenizer bonusListIDsTok(fields[7].GetString(), ' '); - for (char const* token : bonusListIDsTok) - vItem.BonusListIDs.push_back(int32(atol(token))); + for (std::string_view token : Trinity::Tokenize(fields[7].GetStringView(), ' ', false)) + if (Optional<int32> bonusListID = Trinity::StringTo<int32>(token)) + vItem.BonusListIDs.push_back(*bonusListID); // check validity with event's npcflag if (!sObjectMgr->IsVendorItemValid(entry, vItem, nullptr, nullptr, event_npc_flag)) |