Core/Misc: Moved CanSpeak() method to WorldSession class

Port From (https://github.com/TrinityCore/TrinityCore/commit/93aa30f4474254b9db69025e7864a124028273c0)
This commit is contained in:
hondacrx
2020-02-09 16:58:40 -05:00
parent 0c919ad97d
commit 14b7ac6f67
4 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -1759,7 +1759,7 @@ namespace Game.Chat
if (target) if (target)
{ {
if (target.CanSpeak()) if (target.GetSession().CanSpeak())
{ {
handler.SendSysMessage(CypherStrings.ChatAlreadyEnabled); handler.SendSysMessage(CypherStrings.ChatAlreadyEnabled);
return false; return false;
-5
View File
@@ -5783,11 +5783,6 @@ namespace Game.Entities
UpdateItemLevelAreaBasedScaling(); UpdateItemLevelAreaBasedScaling();
} }
public bool CanSpeak()
{
return GetSession().m_muteTime <= Time.UnixTime;
}
public void RemoveSocial() public void RemoveSocial()
{ {
Global.SocialMgr.RemovePlayerSocial(GetGUID()); Global.SocialMgr.RemovePlayerSocial(GetGUID());
+2 -2
View File
@@ -166,7 +166,7 @@ namespace Game
lang = (Language)ModLangAuras.FirstOrDefault().GetMiscValue(); lang = (Language)ModLangAuras.FirstOrDefault().GetMiscValue();
} }
if (!sender.CanSpeak()) if (!CanSpeak())
{ {
string timeStr = Time.secsToTimeString((ulong)(m_muteTime - Time.UnixTime)); string timeStr = Time.secsToTimeString((ulong)(m_muteTime - Time.UnixTime));
SendNotification(CypherStrings.WaitBeforeSpeaking, timeStr); SendNotification(CypherStrings.WaitBeforeSpeaking, timeStr);
@@ -555,7 +555,7 @@ namespace Game
if (!GetPlayer().IsAlive()) if (!GetPlayer().IsAlive())
return; return;
if (!GetPlayer().CanSpeak()) if (!CanSpeak())
{ {
string timeStr = Time.secsToTimeString((ulong)(m_muteTime - Time.UnixTime)); string timeStr = Time.secsToTimeString((ulong)(m_muteTime - Time.UnixTime));
SendNotification(CypherStrings.WaitBeforeSpeaking, timeStr); SendNotification(CypherStrings.WaitBeforeSpeaking, timeStr);
+5
View File
@@ -554,6 +554,11 @@ namespace Game
SendPacket(packet); SendPacket(packet);
} }
public bool CanSpeak()
{
return m_muteTime <= GameTime.GetGameTime();
}
public void SendNotification(CypherStrings str, params object[] args) public void SendNotification(CypherStrings str, params object[] args)
{ {
SendNotification(Global.ObjectMgr.GetCypherString(str), args); SendNotification(Global.ObjectMgr.GetCypherString(str), args);