Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Entities: Make EntityFragmentsHolder more resilient to unexpected inputs and fix nopch build

Browse Source
This commit is contained in:
Shauren
2024-11-23 01:06:40 +01:00
parent 799422ec27
commit 848fa5bbaa
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/game/DataStores/DB2Stores.cpp
View File

@@ -35,6 +35,7 @@
#include <numeric>
#include <sstream>
#include <cctype>
#include <cmath>
// temporary hack until includes are sorted out (don't want to pull in Windows.h)
#ifdef GetClassName

22
src/server/game/Entities/Object/Updates/WowCSEntityDefinitions.cpp
View File

@@ -25,12 +25,14 @@ void EntityFragmentsHolder::Add(EntityFragment fragment, bool update)
{
ASSERT(Count < Ids.size());
auto insertSorted = [](auto& arr, uint8& count, EntityFragment f)
auto insertSorted = []<size_t N>(std::array<EntityFragment, N>& arr, uint8& count, EntityFragment f)
{
auto where = std::ranges::lower_bound(arr.begin(), arr.begin() + count, f);
auto end = arr.begin() + count;
auto where = std::ranges::lower_bound(arr.begin(), end, f);
if (*where == f)
return std::pair(where, false);
std::rotate(where, arr.begin() + count, arr.begin() + count + 1);
std::ranges::move_backward(where, end, end + 1);
++count;
*where = f;
return std::pair(where, true);
@@ -44,7 +46,7 @@ void EntityFragmentsHolder::Add(EntityFragment fragment, bool update)
ASSERT(UpdateableCount < UpdateableIds.size());
auto insertedItr = insertSorted(UpdateableIds, UpdateableCount, fragment).first;
std::ptrdiff_t index = std::distance(UpdateableIds.begin(), insertedItr);
std::ptrdiff_t index = std::ranges::distance(UpdateableIds.begin(), insertedItr);
uint8 maskLowPart = ContentsChangedMask & ((1 << index) - 1);
uint8 maskHighPart = (ContentsChangedMask & ~((1 << index) - 1)) << (1 + IsIndirectFragment(fragment));
ContentsChangedMask = maskLowPart | maskHighPart;
@@ -65,13 +67,13 @@ void EntityFragmentsHolder::Add(EntityFragment fragment, bool update)
void EntityFragmentsHolder::Remove(EntityFragment fragment)
{
auto removeSorted = [](auto& arr, uint8& count, EntityFragment f)
auto removeSorted = []<size_t N>(std::array<EntityFragment, N>& arr, uint8& count, EntityFragment f)
{
auto where = std::ranges::find(arr.begin(), arr.begin() + count, f);
if (where != arr.end())
auto end = arr.begin() + count;
auto where = std::ranges::find(arr.begin(), end, f);
if (where != end)
{
*where = EntityFragment::End;
std::rotate(where, where + 1, arr.begin() + count);
*std::ranges::move(where + 1, end, where).out = EntityFragment::End;
--count;
return std::pair(where, true);
}
@@ -86,7 +88,7 @@ void EntityFragmentsHolder::Remove(EntityFragment fragment)
auto [removedItr, removed] = removeSorted(UpdateableIds, UpdateableCount, fragment);
if (removed)
{
std::ptrdiff_t index = std::distance(UpdateableIds.begin(), removedItr);
std::ptrdiff_t index = std::ranges::distance(UpdateableIds.begin(), removedItr);
uint8 maskLowPart = ContentsChangedMask & ((1 << index) - 1);
uint8 maskHighPart = (ContentsChangedMask & ~((1 << index) - 1)) >> (1 + IsIndirectFragment(fragment));
ContentsChangedMask = maskLowPart | maskHighPart;

1
src/server/game/Entities/Object/Updates/WowCSEntityDefinitions.h
View File

@@ -19,6 +19,7 @@
#define TRINITYCORE_WOWCS_ENTITY_DEFINITIONS_H
#include "Define.h"
#include <array>
#include <span>
namespace WowCS