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

Core/Groups: Fixes groups staying linked with players.

Browse Source
This commit is contained in:
Hondacrx
2025-09-02 22:43:56 -04:00
parent 6531cd9dc1
commit 3d23a9f162
34 changed files with 385 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Achievements/AchievementManager.cs
+5 -6
View File
@@ -671,7 +671,7 @@ namespace Game.Achievements
achievementEarned.Time += receiver.GetSession().GetTimezoneOffset();
receiver.SendPacket(achievementEarned);
};
achievementEarnedBuilder(_owner);
if (!achievement.Flags.HasAnyFlag(AchievementFlags.TrackingFlag))
@@ -985,12 +985,11 @@ namespace Game.Achievements
Group group = referencePlayer.GetGroup();
if (group != null)
{
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next())
foreach (GroupReference groupRef in group.GetMembers())
{
Player groupMember = refe.GetSource();
if (groupMember != null)
if (groupMember.GetGuildId() == _owner.GetId())
ca.CompletingPlayers.Add(groupMember.GetGUID());
Player groupMember = groupRef.GetSource();
if (groupMember.GetGuildId() == _owner.GetId())
ca.CompletingPlayers.Add(groupMember.GetGUID());
}
}
}
Source/Game/Achievements/CriteriaHandler.cs
+13 -12
View File
@@ -9,6 +9,7 @@ using Game.BattleGrounds;
using Game.DataStorage;
using Game.Entities;
using Game.Garrisons;
using Game.Groups;
using Game.Maps;
using Game.Miscellaneous;
using Game.Networking;
@@ -1725,8 +1726,8 @@ namespace Game.Achievements
var group = referencePlayer.GetGroup();
if (group != null)
{
for (var itr = group.GetFirstMember(); itr != null; itr = itr.Next())
if (itr.GetSource().GetGuildId() == referencePlayer.GetGuildId())
foreach (GroupReference groupRefe in group.GetMembers())
if (groupRefe.GetSource().GetGuildId() == referencePlayer.GetGuildId())
++guildMemberCount;
}
@@ -2739,8 +2740,8 @@ namespace Game.Achievements
var group = referencePlayer.GetGroup();
if (group != null)
{
for (var itr = group.GetFirstMember(); itr != null; itr = itr.Next())
if (itr.GetSource() != referencePlayer && referencePlayer.m_playerData.VirtualPlayerRealm == itr.GetSource().m_playerData.VirtualPlayerRealm)
foreach (GroupReference groupRef in group.GetMembers())
if (groupRef.GetSource() != referencePlayer && referencePlayer.m_playerData.VirtualPlayerRealm == groupRef.GetSource().m_playerData.VirtualPlayerRealm)
++memberCount;
}
@@ -2845,8 +2846,8 @@ namespace Game.Achievements
if (group != null)
{
uint membersWithAchievement = 0;
for (var itr = group.GetFirstMember(); itr != null; itr = itr.Next())
if (itr.GetSource().HasAchieved((uint)secondaryAsset))
foreach (GroupReference groupRef in group.GetMembers())
if (groupRef.GetSource().HasAchieved((uint)secondaryAsset))
++membersWithAchievement;
if (membersWithAchievement > reqValue)
@@ -3283,8 +3284,8 @@ namespace Game.Achievements
if (group == null)
return false;
for (var itr = group.GetFirstMember(); itr != null; itr = itr.Next())
if (itr.GetSource().GetSession().GetRecruiterId() == referencePlayer.GetSession().GetAccountId())
foreach (GroupReference groupRef in group.GetMembers())
if (groupRef.GetSource().GetSession().GetRecruiterId() == referencePlayer.GetSession().GetAccountId())
return true;
return false;
@@ -3295,8 +3296,8 @@ namespace Game.Achievements
if (group == null)
return false;
for (var itr = group.GetFirstMember(); itr != null; itr = itr.Next())
if (itr.GetSource().GetSession().GetAccountId() == referencePlayer.GetSession().GetRecruiterId())
foreach (GroupReference groupRef in group.GetMembers())
if (groupRef.GetSource().GetSession().GetAccountId() == referencePlayer.GetSession().GetRecruiterId())
return true;
return false;
@@ -3430,8 +3431,8 @@ namespace Game.Achievements
var group = referencePlayer.GetGroup();
if (group != null)
{
for (var itr = group.GetFirstMember(); itr != null; itr = itr.Next())
if (!itr.GetSource().HasAchieved(reqValue))
foreach (GroupReference groupRef in group.GetMembers())
if (!groupRef.GetSource().HasAchieved(reqValue))
return false;
}
else if (!referencePlayer.HasAchieved(reqValue))