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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Arenas/Arena.cs
+4 -4
View File
@@ -112,7 +112,7 @@ namespace Game.Arenas
if (winnerArenaTeam != null && loserArenaTeam != null && winnerArenaTeam != loserArenaTeam)
{
Player player = _GetPlayer(guid, bgPlayer.OfflineRemoveTime != 0, "Arena.RemovePlayerAtLeave");
if (player)
if (player != null)
loserArenaTeam.MemberLost(player, GetArenaMatchmakerRating(GetOtherTeam(bgPlayer.Team)));
else
loserArenaTeam.OfflineMemberLost(guid, GetArenaMatchmakerRating(GetOtherTeam(bgPlayer.Team)));
@@ -189,7 +189,7 @@ namespace Game.Arenas
foreach (var score in PlayerScores)
{
Player player = Global.ObjAccessor.FindPlayer(score.Key);
if (player)
if (player != null)
{
Log.outDebug(LogFilter.Arena, "Statistics match Type: {0} for {1} (GUID: {2}, Team: {3}, IP: {4}): {5}",
GetArenaType(), player.GetName(), score.Key, player.GetArenaTeamId((byte)(GetArenaType() == ArenaTypes.Team5v5 ? 2 : (GetArenaType() == ArenaTypes.Team3v3 ? 1 : 0))),
@@ -229,7 +229,7 @@ namespace Game.Arenas
}
Player player = _GetPlayer(pair.Key, pair.Value.OfflineRemoveTime != 0, "Arena.EndBattleground");
if (!player)
if (player == null)
continue;
// per player calculation
@@ -251,7 +251,7 @@ namespace Game.Arenas
if (guildId != 0)
{
Guild guild = Global.GuildMgr.GetGuildById(guildId);
if (guild)
if (guild != null)
guild.UpdateCriteria(CriteriaType.WinAnyRankedArena, Math.Max(winnerArenaTeam.GetRating(), 1), 0, 0, null, player);
}
}
Source/Game/Arenas/ArenaTeam.cs
+15 -15
View File
@@ -77,7 +77,7 @@ namespace Game.Arenas
// Get player name and class either from db or character cache
CharacterCacheEntry characterInfo;
Player player = Global.ObjAccessor.FindPlayer(playerGuid);
if (player)
if (player != null)
{
playerClass = player.GetClass();
playerName = player.GetName();
@@ -91,7 +91,7 @@ namespace Game.Arenas
return false;
// Check if player is already in a similar arena team
if ((player && player.GetArenaTeamId(GetSlot()) != 0) || Global.CharacterCacheStorage.GetCharacterArenaTeamIdByGuid(playerGuid, GetArenaType()) != 0)
if ((player != null && player.GetArenaTeamId(GetSlot()) != 0) || Global.CharacterCacheStorage.GetCharacterArenaTeamIdByGuid(playerGuid, GetArenaType()) != 0)
{
Log.outDebug(LogFilter.Arena, "Arena: {0} {1} already has an arena team of type {2}", playerGuid.ToString(), playerName, GetArenaType());
return false;
@@ -144,7 +144,7 @@ namespace Game.Arenas
DB.Characters.Execute(stmt);
// Inform player if online
if (player)
if (player != null)
{
player.SetInArenaTeam(teamId, GetSlot(), GetArenaType());
player.SetArenaTeamIdInvited(0);
@@ -254,7 +254,7 @@ namespace Game.Arenas
{
// Disable remove/promote buttons
Player oldCaptain = Global.ObjAccessor.FindPlayer(GetCaptain());
if (oldCaptain)
if (oldCaptain != null)
oldCaptain.SetArenaTeamInfoField(GetSlot(), ArenaTeamInfoType.Member, 1);
// Set new captain
@@ -268,10 +268,10 @@ namespace Game.Arenas
// Enable remove/promote buttons
Player newCaptain = Global.ObjAccessor.FindPlayer(guid);
if (newCaptain)
if (newCaptain != null)
{
newCaptain.SetArenaTeamInfoField(GetSlot(), ArenaTeamInfoType.Member, 0);
if (oldCaptain)
if (oldCaptain != null)
{
Log.outDebug(LogFilter.Arena, "Player: {0} [GUID: {1}] promoted player: {2} [GUID: {3}] to leader of arena team [Id: {4}, Name: {5}] [Type: {6}].",
oldCaptain.GetName(), oldCaptain.GetGUID().ToString(), newCaptain.GetName(),
@@ -295,7 +295,7 @@ namespace Game.Arenas
// Remove arena team info from player data
Player player = Global.ObjAccessor.FindPlayer(guid);
if (player)
if (player != null)
{
// delete all info regarding this team
for (uint i = 0; i < (int)ArenaTeamInfoType.End; ++i)
@@ -319,7 +319,7 @@ namespace Game.Arenas
if (session != null)
{
Player player = session.GetPlayer();
if (player)
if (player != null)
Log.outDebug(LogFilter.Arena, "Player: {0} [GUID: {1}] disbanded arena team type: {2} [Id: {3}, Name: {4}].", player.GetName(), player.GetGUID().ToString(), GetArenaType(), GetId(), GetName());
}
@@ -387,7 +387,7 @@ namespace Game.Arenas
foreach (var member in Members)
{
Player player = Global.ObjAccessor.FindPlayer(member.Guid);
if (player)
if (player != null)
SendStats(player.GetSession());
}
}
@@ -397,7 +397,7 @@ namespace Game.Arenas
foreach (var member in Members)
{
Player player = Global.ObjAccessor.FindPlayer(member.Guid);
if (player)
if (player != null)
player.SendPacket(packet);
}
}
@@ -441,7 +441,7 @@ namespace Game.Arenas
public uint GetAverageMMR(Group group)
{
if (!group)
if (group == null)
return 0;
uint matchMakerRating = 0;
@@ -449,7 +449,7 @@ namespace Game.Arenas
foreach (var member in Members)
{
// Skip if player is not online
if (!Global.ObjAccessor.FindPlayer(member.Guid))
if (Global.ObjAccessor.FindPlayer(member.Guid) == null)
continue;
// Skip if player is not a member of group
@@ -545,7 +545,7 @@ namespace Game.Arenas
foreach (var member in Members)
{
Player player = Global.ObjAccessor.FindPlayer(member.Guid);
if (player)
if (player != null)
player.UpdateCriteria(CriteriaType.EarnTeamArenaRating, stats.Rating, type);
}
}
@@ -740,7 +740,7 @@ namespace Game.Arenas
foreach (var member in Members)
{
Player player = Global.ObjAccessor.FindPlayer(member.Guid);
if (player)
if (player != null)
if (player.GetMap().IsBattleArena())
return true;
}
@@ -816,7 +816,7 @@ namespace Game.Arenas
else
PersonalRating += (ushort)mod;
if (player)
if (player != null)
{
player.SetArenaTeamInfoField(ArenaTeam.GetSlotByType(type), ArenaTeamInfoType.PersonalRating, PersonalRating);
player.UpdateCriteria(CriteriaType.EarnPersonalArenaRating, PersonalRating, type);
Source/Game/Arenas/Zones/DalaranSewers.cs
+7 -7
View File
@@ -43,7 +43,7 @@ namespace Game.Arenas
foreach (var pair in GetPlayers())
{
Player player = _GetPlayer(pair, "BattlegroundDS::StartingEventOpenDoors");
if (player)
if (player != null)
player.RemoveAurasDueToSpell(DalaranSewersSpells.DemonicCircle);
}
}
@@ -92,9 +92,9 @@ namespace Game.Arenas
result &= AddObject(DalaranSewersObjectTypes.Water1, DalaranSewersGameObjects.Water1, 1291.56f, 790.837f, 7.1f, 3.14238f, 0, 0, 0.694215f, -0.719768f, 120);
result &= AddObject(DalaranSewersObjectTypes.Water2, DalaranSewersGameObjects.Water2, 1291.56f, 790.837f, 7.1f, 3.14238f, 0, 0, 0.694215f, -0.719768f, 120);
result &= AddCreature(DalaranSewersData.NpcWaterSpout, DalaranSewersCreatureTypes.WaterfallKnockback, 1292.587f, 790.2205f, 7.19796f, 3.054326f, TeamId.Neutral, BattlegroundConst.RespawnImmediately);
result &= AddCreature(DalaranSewersData.NpcWaterSpout, DalaranSewersCreatureTypes.PipeKnockback1, 1369.977f, 817.2882f, 16.08718f, 3.106686f, TeamId.Neutral, BattlegroundConst.RespawnImmediately);
result &= AddCreature(DalaranSewersData.NpcWaterSpout, DalaranSewersCreatureTypes.PipeKnockback2, 1212.833f, 765.3871f, 16.09484f, 0.0f, TeamId.Neutral, BattlegroundConst.RespawnImmediately);
result &= AddCreature(DalaranSewersData.NpcWaterSpout, DalaranSewersCreatureTypes.WaterfallKnockback, 1292.587f, 790.2205f, 7.19796f, 3.054326f, TeamId.Neutral, BattlegroundConst.RespawnImmediately) != null;
result &= AddCreature(DalaranSewersData.NpcWaterSpout, DalaranSewersCreatureTypes.PipeKnockback1, 1369.977f, 817.2882f, 16.08718f, 3.106686f, TeamId.Neutral, BattlegroundConst.RespawnImmediately) != null;
result &= AddCreature(DalaranSewersData.NpcWaterSpout, DalaranSewersCreatureTypes.PipeKnockback2, 1212.833f, 765.3871f, 16.09484f, 0.0f, TeamId.Neutral, BattlegroundConst.RespawnImmediately) != null;
if (!result)
{
Log.outError(LogFilter.Sql, "DalaranSewersArena: Failed to spawn collision object!");
@@ -135,7 +135,7 @@ namespace Game.Arenas
{
// Repeat knockback while the waterfall still active
Creature waterSpout = GetBGCreature(DalaranSewersCreatureTypes.WaterfallKnockback);
if (waterSpout)
if (waterSpout != null)
waterSpout.CastSpell(waterSpout, DalaranSewersSpells.WaterSpout, true);
_events.ScheduleEvent(eventId, DalaranSewersData.WaterfallKnockbackTimer);
}
@@ -145,7 +145,7 @@ namespace Game.Arenas
for (int i = DalaranSewersCreatureTypes.PipeKnockback1; i <= DalaranSewersCreatureTypes.PipeKnockback2; ++i)
{
Creature waterSpout = GetBGCreature(i);
if (waterSpout)
if (waterSpout != null)
waterSpout.CastSpell(waterSpout, DalaranSewersSpells.Flush, true);
}
}
@@ -154,7 +154,7 @@ namespace Game.Arenas
});
}
EventMap _events;
EventMap _events = new();
}
struct DalaranSewersEvents
Source/Game/Arenas/Zones/RingofValor.cs
+2 -2
View File
@@ -160,7 +160,7 @@ namespace Game.Arenas
for (byte i = RingofValorObjectTypes.Pilar1; i <= RingofValorObjectTypes.PilarCollision4; ++i)
{
GameObject go = GetBGObject(i);
if (go)
if (go != null)
{
if (i >= RingofValorObjectTypes.PilarCollision1)
{
@@ -171,7 +171,7 @@ namespace Game.Arenas
foreach (var guid in GetPlayers().Keys)
{
Player player = Global.ObjAccessor.FindPlayer(guid);
if (player)
if (player != null)
go.SendUpdateToPlayer(player);
}
}