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

Core/Creature: Fixes crash when leader guid is larger then uint. Should of been a ulong.

Browse Source
This commit is contained in:
hondacrx
2021-03-11 22:27:11 -05:00
parent f393807598
commit 3b86c1d536
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/CreatureGroups.cs
+12 -12
View File
@@ -25,26 +25,26 @@ namespace Game.Entities
{ {
public class FormationMgr public class FormationMgr
{ {
public static void AddCreatureToGroup(uint groupId, Creature member) public static void AddCreatureToGroup(ulong leaderGuid, Creature member)
{ {
Map map = member.GetMap(); Map map = member.GetMap();
if (!map) if (!map)
return; return;
var creatureGroup = map.CreatureGroupHolder.LookupByKey(groupId); var creatureGroup = map.CreatureGroupHolder.LookupByKey(leaderGuid);
//Add member to an existing group //Add member to an existing group
if (creatureGroup != null) if (creatureGroup != null)
{ {
Log.outDebug(LogFilter.Unit, "Group found: {0}, inserting creature GUID: {1}, Group InstanceID {2}", groupId, member.GetGUID().ToString(), member.GetInstanceId()); Log.outDebug(LogFilter.Unit, "Group found: {0}, inserting creature GUID: {1}, Group InstanceID {2}", leaderGuid, member.GetGUID().ToString(), member.GetInstanceId());
creatureGroup.AddMember(member); creatureGroup.AddMember(member);
} }
//Create new group //Create new group
else else
{ {
Log.outDebug(LogFilter.Unit, "Group not found: {0}. Creating new group.", groupId); Log.outDebug(LogFilter.Unit, "Group not found: {0}. Creating new group.", leaderGuid);
CreatureGroup group = new CreatureGroup(groupId); CreatureGroup group = new CreatureGroup(leaderGuid);
map.CreatureGroupHolder[groupId] = group; map.CreatureGroupHolder[leaderGuid] = group;
group.AddMember(member); group.AddMember(member);
} }
} }
@@ -86,8 +86,8 @@ namespace Game.Entities
{ {
//Load group member data //Load group member data
group_member = new FormationInfo(); group_member = new FormationInfo();
group_member.leaderGUID = result.Read<uint>(0); group_member.leaderGUID = result.Read<ulong>(0);
uint memberGUID = result.Read<uint>(1); ulong memberGUID = result.Read<ulong>(1);
group_member.groupAI = result.Read<uint>(4); group_member.groupAI = result.Read<uint>(4);
group_member.point_1 = result.Read<ushort>(5); group_member.point_1 = result.Read<ushort>(5);
group_member.point_2 = result.Read<ushort>(6); group_member.point_2 = result.Read<ushort>(6);
@@ -131,7 +131,7 @@ namespace Game.Entities
public class FormationInfo public class FormationInfo
{ {
public uint leaderGUID; public ulong leaderGUID;
public float follow_dist; public float follow_dist;
public float follow_angle; public float follow_angle;
public uint groupAI; public uint groupAI;
@@ -141,7 +141,7 @@ namespace Game.Entities
public class CreatureGroup public class CreatureGroup
{ {
public CreatureGroup(uint id) public CreatureGroup(ulong id)
{ {
m_groupID = id; m_groupID = id;
} }
@@ -273,7 +273,7 @@ namespace Game.Entities
} }
public Creature GetLeader() { return m_leader; } public Creature GetLeader() { return m_leader; }
public uint GetId() { return m_groupID; } public ulong GetId() { return m_groupID; }
public bool IsEmpty() { return m_members.Empty(); } public bool IsEmpty() { return m_members.Empty(); }
public bool IsFormed() { return m_Formed; } public bool IsFormed() { return m_Formed; }
public bool IsLeader(Creature creature) { return m_leader == creature; } public bool IsLeader(Creature creature) { return m_leader == creature; }
@@ -281,7 +281,7 @@ namespace Game.Entities
Creature m_leader; Creature m_leader;
Dictionary<Creature, FormationInfo> m_members = new Dictionary<Creature, FormationInfo>(); Dictionary<Creature, FormationInfo> m_members = new Dictionary<Creature, FormationInfo>();
uint m_groupID; ulong m_groupID;
bool m_Formed; bool m_Formed;
} }
} }
Source/Game/Maps/Map.cs
+1 -1
View File
@@ -5080,7 +5080,7 @@ namespace Game.Maps
BitSet i_gridFileExists = new BitSet(MapConst.MaxGrids * MapConst.MaxGrids); // cache what grids are available for this map (not including parent/child maps) BitSet i_gridFileExists = new BitSet(MapConst.MaxGrids * MapConst.MaxGrids); // cache what grids are available for this map (not including parent/child maps)
BitSet marked_cells = new BitSet(MapConst.TotalCellsPerMap * MapConst.TotalCellsPerMap); BitSet marked_cells = new BitSet(MapConst.TotalCellsPerMap * MapConst.TotalCellsPerMap);
public Dictionary<uint, CreatureGroup> CreatureGroupHolder = new Dictionary<uint, CreatureGroup>(); public Dictionary<ulong, CreatureGroup> CreatureGroupHolder = new Dictionary<ulong, CreatureGroup>();
internal uint i_InstanceId; internal uint i_InstanceId;
long i_gridExpiry; long i_gridExpiry;
List<WorldObject> i_objects = new List<WorldObject>(); List<WorldObject> i_objects = new List<WorldObject>();