Some cleanups. (might break build for scripts as they are a WIP)

This commit is contained in:
hondacrx
2023-10-08 10:35:31 -04:00
parent fa10b981bd
commit cda53c8e7f
208 changed files with 2266 additions and 2329 deletions
@@ -504,7 +504,7 @@ namespace Game.Achievements
if (achievement.Flags.HasAnyFlag(AchievementFlags.ShowInGuildNews))
{
Guild guild = referencePlayer.GetGuild();
if (guild)
if (guild != null)
guild.AddGuildNews(GuildNews.PlayerAchievement, referencePlayer.GetGUID(), (uint)(achievement.Flags & AchievementFlags.ShowInGuildHeader), achievement.Id);
}
@@ -577,7 +577,7 @@ namespace Game.Achievements
SQLTransaction trans = new();
Item item = reward.ItemId != 0 ? Item.CreateItem(reward.ItemId, 1, ItemContext.None, _owner) : null;
if (item)
if (item != null)
{
// save new item before send
item.SaveToDB(trans); // save for prevent lost at next mail load, if send fail then item will deleted
@@ -654,7 +654,7 @@ namespace Game.Achievements
if (!achievement.Flags.HasAnyFlag(AchievementFlags.TrackingFlag))
{
Guild guild = Global.GuildMgr.GetGuildById(_owner.GetGuildId());
if (guild)
if (guild != null)
{
BroadcastTextBuilder say_builder = new(_owner, ChatMsg.GuildAchievement, (uint)BroadcastTextIds.AchivementEarned, _owner.GetNativeGender(), _owner, achievement.Id);
var say_do = new LocalizedDo(say_builder);
@@ -972,7 +972,7 @@ namespace Game.Achievements
if (achievement.Flags.HasAnyFlag(AchievementFlags.ShowInGuildNews))
{
Guild guild = referencePlayer.GetGuild();
if (guild)
if (guild != null)
guild.AddGuildNews(GuildNews.Achievement, ObjectGuid.Empty, (uint)(achievement.Flags & AchievementFlags.ShowInGuildHeader), achievement.Id);
}
@@ -987,12 +987,12 @@ namespace Game.Achievements
ca.CompletingPlayers.Add(referencePlayer.GetGUID());
Group group = referencePlayer.GetGroup();
if (group)
if (group != null)
{
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next())
{
Player groupMember = refe.GetSource();
if (groupMember)
if (groupMember != null)
if (groupMember.GetGuildId() == _owner.GetId())
ca.CompletingPlayers.Add(groupMember.GetGUID());
}