diff --git a/Source/Game/BattleGrounds/Zones/StrandofAncients.cs b/Source/Game/BattleGrounds/Zones/StrandofAncients.cs index e3bedc0be..103b9112a 100644 --- a/Source/Game/BattleGrounds/Zones/StrandofAncients.cs +++ b/Source/Game/BattleGrounds/Zones/StrandofAncients.cs @@ -107,7 +107,7 @@ namespace Game.BattleGrounds.Zones { if (!AddObject(i, SAMiscConst.ObjEntries[i], SAMiscConst.ObjSpawnlocs[i], 0, 0, 0, 0, BattlegroundConst.RespawnOneDay)) { - Log.outError(LogFilter.Battleground, "SOTA: couldn't spawn BG_SA_PORTAL_DEFFENDER_RED, Entry: %u", SAMiscConst.ObjEntries[i]); + Log.outError(LogFilter.Battleground, $"SOTA: couldn't spawn BG_SA_PORTAL_DEFFENDER_RED, Entry: {SAMiscConst.ObjEntries[i]}"); continue; } } @@ -131,7 +131,7 @@ namespace Game.BattleGrounds.Zones SAMiscConst.ObjSpawnlocs[i].GetPositionZ() + (Attackers != 0 ? -3.750f : 0), SAMiscConst.ObjSpawnlocs[i].GetOrientation(), 0, 0, 0, 0, BattlegroundConst.RespawnOneDay)) { - Log.outError(LogFilter.Battleground, "SOTA: couldn't spawn one of the BG_SA_BOAT, Entry: %u", boatid); + Log.outError(LogFilter.Battleground, $"SOTA: couldn't spawn one of the BG_SA_BOAT, Entry: {boatid}"); continue; } } @@ -140,7 +140,7 @@ namespace Game.BattleGrounds.Zones { if (!AddObject(i, SAMiscConst.ObjEntries[i], SAMiscConst.ObjSpawnlocs[i], 0, 0, 0, 0, BattlegroundConst.RespawnOneDay)) { - Log.outError(LogFilter.Battleground, "SOTA: couldn't spawn Sigil, Entry: %u", SAMiscConst.ObjEntries[i]); + Log.outError(LogFilter.Battleground, $"SOTA: couldn't spawn Sigil, Entry: {SAMiscConst.ObjEntries[i]}"); continue; } } @@ -157,7 +157,7 @@ namespace Game.BattleGrounds.Zones { if (!AddCreature(SAMiscConst.NpcEntries[i], i, SAMiscConst.NpcSpawnlocs[i], Attackers == TeamId.Alliance ? TeamId.Horde : TeamId.Alliance, 600)) { - Log.outError(LogFilter.Battleground, "SOTA: couldn't spawn Cannon or demolisher, Entry: %u, Attackers: %s", SAMiscConst.NpcEntries[i], Attackers == TeamId.Alliance ? "Horde(1)" : "Alliance(0)"); + Log.outError(LogFilter.Battleground, $"SOTA: couldn't spawn Cannon or demolisher, Entry: {SAMiscConst.NpcEntries[i]}, Attackers: {(Attackers == TeamId.Alliance ? "Horde(1)" : "Alliance(0)")}"); continue; } } @@ -183,7 +183,7 @@ namespace Game.BattleGrounds.Zones WorldSafeLocsEntry sg = Global.ObjectMgr.GetWorldSafeLoc(SAMiscConst.GYEntries[i]); if (sg == null) { - Log.outError(LogFilter.Battleground, "SOTA: Can't find GY entry %u", SAMiscConst.GYEntries[i]); + Log.outError(LogFilter.Battleground, $"SOTA: Can't find GY entry {SAMiscConst.GYEntries[i]}"); return false; } @@ -196,7 +196,7 @@ namespace Game.BattleGrounds.Zones { GraveyardStatus[i] = ((Attackers == TeamId.Horde) ? TeamId.Alliance : TeamId.Horde); if (!AddSpiritGuide(i + SACreatureTypes.Max, sg.Loc.GetPositionX(), sg.Loc.GetPositionY(), sg.Loc.GetPositionZ(), SAMiscConst.GYOrientation[i], Attackers == TeamId.Horde ? TeamId.Alliance : TeamId.Horde)) - Log.outError(LogFilter.Battleground, "SOTA: couldn't spawn GY: %u", i); + Log.outError(LogFilter.Battleground, $"SOTA: couldn't spawn GY: {i}"); } } @@ -205,7 +205,7 @@ namespace Game.BattleGrounds.Zones { if (!AddObject(i, (SAMiscConst.ObjEntries[i] - (Attackers == TeamId.Alliance ? 1u : 0)), SAMiscConst.ObjSpawnlocs[i], 0, 0, 0, 0, BattlegroundConst.RespawnOneDay)) { - Log.outError(LogFilter.Battleground, "SOTA: couldn't spawn Central Flag Entry: %u", SAMiscConst.ObjEntries[i] - (Attackers == TeamId.Alliance ? 1 : 0)); + Log.outError(LogFilter.Battleground, $"SOTA: couldn't spawn Central Flag Entry: {SAMiscConst.ObjEntries[i] - (Attackers == TeamId.Alliance ? 1 : 0)}"); continue; } GetBGObject(i).SetFaction(atF); @@ -217,7 +217,7 @@ namespace Game.BattleGrounds.Zones { if (!AddObject(i, SAMiscConst.ObjEntries[SAObjectTypes.Bomb], SAMiscConst.ObjSpawnlocs[i], 0, 0, 0, 0, BattlegroundConst.RespawnOneDay)) { - Log.outError(LogFilter.Battleground, "SOTA: couldn't spawn SA Bomb Entry: %u", SAMiscConst.ObjEntries[SAObjectTypes.Bomb] + i); + Log.outError(LogFilter.Battleground, $"SOTA: couldn't spawn SA Bomb Entry: {SAMiscConst.ObjEntries[SAObjectTypes.Bomb] + i}"); continue; } GetBGObject(i).SetFaction(atF); diff --git a/Source/Game/Entities/Item/Item.cs b/Source/Game/Entities/Item/Item.cs index 80c347494..001be4919 100644 --- a/Source/Game/Entities/Item/Item.cs +++ b/Source/Game/Entities/Item/Item.cs @@ -448,7 +448,7 @@ namespace Game.Entities List bonusListIDs = new List(); for (var i = 0; i < bonusListString.Length; ++i) { - if (uint.TryParse(tokens[i], out uint bonusListID)) + if (uint.TryParse(bonusListString[i], out uint bonusListID)) bonusListIDs.Add(bonusListID); } SetBonuses(bonusListIDs); diff --git a/Source/Game/Entities/Player/Player.DB.cs b/Source/Game/Entities/Player/Player.DB.cs index c8cc4a136..bb72b56a1 100644 --- a/Source/Game/Entities/Player/Player.DB.cs +++ b/Source/Game/Entities/Player/Player.DB.cs @@ -3078,7 +3078,7 @@ namespace Game.Entities // first save/honor gain after midnight will also update the player's honor fields UpdateHonorFields(); - Log.outDebug(LogFilter.Player, $"Player::SaveToDB: The value of player {GetName()}%s at save: "); + Log.outDebug(LogFilter.Player, $"Player::SaveToDB: The value of player {GetName()} at save: "); if (!create) Global.ScriptMgr.OnPlayerSave(this); diff --git a/Source/Game/Events/GameEventManager.cs b/Source/Game/Events/GameEventManager.cs index 28f72a5ee..89fa84b60 100644 --- a/Source/Game/Events/GameEventManager.cs +++ b/Source/Game/Events/GameEventManager.cs @@ -1584,7 +1584,6 @@ namespace Game return ae.Contains(event_id); } - public List GetActiveEventList() { return m_ActiveEvents; } public GameEventData[] GetEventMap() { return mGameEvent; } public bool IsActiveEvent(ushort event_id) { return m_ActiveEvents.Contains(event_id); } @@ -1592,7 +1591,6 @@ namespace Game void AddActiveEvent(ushort event_id) { m_ActiveEvents.Add(event_id); } void RemoveActiveEvent(ushort event_id) { m_ActiveEvents.Remove(event_id); } - List>[] mGameEventCreatureQuests; List>[] mGameEventGameObjectQuests; Dictionary[] mGameEventVendors;