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/Chat/Commands/GroupCommands.cs
+26 -37
View File
@@ -106,27 +106,24 @@ namespace Game.Chat
if (groupTarget == null)
return false;
for (GroupReference it = groupTarget.GetFirstMember(); it != null; it = it.Next())
foreach (GroupReference groupRef in groupTarget.GetMembers())
{
target = it.GetSource();
if (target != null)
target = groupRef.GetSource();
uint oldlevel = target.GetLevel();
if (level != oldlevel)
{
uint oldlevel = target.GetLevel();
target.SetLevel((uint)level);
target.InitTalentForLevel();
target.SetXP(0);
}
if (level != oldlevel)
{
target.SetLevel((uint)level);
target.InitTalentForLevel();
target.SetXP(0);
}
if (handler.NeedReportToTarget(target))
{
if (oldlevel < level)
target.SendSysMessage(CypherStrings.YoursLevelUp, handler.GetNameLink(), level);
else // if (oldlevel > newlevel)
target.SendSysMessage(CypherStrings.YoursLevelDown, handler.GetNameLink(), level);
}
if (handler.NeedReportToTarget(target))
{
if (oldlevel < level)
target.SendSysMessage(CypherStrings.YoursLevelUp, handler.GetNameLink(), level);
else // if (oldlevel > newlevel)
target.SendSysMessage(CypherStrings.YoursLevelDown, handler.GetNameLink(), level);
}
}
return true;
@@ -248,12 +245,8 @@ namespace Game.Chat
if (groupTarget == null)
return false;
for (GroupReference it = groupTarget.GetFirstMember(); it != null; it = it.Next())
{
Player target = it.GetSource();
if (target != null)
target.DurabilityRepairAll(false, 0, false);
}
foreach (GroupReference groupRef in groupTarget.GetMembers())
groupRef.GetSource().DurabilityRepairAll(false, 0, false);
return true;
}
@@ -270,15 +263,12 @@ namespace Game.Chat
if (groupTarget == null)
return false;
for (GroupReference it = groupTarget.GetFirstMember(); it != null; it = it.Next())
foreach (GroupReference groupRef in groupTarget.GetMembers())
{
Player target = it.GetSource();
if (target != null)
{
target.ResurrectPlayer(target.GetSession().HasPermission(RBACPermissions.ResurrectWithFullHps) ? 1.0f : 0.5f);
target.SpawnCorpseBones();
target.SaveToDB();
}
Player target = groupRef.GetSource();
target.ResurrectPlayer(target.GetSession().HasPermission(RBACPermissions.ResurrectWithFullHps) ? 1.0f : 0.5f);
target.SpawnCorpseBones();
target.SaveToDB();
}
return true;
@@ -326,11 +316,10 @@ namespace Game.Chat
}
}
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next())
foreach (GroupReference groupRef in group.GetMembers())
{
Player player = refe.GetSource();
if (player == null || player == gmPlayer || player.GetSession() == null)
Player player = groupRef.GetSource();
if (player == gmPlayer || player.GetSession() == null)
continue;
// check online security
@@ -364,7 +353,7 @@ namespace Game.Chat
// stop flight if need
if (player.IsInFlight())
player.FinishTaxiFlight();
player.FinishTaxiFlight();
else
player.SaveRecallPosition(); // save only in non-flight case
Source/Game/Chat/Commands/TeleCommands.cs
+4 -6
View File
@@ -127,18 +127,16 @@ namespace Game.Chat
string nameLink = handler.GetNameLink(target);
Group grp = target.GetGroup();
if (grp == null)
Group group = target.GetGroup();
if (group == null)
{
handler.SendSysMessage(CypherStrings.NotInGroup, nameLink);
return false;
}
for (GroupReference refe = grp.GetFirstMember(); refe != null; refe = refe.Next())
foreach (GroupReference groupRef in group.GetMembers())
{
Player player = refe.GetSource();
if (player == null || player.GetSession() == null)
continue;
Player player = groupRef.GetSource();
// check online security
if (handler.HasLowerSecurity(player, ObjectGuid.Empty))