josh/ThordekkCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Objects: Fixed crashes happening when trying to force send dynamic/map/set updatefield changes

Browse Source
This commit is contained in:
luis
2026-03-20 22:49:31 -03:00
parent e73c288b95
commit ab7ba67bcd
1 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Object/Updates/UpdateField.h
+9 -28
View File
@@ -666,7 +666,7 @@ namespace UF
}
template<typename Derived, typename T, int32 BlockBit, uint32 Bit>
void MarkChanged(DynamicUpdateField<T, BlockBit, Bit>(Derived::* field), uint32 index)
void MarkChanged(DynamicUpdateField<T, BlockBit, Bit>(Derived::*))
{
static_assert(std::is_base_of_v<Base, Derived>, "Given field argument must belong to the same structure as this HasChangesMask");
@@ -674,13 +674,10 @@ namespace UF
_changesMask.Set(BlockBit);
_changesMask.Set(Bit);
DynamicUpdateField<T, BlockBit, Bit>& uf = (static_cast<Derived*>(this)->*field);
if (index < uf.size())
uf.MarkChanged(index);
}
template<typename Derived, typename K, typename V, int32 BlockBit, uint32 Bit>
void MarkChanged(MapUpdateField<K, V, BlockBit, Bit>(Derived::* field), std::type_identity_t<K> const& key)
void MarkChanged(MapUpdateField<K, V, BlockBit, Bit>(Derived::*))
{
static_assert(std::is_base_of_v<Base, Derived>, "Given field argument must belong to the same structure as this HasChangesMask");
@@ -688,14 +685,10 @@ namespace UF
_changesMask.Set(BlockBit);
_changesMask.Set(Bit);
MapUpdateField<K, V, BlockBit, Bit>& uf = (static_cast<Derived*>(this)->*field);
auto itr = uf._values.find(key);
if (itr != uf._values.end() && itr->second.state == MapUpdateFieldState::Unchanged)
itr->second.state = MapUpdateFieldState::Changed;
}
template<typename Derived, typename T, int32 BlockBit, uint32 Bit>
void MarkChanged(SetUpdateField<T, BlockBit, Bit>(Derived::* field), std::type_identity_t<T> const& key)
void MarkChanged(SetUpdateField<T, BlockBit, Bit>(Derived::*))
{
static_assert(std::is_base_of_v<Base, Derived>, "Given field argument must belong to the same structure as this HasChangesMask");
@@ -703,10 +696,6 @@ namespace UF
_changesMask.Set(BlockBit);
_changesMask.Set(Bit);
SetUpdateField<T, BlockBit, Bit>& uf = (static_cast<Derived*>(this)->*field);
auto itr = uf._values.find(key);
if (itr != uf._values.end() && itr->second == MapUpdateFieldState::Unchanged)
itr->second = MapUpdateFieldState::Changed;
}
template<typename Derived, typename T, int32 BlockBit, uint32 Bit>
@@ -754,35 +743,27 @@ namespace UF
}
template<typename Derived, typename T, int32 BlockBit, uint32 Bit>
void ClearChanged(DynamicUpdateField<T, BlockBit, Bit>(Derived::* field), uint32 index)
void ClearChanged(DynamicUpdateField<T, BlockBit, Bit>(Derived::*))
{
static_assert(std::is_base_of_v<Base, Derived>, "Given field argument must belong to the same structure as this HasChangesMask");
DynamicUpdateField<T, BlockBit, Bit>& uf = (static_cast<Derived*>(this)->*field);
if (index < uf.size())
uf.ClearChanged(index);
_changesMask.Reset(Bit);
}
template<typename Derived, typename K, typename V, int32 BlockBit, uint32 Bit>
void ClearChanged(MapUpdateField<K, V, BlockBit, Bit>(Derived::* field), std::type_identity_t<K> const& key)
void ClearChanged(MapUpdateField<K, V, BlockBit, Bit>(Derived::*))
{
static_assert(std::is_base_of_v<Base, Derived>, "Given field argument must belong to the same structure as this HasChangesMask");
MapUpdateField<K, V, BlockBit, Bit>& uf = (static_cast<Derived*>(this)->*field);
auto itr = uf._values.find(key);
if (itr != uf._values.end() && itr->second.state == MapUpdateFieldState::Changed)
itr->second.state = MapUpdateFieldState::Unchanged;
_changesMask.Reset(Bit);
}
template<typename Derived, typename T, int32 BlockBit, uint32 Bit>
void ClearChanged(SetUpdateField<T, BlockBit, Bit>(Derived::* field), std::type_identity_t<T> const& key)
void ClearChanged(SetUpdateField<T, BlockBit, Bit>(Derived::*))
{
static_assert(std::is_base_of_v<Base, Derived>, "Given field argument must belong to the same structure as this HasChangesMask");
SetUpdateField<T, BlockBit, Bit>& uf = (static_cast<Derived*>(this)->*field);
auto itr = uf._values.find(key);
if (itr != uf._values.end() && itr->second == MapUpdateFieldState::Changed)
itr->second = MapUpdateFieldState::Unchanged;
_changesMask.Reset(Bit);
}
template<typename Derived, typename T, int32 BlockBit, uint32 Bit>