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

Scripts/Commands: Convert argument parsing of message commands to new system

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/5675d62159aef65e3fa911d75198b8f9cfc7b8a2)
This commit is contained in:
hondacrx
2022-06-04 10:41:59 -04:00
parent c3f3cc1c7d
commit 918974a891
1 changed files with 33 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/Commands/MessageCommands.cs
+32 -67
View File
@@ -28,9 +28,9 @@ namespace Game.Chat
class MessageCommands class MessageCommands
{ {
[CommandNonGroup("nameannounce", RBACPermissions.CommandNameannounce, true)] [CommandNonGroup("nameannounce", RBACPermissions.CommandNameannounce, true)]
static bool HandleNameAnnounceCommand(CommandHandler handler, StringArguments args) static bool HandleNameAnnounceCommand(CommandHandler handler, object[] args)
{ {
if (args.Empty()) if (args.Length == 0)
return false; return false;
string name = "Console"; string name = "Console";
@@ -43,9 +43,9 @@ namespace Game.Chat
} }
[CommandNonGroup("gmnameannounce", RBACPermissions.CommandGmnameannounce, true)] [CommandNonGroup("gmnameannounce", RBACPermissions.CommandGmnameannounce, true)]
static bool HandleGMNameAnnounceCommand(CommandHandler handler, StringArguments args) static bool HandleGMNameAnnounceCommand(CommandHandler handler, object[] args)
{ {
if (args.Empty()) if (args.Length == 0)
return false; return false;
string name = "Console"; string name = "Console";
@@ -58,34 +58,35 @@ namespace Game.Chat
} }
[CommandNonGroup("announce", RBACPermissions.CommandAnnounce, true)] [CommandNonGroup("announce", RBACPermissions.CommandAnnounce, true)]
static bool HandleAnnounceCommand(CommandHandler handler, StringArguments args) static bool HandleAnnounceCommand(CommandHandler handler, object[] args)
{ {
if (args.Empty()) if (args.Length == 0)
return false; return false;
string str = handler.GetParsedString(CypherStrings.Systemmessage, args.NextString("")); string str = handler.GetParsedString(CypherStrings.Systemmessage, args);
Global.WorldMgr.SendServerMessage(ServerMessageType.String, str); Global.WorldMgr.SendServerMessage(ServerMessageType.String, str);
return true; return true;
} }
[CommandNonGroup("gmannounce", RBACPermissions.CommandGmannounce, true)] [CommandNonGroup("gmannounce", RBACPermissions.CommandGmannounce, true)]
static bool HandleGMAnnounceCommand(CommandHandler handler, StringArguments args) static bool HandleGMAnnounceCommand(CommandHandler handler, object[] args)
{ {
if (args.Empty()) if (args.Length == 0)
return false; return false;
Global.WorldMgr.SendGMText(CypherStrings.GmBroadcast, args.NextString("")); Global.WorldMgr.SendGMText(CypherStrings.GmBroadcast, args);
return true; return true;
} }
[CommandNonGroup("notify", RBACPermissions.CommandNotify, true)] [CommandNonGroup("notify", RBACPermissions.CommandNotify, true)]
static bool HandleNotifyCommand(CommandHandler handler, StringArguments args) static bool HandleNotifyCommand(CommandHandler handler, object[] args)
{ {
if (args.Empty()) if (args.Length == 0)
return false; return false;
string str = handler.GetCypherString(CypherStrings.GlobalNotify); string str = handler.GetCypherString(CypherStrings.GlobalNotify);
str += args.NextString(""); foreach (string str2 in args)
str += str2;
Global.WorldMgr.SendGlobalMessage(new PrintNotification(str)); Global.WorldMgr.SendGlobalMessage(new PrintNotification(str));
@@ -93,13 +94,14 @@ namespace Game.Chat
} }
[CommandNonGroup("gmnotify", RBACPermissions.CommandGmnotify, true)] [CommandNonGroup("gmnotify", RBACPermissions.CommandGmnotify, true)]
static bool HandleGMNotifyCommand(CommandHandler handler, StringArguments args) static bool HandleGMNotifyCommand(CommandHandler handler, object[] args)
{ {
if (args.Empty()) if (args.Length == 0)
return false; return false;
string str = handler.GetCypherString(CypherStrings.GmNotify); string str = handler.GetCypherString(CypherStrings.GmNotify);
str += args.NextString(""); foreach (string str2 in args)
str += str2;
Global.WorldMgr.SendGlobalGMMessage(new PrintNotification(str)); Global.WorldMgr.SendGlobalGMMessage(new PrintNotification(str));
@@ -107,55 +109,29 @@ namespace Game.Chat
} }
[CommandNonGroup("whispers", RBACPermissions.CommandWhispers)] [CommandNonGroup("whispers", RBACPermissions.CommandWhispers)]
static bool HandleWhispersCommand(CommandHandler handler, StringArguments args) static bool HandleWhispersCommand(CommandHandler handler, bool? operationArg)
{ {
if (args.Empty()) if (!operationArg.HasValue)
{ {
handler.SendSysMessage(CypherStrings.CommandWhisperaccepting, handler.GetSession().GetPlayer().IsAcceptWhispers() ? handler.GetCypherString(CypherStrings.On) : handler.GetCypherString(CypherStrings.Off)); handler.SendSysMessage(CypherStrings.CommandWhisperaccepting, handler.GetSession().GetPlayer().IsAcceptWhispers() ? handler.GetCypherString(CypherStrings.On) : handler.GetCypherString(CypherStrings.Off));
return true; return true;
} }
string argStr = args.NextString(); if (operationArg.HasValue)
// whisper on
if (argStr == "on")
{ {
handler.GetSession().GetPlayer().SetAcceptWhispers(true); handler.GetSession().GetPlayer().SetAcceptWhispers(true);
handler.SendSysMessage(CypherStrings.CommandWhisperon); handler.SendSysMessage(CypherStrings.CommandWhisperon);
return true;
} }
else
// whisper off
if (argStr == "off")
{ {
// Remove all players from the Gamemaster's whisper whitelist // Remove all players from the Gamemaster's whisper whitelist
handler.GetSession().GetPlayer().ClearWhisperWhiteList(); handler.GetSession().GetPlayer().ClearWhisperWhiteList();
handler.GetSession().GetPlayer().SetAcceptWhispers(false); handler.GetSession().GetPlayer().SetAcceptWhispers(false);
handler.SendSysMessage(CypherStrings.CommandWhisperoff); handler.SendSysMessage(CypherStrings.CommandWhisperoff);
return true;
} }
if (argStr == "remove")
{
string name = args.NextString();
if (ObjectManager.NormalizePlayerName(ref name))
{
Player player = Global.ObjAccessor.FindPlayerByName(name);
if (player)
{
handler.GetSession().GetPlayer().RemoveFromWhisperWhiteList(player.GetGUID());
handler.SendSysMessage(CypherStrings.CommandWhisperoffplayer, name);
return true; return true;
} }
else
{
handler.SendSysMessage(CypherStrings.PlayerNotFound, name);
return false;
}
}
}
handler.SendSysMessage(CypherStrings.UseBol);
return false;
}
} }
[CommandGroup("channel", RBACPermissions.CommandChannel, true)] [CommandGroup("channel", RBACPermissions.CommandChannel, true)]
@@ -165,21 +141,12 @@ namespace Game.Chat
class ChannelSetCommands class ChannelSetCommands
{ {
[Command("ownership", RBACPermissions.CommandChannelSetOwnership)] [Command("ownership", RBACPermissions.CommandChannelSetOwnership)]
static bool HandleChannelSetOwnership(CommandHandler handler, StringArguments args) static bool HandleChannelSetOwnership(CommandHandler handler, string channelName, bool grantOwnership)
{ {
if (args.Empty())
return false;
string channelStr = args.NextString();
string argStr = args.NextString("");
if (channelStr.IsEmpty() || argStr.IsEmpty())
return false;
uint channelId = 0; uint channelId = 0;
foreach (var channelEntry in CliDB.ChatChannelsStorage.Values) foreach (var channelEntry in CliDB.ChatChannelsStorage.Values)
{ {
if (channelEntry.Name[handler.GetSessionDbcLocale()].Equals(channelStr)) if (channelEntry.Name[handler.GetSessionDbcLocale()].Equals(channelName))
{ {
channelId = channelEntry.Id; channelId = channelEntry.Id;
break; break;
@@ -189,7 +156,7 @@ namespace Game.Chat
AreaTableRecord zoneEntry = null; AreaTableRecord zoneEntry = null;
foreach (var entry in CliDB.AreaTableStorage.Values) foreach (var entry in CliDB.AreaTableStorage.Values)
{ {
if (entry.AreaName[handler.GetSessionDbcLocale()].Equals(channelStr)) if (entry.AreaName[handler.GetSessionDbcLocale()].Equals(channelName))
{ {
zoneEntry = entry; zoneEntry = entry;
break; break;
@@ -201,30 +168,28 @@ namespace Game.Chat
ChannelManager cMgr = ChannelManager.ForTeam(player.GetTeam()); ChannelManager cMgr = ChannelManager.ForTeam(player.GetTeam());
if (cMgr != null) if (cMgr != null)
channel = cMgr.GetChannel(channelId, channelStr, player, false, zoneEntry); channel = cMgr.GetChannel(channelId, channelName, player, false, zoneEntry);
if (argStr.ToLower() == "on") if (grantOwnership)
{ {
if (channel != null) if (channel != null)
channel.SetOwnership(true); channel.SetOwnership(true);
PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.UPD_CHANNEL_OWNERSHIP); PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.UPD_CHANNEL_OWNERSHIP);
stmt.AddValue(0, 1); stmt.AddValue(0, 1);
stmt.AddValue(1, channelStr); stmt.AddValue(1, channelName);
DB.Characters.Execute(stmt); DB.Characters.Execute(stmt);
handler.SendSysMessage(CypherStrings.ChannelEnableOwnership, channelStr); handler.SendSysMessage(CypherStrings.ChannelEnableOwnership, channelName);
} }
else if (argStr.ToLower() == "off") else
{ {
if (channel != null) if (channel != null)
channel.SetOwnership(false); channel.SetOwnership(false);
PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.UPD_CHANNEL_OWNERSHIP); PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.UPD_CHANNEL_OWNERSHIP);
stmt.AddValue(0, 0); stmt.AddValue(0, 0);
stmt.AddValue(1, channelStr); stmt.AddValue(1, channelName);
DB.Characters.Execute(stmt); DB.Characters.Execute(stmt);
handler.SendSysMessage(CypherStrings.ChannelDisableOwnership, channelStr); handler.SendSysMessage(CypherStrings.ChannelDisableOwnership, channelName);
} }
else
return false;
return true; return true;
} }