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

Some Cleanups

Browse Source
This commit is contained in:
hondacrx
2021-06-07 18:06:16 -04:00
parent cb7640e3c6
commit 302a1f293c
53 changed files with 382 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Server/WorldManager.cs
+9 -9
View File
@@ -1231,7 +1231,7 @@ namespace Game
public void Update(uint diff)
{
///- Update the game time and check for shutdown time
_UpdateGameTime();
UpdateGameTime();
long currentGameTime = GameTime.GetGameTime();
_worldUpdateTime.UpdateWithDiff(diff);
@@ -1731,7 +1731,7 @@ namespace Game
return true;
}
void _UpdateGameTime()
void UpdateGameTime()
{
// update the time
long lastGameTime = GameTime.GetGameTime();
@@ -1899,10 +1899,10 @@ namespace Game
{
PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.SEL_CHARACTER_COUNT);
stmt.AddValue(0, accountId);
_queryProcessor.AddCallback(DB.Characters.AsyncQuery(stmt).WithCallback(_UpdateRealmCharCount));
_queryProcessor.AddCallback(DB.Characters.AsyncQuery(stmt).WithCallback(UpdateRealmCharCount));
}
void _UpdateRealmCharCount(SQLResult result)
void UpdateRealmCharCount(SQLResult result)
{
if (!result.IsEmpty())
{
@@ -2061,7 +2061,7 @@ namespace Game
if (session.GetPlayer() != null)
session.GetPlayer().ResetCurrencyWeekCap();
m_NextCurrencyReset = m_NextCurrencyReset + Time.Day * WorldConfig.GetIntValue(WorldCfg.CurrencyResetInterval);
m_NextCurrencyReset += Time.Day * WorldConfig.GetIntValue(WorldCfg.CurrencyResetInterval);
SetWorldState(WorldStates.CurrencyResetTime, (ulong)m_NextCurrencyReset);
}
@@ -2095,7 +2095,7 @@ namespace Game
if (session.GetPlayer() != null)
session.GetPlayer().ResetWeeklyQuestStatus();
m_NextWeeklyQuestReset = (m_NextWeeklyQuestReset + Time.Week);
m_NextWeeklyQuestReset += Time.Week;
SetWorldState(WorldStates.WeeklyQuestResetTime, (ulong)m_NextWeeklyQuestReset);
// change available weeklies
@@ -2149,13 +2149,13 @@ namespace Game
if (session.GetPlayer())
session.GetPlayer().SetRandomWinner(false);
m_NextRandomBGReset = m_NextRandomBGReset + Time.Day;
m_NextRandomBGReset += Time.Day;
SetWorldState(WorldStates.BGDailyResetTime, (ulong)m_NextRandomBGReset);
}
void ResetGuildCap()
{
m_NextGuildReset = (m_NextGuildReset + Time.Day);
m_NextGuildReset += Time.Day;
SetWorldState(WorldStates.GuildDailyResetTime, (ulong)m_NextGuildReset);
ulong week = GetWorldState(WorldStates.GuildWeeklyResetTime);
week = week < 7 ? week + 1 : 1;
@@ -2532,7 +2532,7 @@ namespace Game
if (i_args != null)
text = string.Format(text, i_args);
MultiplePacketSender sender = new MultiplePacketSender();
MultiplePacketSender sender = new();
var lines = new StringArray(text, "\n");
for (var i = 0; i < lines.Length; ++i)
Source/Game/Server/WorldSession.cs
+1 -9
View File
@@ -81,8 +81,7 @@ namespace Game
}
// empty incoming packet queue
WorldPacket packet;
while (_recvQueue.TryDequeue(out packet)) ;
_recvQueue.Clear();
DB.Login.Execute("UPDATE account SET online = 0 WHERE id = {0};", GetAccountId()); // One-time query
}
@@ -773,9 +772,6 @@ namespace Game
SendPacket(bnetConnected);
_battlePetMgr.LoadFromDB(holder.GetResult(AccountInfoQueryLoad.BattlePets), holder.GetResult(AccountInfoQueryLoad.BattlePetSlot));
realmHolder = null;
holder = null;
}
public RBACData GetRBACData()
@@ -840,10 +836,6 @@ namespace Game
public BattlePetMgr GetBattlePetMgr() { return _battlePetMgr; }
public CollectionMgr GetCollectionMgr() { return _collectionMgr; }
void ClearRedirectFlag(SessionFlags flag) { m_flags &= ~flag; }
public bool WasRedirected() { return m_flags.HasAnyFlag(SessionFlags.FromRedirect); }
bool HasRedirected() { return m_flags.HasAnyFlag(SessionFlags.HasRedirected); }
// Battlenet
public Array<byte> GetRealmListSecret() { return _realmListSecret; }
void SetRealmListSecret(Array<byte> secret) { _realmListSecret = secret; }