Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Objects: Fix flags overflow for InvisibilityType because TOTAL_INVISIBILITY_TYPES (38) can't fit in 32 bits flag

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/423f81fbdaad9bedf936b313a97afe0be53b6ae0)
This commit is contained in:
hondacrx
2022-10-11 17:09:46 -04:00
parent c34b6cd77b
commit 1ba4405421
2 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Dynamic/FlagArray.cs
+25 -5
View File
@@ -173,20 +173,40 @@ namespace Framework.Dynamic
} }
} }
public class FlaggedArray<T> where T : struct public class FlaggedArray32<T> where T : struct
{ {
int[] m_values; int[] m_values;
uint m_flags; uint m_flags;
public FlaggedArray(byte arraysize) public FlaggedArray32(byte arraysize)
{ {
m_values = new int[4 * arraysize]; m_values = new int[4 * arraysize];
} }
public uint GetFlags() { return m_flags; } public uint GetFlags() { return m_flags; }
public bool HasFlag(T flag) { return Convert.ToBoolean(Convert.ToInt32(m_flags) & 1 << Convert.ToInt32(flag)); } public bool HasFlag(T flag) { return (m_flags & 1 << Convert.ToInt32(flag)) != 0; }
public void AddFlag(T flag) { m_flags |= (uint)(1 << Convert.ToInt32(flag)); } public void AddFlag(T flag) { m_flags |= (dynamic)(1 << Convert.ToInt32(flag)); }
public void DelFlag(T flag) { m_flags &= ~(uint)(1 << Convert.ToInt32(flag)); } public void DelFlag(T flag) { m_flags &= ~(dynamic)(1 << Convert.ToInt32(flag)); }
public int GetValue(T flag) { return m_values[Convert.ToInt32(flag)]; }
public void SetValue(T flag, object value) { m_values[Convert.ToInt32(flag)] = Convert.ToInt32(value); }
public void AddValue(T flag, object value) { m_values[Convert.ToInt32(flag)] += Convert.ToInt32(value); }
}
public class FlaggedArray64<T> where T : struct
{
int[] m_values;
ulong m_flags;
public FlaggedArray64(byte arraysize)
{
m_values = new int[4 * arraysize];
}
public ulong GetFlags() { return m_flags; }
public bool HasFlag(T flag) { return (m_flags & 1ul << Convert.ToInt32(flag)) != 0; }
public void AddFlag(T flag) { m_flags |= (dynamic)(1ul << Convert.ToInt32(flag)); }
public void DelFlag(T flag) { m_flags &= ~(dynamic)(1ul << Convert.ToInt32(flag)); }
public int GetValue(T flag) { return m_values[Convert.ToInt32(flag)]; } public int GetValue(T flag) { return m_values[Convert.ToInt32(flag)]; }
public void SetValue(T flag, object value) { m_values[Convert.ToInt32(flag)] = Convert.ToInt32(value); } public void SetValue(T flag, object value) { m_values[Convert.ToInt32(flag)] = Convert.ToInt32(value); }
Source/Game/Entities/Object/WorldObject.cs
+8 -8
View File
@@ -1271,7 +1271,7 @@ namespace Game.Entities
bool CanDetectInvisibilityOf(WorldObject obj) bool CanDetectInvisibilityOf(WorldObject obj)
{ {
uint mask = obj.m_invisibility.GetFlags() & m_invisibilityDetect.GetFlags(); ulong mask = obj.m_invisibility.GetFlags() & m_invisibilityDetect.GetFlags();
// Check for not detected types // Check for not detected types
if (mask != obj.m_invisibility.GetFlags()) if (mask != obj.m_invisibility.GetFlags())
@@ -1279,7 +1279,7 @@ namespace Game.Entities
for (int i = 0; i < (int)InvisibilityType.Max; ++i) for (int i = 0; i < (int)InvisibilityType.Max; ++i)
{ {
if (!Convert.ToBoolean(mask & (1 << i))) if (!Convert.ToBoolean(mask & (1ul << i)))
continue; continue;
int objInvisibilityValue = obj.m_invisibility.GetValue((InvisibilityType)i); int objInvisibilityValue = obj.m_invisibility.GetValue((InvisibilityType)i);
@@ -3708,14 +3708,14 @@ namespace Game.Entities
SmoothPhasing _smoothPhasing; SmoothPhasing _smoothPhasing;
public FlaggedArray<StealthType> m_stealth = new(2); public FlaggedArray32<StealthType> m_stealth = new(2);
public FlaggedArray<StealthType> m_stealthDetect = new(2); public FlaggedArray32<StealthType> m_stealthDetect = new(2);
public FlaggedArray<InvisibilityType> m_invisibility = new((int)InvisibilityType.Max); public FlaggedArray64<InvisibilityType> m_invisibility = new((int)InvisibilityType.Max);
public FlaggedArray<InvisibilityType> m_invisibilityDetect = new((int)InvisibilityType.Max); public FlaggedArray64<InvisibilityType> m_invisibilityDetect = new((int)InvisibilityType.Max);
public FlaggedArray<ServerSideVisibilityType> m_serverSideVisibility = new(2); public FlaggedArray32<ServerSideVisibilityType> m_serverSideVisibility = new(2);
public FlaggedArray<ServerSideVisibilityType> m_serverSideVisibilityDetect = new(2); public FlaggedArray32<ServerSideVisibilityType> m_serverSideVisibilityDetect = new(2);
#endregion #endregion
public static implicit operator bool(WorldObject obj) public static implicit operator bool(WorldObject obj)