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

More refactoring of code.

Browse Source
This commit is contained in:
hondacrx
2019-09-23 21:41:13 -04:00
parent 2418715800
commit 570aebce26
176 changed files with 2261 additions and 2265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/CommandHandler.cs
+37 -37
View File
@@ -81,7 +81,7 @@ namespace Game.Chat
//if (!command.Name.Equals(cmd))
//continue;
if (!hasStringAbbr(command.Name, cmd))
if (!HasStringAbbr(command.Name, cmd))
continue;
bool match = false;
@@ -89,7 +89,7 @@ namespace Game.Chat
{
foreach (var command2 in table)
{
if (!hasStringAbbr(command2.Name, cmd))
if (!HasStringAbbr(command2.Name, cmd))
continue;
if (command2.Name.Equals(cmd))
@@ -180,7 +180,7 @@ namespace Game.Chat
if (!IsAvailable(command))
continue;
if (!hasStringAbbr(command.Name, cmd))
if (!HasStringAbbr(command.Name, cmd))
continue;
// have subcommand
@@ -236,7 +236,7 @@ namespace Game.Chat
continue;
// for empty subcmd show all available
if (!subcmd.IsEmpty() && !hasStringAbbr(command.Name, subcmd))
if (!subcmd.IsEmpty() && !HasStringAbbr(command.Name, subcmd))
continue;
if (GetSession() != null)
@@ -271,17 +271,17 @@ namespace Game.Chat
public virtual bool HasPermission(RBACPermissions permission) { return _session.HasPermission(permission); }
public string extractKeyFromLink(StringArguments args, params string[] linkType)
public string ExtractKeyFromLink(StringArguments args, params string[] linkType)
{
int throwaway;
return extractKeyFromLink(args, linkType, out throwaway);
return ExtractKeyFromLink(args, linkType, out throwaway);
}
public string extractKeyFromLink(StringArguments args, string[] linkType, out int found_idx)
public string ExtractKeyFromLink(StringArguments args, string[] linkType, out int found_idx)
{
string throwaway;
return extractKeyFromLink(args, linkType, out found_idx, out throwaway);
return ExtractKeyFromLink(args, linkType, out found_idx, out throwaway);
}
public string extractKeyFromLink(StringArguments args, string[] linkType, out int found_idx, out string something1)
public string ExtractKeyFromLink(StringArguments args, string[] linkType, out int found_idx, out string something1)
{
found_idx = 0;
something1 = null;
@@ -327,7 +327,7 @@ namespace Game.Chat
return null;
}
public void extractOptFirstArg(StringArguments args, out string arg1, out string arg2)
public void ExtractOptFirstArg(StringArguments args, out string arg1, out string arg2)
{
string p1 = args.NextString();
string p2 = args.NextString();
@@ -342,9 +342,9 @@ namespace Game.Chat
arg2 = p2;
}
public GameTele extractGameTeleFromLink(StringArguments args)
public GameTele ExtractGameTeleFromLink(StringArguments args)
{
string cId = extractKeyFromLink(args, "Htele");
string cId = ExtractKeyFromLink(args, "Htele");
if (string.IsNullOrEmpty(cId))
return null;
@@ -354,7 +354,7 @@ namespace Game.Chat
return Global.ObjectMgr.GetGameTele(id);
}
public string extractQuotedArg(string str)
public string ExtractQuotedArg(string str)
{
if (string.IsNullOrEmpty(str))
return null;
@@ -364,10 +364,10 @@ namespace Game.Chat
return str.Replace("\"", String.Empty);
}
string extractPlayerNameFromLink(StringArguments args)
string ExtractPlayerNameFromLink(StringArguments args)
{
// |color|Hplayer:name|h[name]|h|r
string name = extractKeyFromLink(args, "Hplayer");
string name = ExtractKeyFromLink(args, "Hplayer");
if (name.IsEmpty())
return "";
@@ -376,19 +376,19 @@ namespace Game.Chat
return name;
}
public bool extractPlayerTarget(StringArguments args, out Player player)
public bool ExtractPlayerTarget(StringArguments args, out Player player)
{
ObjectGuid guid;
string name;
return extractPlayerTarget(args, out player, out guid, out name);
return ExtractPlayerTarget(args, out player, out guid, out name);
}
public bool extractPlayerTarget(StringArguments args, out Player player, out ObjectGuid playerGuid)
public bool ExtractPlayerTarget(StringArguments args, out Player player, out ObjectGuid playerGuid)
{
string name;
return extractPlayerTarget(args, out player, out playerGuid, out name);
return ExtractPlayerTarget(args, out player, out playerGuid, out name);
}
public bool extractPlayerTarget(StringArguments args, out Player player, out ObjectGuid playerGuid, out string playerName)
public bool ExtractPlayerTarget(StringArguments args, out Player player, out ObjectGuid playerGuid, out string playerName)
{
player = null;
playerGuid = ObjectGuid.Empty;
@@ -396,7 +396,7 @@ namespace Game.Chat
if (!args.Empty())
{
string name = extractPlayerNameFromLink(args);
string name = ExtractPlayerNameFromLink(args);
if (string.IsNullOrEmpty(name))
{
SendSysMessage(CypherStrings.PlayerNotFound);
@@ -412,7 +412,7 @@ namespace Game.Chat
}
else
{
player = getSelectedPlayer();
player = GetSelectedPlayer();
playerGuid = player != null ? player.GetGUID() : ObjectGuid.Empty;
playerName = player != null ? player.GetName() : "";
}
@@ -426,7 +426,7 @@ namespace Game.Chat
return true;
}
public ulong extractLowGuidFromLink(StringArguments args, ref HighGuid guidHigh)
public ulong ExtractLowGuidFromLink(StringArguments args, ref HighGuid guidHigh)
{
int type;
@@ -439,7 +439,7 @@ namespace Game.Chat
// |color|Hcreature:creature_guid|h[name]|h|r
// |color|Hgameobject:go_guid|h[name]|h|r
// |color|Hplayer:name|h[name]|h|r
string idS = extractKeyFromLink(args, guidKeys, out type);
string idS = ExtractKeyFromLink(args, guidKeys, out type);
if (string.IsNullOrEmpty(idS))
return 0;
@@ -489,7 +489,7 @@ namespace Game.Chat
"Htrade", // profession/skill spell
"Hglyph", // glyph
};
public uint extractSpellIdFromLink(StringArguments args)
public uint ExtractSpellIdFromLink(StringArguments args)
{
// number or [name] Shift-click form |color|Henchant:recipe_spell_id|h[prof_name: recipe_name]|h|r
// number or [name] Shift-click form |color|Hglyph:glyph_slot_id:glyph_prop_id|h[value]|h|r
@@ -498,7 +498,7 @@ namespace Game.Chat
// number or [name] Shift-click form |color|Htrade:spell_id, skill_id, max_value, cur_value|h[name]|h|r
int type = 0;
string param1Str = null;
string idS = extractKeyFromLink(args, spellKeys, out type, out param1Str);
string idS = ExtractKeyFromLink(args, spellKeys, out type, out param1Str);
if (string.IsNullOrEmpty(idS))
return 0;
@@ -538,7 +538,7 @@ namespace Game.Chat
return 0;
}
public Player getSelectedPlayer()
public Player GetSelectedPlayer()
{
if (_session == null)
return null;
@@ -550,7 +550,7 @@ namespace Game.Chat
return Global.ObjAccessor.FindPlayer(selected);
}
public Unit getSelectedUnit()
public Unit GetSelectedUnit()
{
if (_session == null)
return null;
@@ -573,14 +573,14 @@ namespace Game.Chat
return Global.ObjAccessor.GetUnit(_session.GetPlayer(), selected);
}
public Creature getSelectedCreature()
public Creature GetSelectedCreature()
{
if (_session == null)
return null;
return ObjectAccessor.GetCreatureOrPetOrVehicle(_session.GetPlayer(), _session.GetPlayer().GetTarget());
}
public Player getSelectedPlayerOrSelf()
public Player GetSelectedPlayerOrSelf()
{
if (_session == null)
return null;
@@ -639,7 +639,7 @@ namespace Game.Chat
return searcher.GetTarget();
}
public string playerLink(string name, bool console = false)
public string PlayerLink(string name, bool console = false)
{
return console ? name : "|cffffffff|Hplayer:" + name + "|h[" + name + "]|h|r";
}
@@ -649,9 +649,9 @@ namespace Game.Chat
}
public string GetNameLink(Player obj)
{
return playerLink(obj.GetName());
return PlayerLink(obj.GetName());
}
public virtual bool needReportToTarget(Player chr)
public virtual bool NeedReportToTarget(Player chr)
{
Player pl = _session.GetPlayer();
return pl != chr && pl.IsVisibleGloballyFor(chr);
@@ -703,7 +703,7 @@ namespace Game.Chat
return false;
}
bool hasStringAbbr(string name, string part)
bool HasStringAbbr(string name, string part)
{
// non "" command
if (!name.IsEmpty())
@@ -822,8 +822,8 @@ namespace Game.Chat
}
else
{
if (getSelectedPlayer())
player = getSelectedPlayer();
if (GetSelectedPlayer())
player = GetSelectedPlayer();
else
player = _session.GetPlayer();
@@ -866,7 +866,7 @@ namespace Game.Chat
return GetCypherString(CypherStrings.ConsoleCommand);
}
public override bool needReportToTarget(Player chr)
public override bool NeedReportToTarget(Player chr)
{
return true;
}
Source/Game/Chat/Commands/AccountCommands.cs
+4 -4
View File
@@ -467,7 +467,7 @@ namespace Game.Chat
if (string.IsNullOrEmpty(exp))
{
Player player = handler.getSelectedPlayer();
Player player = handler.GetSelectedPlayer();
if (!player)
return false;
@@ -531,7 +531,7 @@ namespace Game.Chat
if (string.IsNullOrEmpty(arg3))
{
if (!handler.getSelectedPlayer())
if (!handler.GetSelectedPlayer())
return false;
isAccountNameGiven = false;
}
@@ -560,7 +560,7 @@ namespace Game.Chat
}
// command.getSession() == NULL only for console
targetAccountId = (isAccountNameGiven) ? Global.AccountMgr.GetId(targetAccountName) : handler.getSelectedPlayer().GetSession().GetAccountId();
targetAccountId = (isAccountNameGiven) ? Global.AccountMgr.GetId(targetAccountName) : handler.GetSelectedPlayer().GetSession().GetAccountId();
if (!int.TryParse(isAccountNameGiven ? arg3 : arg2, out int gmRealmID))
return false;
@@ -602,7 +602,7 @@ namespace Game.Chat
return false;
}
RBACData rbac = isAccountNameGiven ? null : handler.getSelectedPlayer().GetSession().GetRBACData();
RBACData rbac = isAccountNameGiven ? null : handler.GetSelectedPlayer().GetSession().GetRBACData();
Global.AccountMgr.UpdateAccountAccess(rbac, targetAccountId, (byte)gm, gmRealmID);
handler.SendSysMessage(CypherStrings.YouChangeSecurity, targetAccountName, gm);
return true;
Source/Game/Chat/Commands/ArenaCommands.cs
+6 -6
View File
@@ -32,10 +32,10 @@ namespace Game.Chat
return false;
Player target;
if (!handler.extractPlayerTarget(args[0] != '"' ? args : null, out target))
if (!handler.ExtractPlayerTarget(args[0] != '"' ? args : null, out target))
return false;
string name = handler.extractQuotedArg(args.NextString());
string name = handler.ExtractQuotedArg(args.NextString());
if (string.IsNullOrEmpty(name))
return false;
@@ -119,14 +119,14 @@ namespace Game.Chat
if (args.Empty())
return false;
string oldArenaStr = handler.extractQuotedArg(args.NextString());
string oldArenaStr = handler.ExtractQuotedArg(args.NextString());
if (string.IsNullOrEmpty(oldArenaStr))
{
handler.SendSysMessage(CypherStrings.BadValue);
return false;
}
string newArenaStr = handler.extractQuotedArg(args.NextString());
string newArenaStr = handler.ExtractQuotedArg(args.NextString());
if (string.IsNullOrEmpty(newArenaStr))
{
handler.SendSysMessage(CypherStrings.BadValue);
@@ -176,7 +176,7 @@ namespace Game.Chat
string idStr;
string nameStr;
handler.extractOptFirstArg(args, out idStr, out nameStr);
handler.ExtractOptFirstArg(args, out idStr, out nameStr);
if (string.IsNullOrEmpty(idStr))
return false;
@@ -185,7 +185,7 @@ namespace Game.Chat
Player target;
ObjectGuid targetGuid;
if (!handler.extractPlayerTarget(new StringArguments(nameStr), out target, out targetGuid))
if (!handler.ExtractPlayerTarget(new StringArguments(nameStr), out target, out targetGuid))
return false;
ArenaTeam arena = Global.ArenaTeamMgr.GetArenaTeamById(teamId);
Source/Game/Chat/Commands/CastCommands.cs
+11 -11
View File
@@ -32,7 +32,7 @@ namespace Game.Chat
if (args.Empty())
return false;
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (!target)
{
handler.SendSysMessage(CypherStrings.SelectCharOrCreature);
@@ -40,7 +40,7 @@ namespace Game.Chat
}
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint spellId = handler.extractSpellIdFromLink(args);
uint spellId = handler.ExtractSpellIdFromLink(args);
if (spellId == 0)
return false;
@@ -61,7 +61,7 @@ namespace Game.Chat
[Command("back", RBACPermissions.CommandCastBack)]
static bool HandleCastBackCommand(StringArguments args, CommandHandler handler)
{
Creature caster = handler.getSelectedCreature();
Creature caster = handler.GetSelectedCreature();
if (!caster)
{
handler.SendSysMessage(CypherStrings.SelectCharOrCreature);
@@ -69,7 +69,7 @@ namespace Game.Chat
}
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint spellId = handler.extractSpellIdFromLink(args);
uint spellId = handler.ExtractSpellIdFromLink(args);
if (spellId == 0)
return false;
@@ -97,7 +97,7 @@ namespace Game.Chat
return false;
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint spellId = handler.extractSpellIdFromLink(args);
uint spellId = handler.ExtractSpellIdFromLink(args);
if (spellId == 0)
return false;
@@ -129,7 +129,7 @@ namespace Game.Chat
if (args.Empty())
return false;
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (!target)
{
handler.SendSysMessage(CypherStrings.SelectCharOrCreature);
@@ -137,7 +137,7 @@ namespace Game.Chat
}
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint spellId = handler.extractSpellIdFromLink(args);
uint spellId = handler.ExtractSpellIdFromLink(args);
if (spellId == 0)
return false;
@@ -152,7 +152,7 @@ namespace Game.Chat
[Command("target", RBACPermissions.CommandCastTarget)]
static bool HandleCastTargetCommad(StringArguments args, CommandHandler handler)
{
Creature caster = handler.getSelectedCreature();
Creature caster = handler.GetSelectedCreature();
if (!caster)
{
handler.SendSysMessage(CypherStrings.SelectCharOrCreature);
@@ -166,7 +166,7 @@ namespace Game.Chat
}
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint spellId = handler.extractSpellIdFromLink(args);
uint spellId = handler.ExtractSpellIdFromLink(args);
if (spellId == 0)
return false;
@@ -190,7 +190,7 @@ namespace Game.Chat
[Command("dest", RBACPermissions.CommandCastDest)]
static bool HandleCastDestCommand(StringArguments args, CommandHandler handler)
{
Unit caster = handler.getSelectedUnit();
Unit caster = handler.GetSelectedUnit();
if (!caster)
{
handler.SendSysMessage(CypherStrings.SelectCharOrCreature);
@@ -198,7 +198,7 @@ namespace Game.Chat
}
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint spellId = handler.extractSpellIdFromLink(args);
uint spellId = handler.ExtractSpellIdFromLink(args);
if (spellId == 0)
return false;
Source/Game/Chat/Commands/CharacterCommands.cs
+19 -19
View File
@@ -37,7 +37,7 @@ namespace Game.Chat
return false;
Player target;
if (!handler.extractPlayerTarget(args, out target))
if (!handler.ExtractPlayerTarget(args, out target))
return false;
LocaleConstant loc = handler.GetSessionDbcLocale();
@@ -76,7 +76,7 @@ namespace Game.Chat
Player target;
ObjectGuid targetGuid;
string targetName;
if (!handler.extractPlayerTarget(args, out target, out targetGuid, out targetName))
if (!handler.ExtractPlayerTarget(args, out target, out targetGuid, out targetName))
return false;
string newNameStr = args.NextString();
@@ -181,7 +181,7 @@ namespace Game.Chat
if (handler.HasLowerSecurity(null, targetGuid))
return false;
string oldNameLink = handler.playerLink(targetName);
string oldNameLink = handler.PlayerLink(targetName);
handler.SendSysMessage(CypherStrings.RenamePlayerGuid, oldNameLink, targetGuid.ToString());
PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.UPD_ADD_AT_LOGIN_FLAG);
@@ -199,7 +199,7 @@ namespace Game.Chat
{
string nameStr;
string levelStr;
handler.extractOptFirstArg(args, out nameStr, out levelStr);
handler.ExtractOptFirstArg(args, out nameStr, out levelStr);
if (string.IsNullOrEmpty(levelStr))
return false;
@@ -213,7 +213,7 @@ namespace Game.Chat
Player target;
ObjectGuid targetGuid;
string targetName;
if (!handler.extractPlayerTarget(new StringArguments(nameStr), out target, out targetGuid, out targetName))
if (!handler.ExtractPlayerTarget(new StringArguments(nameStr), out target, out targetGuid, out targetName))
return false;
int oldlevel = (int)(target ? target.GetLevel() : Global.CharacterCacheStorage.GetCharacterLevelByGuid(targetGuid));
@@ -230,7 +230,7 @@ namespace Game.Chat
HandleCharacterLevel(target, targetGuid, oldlevel, newlevel, handler);
if (handler.GetSession() == null || handler.GetSession().GetPlayer() != target) // including player == NULL
{
string nameLink = handler.playerLink(targetName);
string nameLink = handler.PlayerLink(targetName);
handler.SendSysMessage(CypherStrings.YouChangeLvl, nameLink, newlevel);
}
@@ -244,7 +244,7 @@ namespace Game.Chat
Player target;
ObjectGuid targetGuid;
string targetName;
if (!handler.extractPlayerTarget(args, out target, out targetGuid, out targetName))
if (!handler.ExtractPlayerTarget(args, out target, out targetGuid, out targetName))
return false;
PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.UPD_ADD_AT_LOGIN_FLAG);
@@ -257,7 +257,7 @@ namespace Game.Chat
}
else
{
string oldNameLink = handler.playerLink(targetName);
string oldNameLink = handler.PlayerLink(targetName);
stmt.AddValue(1, targetGuid.GetCounter());
handler.SendSysMessage(CypherStrings.CustomizePlayerGuid, oldNameLink, targetGuid.ToString());
}
@@ -271,14 +271,14 @@ namespace Game.Chat
{
string playerNameStr;
string accountName;
handler.extractOptFirstArg(args, out playerNameStr, out accountName);
handler.ExtractOptFirstArg(args, out playerNameStr, out accountName);
if (accountName.IsEmpty())
return false;
ObjectGuid targetGuid;
string targetName;
Player playerNotUsed;
if (!handler.extractPlayerTarget(new StringArguments(playerNameStr), out playerNotUsed, out targetGuid, out targetName))
if (!handler.ExtractPlayerTarget(new StringArguments(playerNameStr), out playerNotUsed, out targetGuid, out targetName))
return false;
CharacterCacheEntry characterInfo = Global.CharacterCacheStorage.GetCharacterCacheByGuid(targetGuid);
@@ -347,7 +347,7 @@ namespace Game.Chat
Player target;
ObjectGuid targetGuid;
string targetName;
if (!handler.extractPlayerTarget(args, out target, out targetGuid, out targetName))
if (!handler.ExtractPlayerTarget(args, out target, out targetGuid, out targetName))
return false;
PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.UPD_ADD_AT_LOGIN_FLAG);
@@ -360,7 +360,7 @@ namespace Game.Chat
}
else
{
string oldNameLink = handler.playerLink(targetName);
string oldNameLink = handler.PlayerLink(targetName);
handler.SendSysMessage(CypherStrings.CustomizePlayerGuid, oldNameLink, targetGuid.ToString());
stmt.AddValue(1, targetGuid.GetCounter());
}
@@ -375,7 +375,7 @@ namespace Game.Chat
Player target;
ObjectGuid targetGuid;
string targetName;
if (!handler.extractPlayerTarget(args, out target, out targetGuid, out targetName))
if (!handler.ExtractPlayerTarget(args, out target, out targetGuid, out targetName))
return false;
PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.UPD_ADD_AT_LOGIN_FLAG);
@@ -389,7 +389,7 @@ namespace Game.Chat
}
else
{
string oldNameLink = handler.playerLink(targetName);
string oldNameLink = handler.PlayerLink(targetName);
// @todo add text into database
handler.SendSysMessage(CypherStrings.CustomizePlayerGuid, oldNameLink, targetGuid.ToString());
stmt.AddValue(1, targetGuid.GetCounter());
@@ -403,7 +403,7 @@ namespace Game.Chat
static bool HandleCharacterReputationCommand(StringArguments args, CommandHandler handler)
{
Player target;
if (!handler.extractPlayerTarget(args, out target))
if (!handler.ExtractPlayerTarget(args, out target))
return false;
LocaleConstant loc = handler.GetSessionDbcLocale();
@@ -735,7 +735,7 @@ namespace Game.Chat
{
string nameStr;
string levelStr;
handler.extractOptFirstArg(args, out nameStr, out levelStr);
handler.ExtractOptFirstArg(args, out nameStr, out levelStr);
// exception opt second arg: .character level $name
if (!string.IsNullOrEmpty(levelStr) && !levelStr.IsNumber())
@@ -747,7 +747,7 @@ namespace Game.Chat
Player target;
ObjectGuid targetGuid;
string targetName;
if (!handler.extractPlayerTarget(new StringArguments(nameStr), out target, out targetGuid, out targetName))
if (!handler.ExtractPlayerTarget(new StringArguments(nameStr), out target, out targetGuid, out targetName))
return false;
int oldlevel = (int)(target ? target.GetLevel() : Global.CharacterCacheStorage.GetCharacterLevelByGuid(targetGuid));
@@ -765,7 +765,7 @@ namespace Game.Chat
if (handler.GetSession() == null || handler.GetSession().GetPlayer() != target) // including chr == NULL
{
string nameLink = handler.playerLink(targetName);
string nameLink = handler.PlayerLink(targetName);
handler.SendSysMessage(CypherStrings.YouChangeLvl, nameLink, newlevel);
}
@@ -780,7 +780,7 @@ namespace Game.Chat
player.InitTalentForLevel();
player.SetXP(0);
if (handler.needReportToTarget(player))
if (handler.NeedReportToTarget(player))
{
if (oldLevel == newLevel)
player.SendSysMessage(CypherStrings.YoursLevelProgressReset, handler.GetNameLink());
Source/Game/Chat/Commands/CheatCommands.cs
+6 -6
View File
@@ -184,7 +184,7 @@ namespace Game.Chat.Commands
{
string argstr = args.NextString();
Player chr = handler.getSelectedPlayer();
Player chr = handler.GetSelectedPlayer();
if (!chr)
chr = handler.GetSession().GetPlayer();
else if (handler.HasLowerSecurity(chr, ObjectGuid.Empty)) // check online security
@@ -197,7 +197,7 @@ namespace Game.Chat.Commands
{
chr.SetTaxiCheater(false);
handler.SendSysMessage(CypherStrings.YouRemoveTaxis, handler.GetNameLink(chr));
if (handler.needReportToTarget(chr))
if (handler.NeedReportToTarget(chr))
chr.SendSysMessage(CypherStrings.YoursTaxisRemoved, handler.GetNameLink());
return true;
@@ -206,7 +206,7 @@ namespace Game.Chat.Commands
{
chr.SetTaxiCheater(true);
handler.SendSysMessage(CypherStrings.YouGiveTaxis, handler.GetNameLink(chr));
if (handler.needReportToTarget(chr))
if (handler.NeedReportToTarget(chr))
chr.SendSysMessage(CypherStrings.YoursTaxisAdded, handler.GetNameLink());
return true;
}
@@ -222,7 +222,7 @@ namespace Game.Chat.Commands
return false;
int flag = args.NextInt32();
Player chr = handler.getSelectedPlayer();
Player chr = handler.GetSelectedPlayer();
if (!chr)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -232,13 +232,13 @@ namespace Game.Chat.Commands
if (flag != 0)
{
handler.SendSysMessage(CypherStrings.YouSetExploreAll, handler.GetNameLink(chr));
if (handler.needReportToTarget(chr))
if (handler.NeedReportToTarget(chr))
chr.SendSysMessage(CypherStrings.YoursExploreSetAll, handler.GetNameLink());
}
else
{
handler.SendSysMessage(CypherStrings.YouSetExploreNothing, handler.GetNameLink(chr));
if (handler.needReportToTarget(chr))
if (handler.NeedReportToTarget(chr))
chr.SendSysMessage(CypherStrings.YoursExploreSetNothing, handler.GetNameLink());
}
Source/Game/Chat/Commands/DebugCommands.cs
+24 -24
View File
@@ -40,7 +40,7 @@ namespace Game.Chat
return false;
uint animId = args.NextUInt32();
Unit unit = handler.getSelectedUnit();
Unit unit = handler.GetSelectedUnit();
if (unit)
unit.HandleEmoteCommand((Emote)animId);
return true;
@@ -84,7 +84,7 @@ namespace Game.Chat
if (!player)
return false;
Creature target = handler.getSelectedCreature();
Creature target = handler.GetSelectedCreature();
if (!target || !target.IsAIEnabled || target.GetAI() == null)
return false;
@@ -115,7 +115,7 @@ namespace Game.Chat
if (conversationEntry == 0)
return false;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (!target)
{
handler.SendSysMessage(CypherStrings.PlayerNotFound);
@@ -128,7 +128,7 @@ namespace Game.Chat
[Command("entervehicle", RBACPermissions.CommandDebugEntervehicle)]
static bool HandleDebugEnterVehicleCommand(StringArguments args, CommandHandler handler)
{
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (!target || !target.IsVehicle())
return false;
@@ -183,7 +183,7 @@ namespace Game.Chat
else
return false;
Player player = handler.getSelectedPlayer();
Player player = handler.GetSelectedPlayer();
if (!player)
player = handler.GetSession().GetPlayer();
@@ -438,10 +438,10 @@ namespace Game.Chat
[Command("hostil", RBACPermissions.CommandDebugHostil)]
static bool HandleDebugHostileRefListCommand(StringArguments args, CommandHandler handler)
{
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (!target)
target = handler.GetSession().GetPlayer();
HostileReference refe = target.GetHostileRefManager().getFirst();
HostileReference refe = target.GetHostileRefManager().GetFirst();
uint count = 0;
handler.SendSysMessage("Hostil reference list of {0} (guid {1})", target.GetName(), target.GetGUID().ToString());
while (refe != null)
@@ -450,9 +450,9 @@ namespace Game.Chat
if (unit)
{
++count;
handler.SendSysMessage(" {0}. {1} ({2}, SpawnId: {3}) - threat {4}", count, unit.GetName(), unit.GetGUID().ToString(), unit.IsTypeId(TypeId.Unit) ? unit.ToCreature().GetSpawnId() : 0, refe.getThreat());
handler.SendSysMessage(" {0}. {1} ({2}, SpawnId: {3}) - threat {4}", count, unit.GetName(), unit.GetGUID().ToString(), unit.IsTypeId(TypeId.Unit) ? unit.ToCreature().GetSpawnId() : 0, refe.GetThreat());
}
refe = refe.next();
refe = refe.Next();
}
handler.SendSysMessage("End of hostil reference list.");
return true;
@@ -480,7 +480,7 @@ namespace Game.Chat
[Command("lootrecipient", RBACPermissions.CommandDebugLootrecipient)]
static bool HandleDebugGetLootRecipientCommand(StringArguments args, CommandHandler handler)
{
Creature target = handler.getSelectedCreature();
Creature target = handler.GetSelectedCreature();
if (!target)
return false;
@@ -492,7 +492,7 @@ namespace Game.Chat
[Command("los", RBACPermissions.CommandDebugLos)]
static bool HandleDebugLoSCommand(StringArguments args, CommandHandler handler)
{
Unit unit = handler.getSelectedUnit();
Unit unit = handler.GetSelectedUnit();
if (unit)
handler.SendSysMessage("Unit {0} (GuidLow: {1}) is {2}in LoS", unit.GetName(), unit.GetGUID().ToString(), handler.GetSession().GetPlayer().IsWithinLOSInMap(unit) ? "" : "not ");
return true;
@@ -501,7 +501,7 @@ namespace Game.Chat
[Command("moveflags", RBACPermissions.CommandDebugMoveflags)]
static bool HandleDebugMoveflagsCommand(StringArguments args, CommandHandler handler)
{
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (!target)
target = handler.GetSession().GetPlayer();
@@ -621,7 +621,7 @@ namespace Game.Chat
[Command("phase", RBACPermissions.CommandDebugPhase)]
static bool HandleDebugPhaseCommand(StringArguments args, CommandHandler handler)
{
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (!target)
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -677,7 +677,7 @@ namespace Game.Chat
return false;
}
Unit unit = handler.getSelectedUnit();
Unit unit = handler.GetSelectedUnit();
if (!unit)
{
handler.SendSysMessage(CypherStrings.SelectCharOrCreature);
@@ -700,7 +700,7 @@ namespace Game.Chat
[Command("setvid", RBACPermissions.CommandDebugSetvid)]
static bool HandleDebugSetVehicleIdCommand(StringArguments args, CommandHandler handler)
{
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (!target || target.IsVehicle())
return false;
@@ -751,20 +751,20 @@ namespace Game.Chat
[Command("threat", RBACPermissions.CommandDebugThreat)]
static bool HandleDebugThreatListCommand(StringArguments args, CommandHandler handler)
{
Creature target = handler.getSelectedCreature();
Creature target = handler.GetSelectedCreature();
if (!target || target.IsTotem() || target.IsPet())
return false;
var threatList = target.GetThreatManager().getThreatList();
var threatList = target.GetThreatManager().GetThreatList();
uint count = 0;
handler.SendSysMessage("Threat list of {0} (guid {1})", target.GetName(), target.GetGUID().ToString());
foreach (var refe in threatList)
{
Unit unit = refe.getTarget();
Unit unit = refe.GetTarget();
if (!unit)
continue;
++count;
handler.SendSysMessage(" {0}. {1} (guid {2}) - threat {3}", count, unit.GetName(), unit.GetGUID().ToString(), refe.getThreat());
handler.SendSysMessage(" {0}. {1} (guid {2}) - threat {3}", count, unit.GetName(), unit.GetGUID().ToString(), refe.GetThreat());
}
handler.SendSysMessage("End of threat list.");
return true;
@@ -832,7 +832,7 @@ namespace Game.Chat
if (worldStateIdStr.IsEmpty())
return false;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (target == null)
{
handler.SendSysMessage(CypherStrings.PlayerNotFound);
@@ -844,11 +844,11 @@ namespace Game.Chat
if (value != 0)
{
Global.WorldMgr.setWorldState(worldStateId, value);
Global.WorldMgr.SetWorldState(worldStateId, value);
target.SendUpdateWorldState(worldStateId, value);
}
else
handler.SendSysMessage($"Worldstate {worldStateId} actual value : {Global.WorldMgr.getWorldState(worldStateId)}");
handler.SendSysMessage($"Worldstate {worldStateId} actual value : {Global.WorldMgr.GetWorldState(worldStateId)}");
return true;
}
@@ -866,7 +866,7 @@ namespace Game.Chat
uint expressionId = uint.Parse(expressionIdStr);
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (target == null)
{
handler.SendSysMessage(CypherStrings.PlayerNotFound);
@@ -1126,7 +1126,7 @@ namespace Game.Chat
return false;
}
Unit unit = handler.getSelectedUnit();
Unit unit = handler.GetSelectedUnit();
if (!unit)
{
handler.SendSysMessage(CypherStrings.SelectCharOrCreature);
Source/Game/Chat/Commands/DeserterCommands.cs
+2 -2
View File
@@ -68,7 +68,7 @@ namespace Game.Chat.Commands
if (args.Empty())
return false;
Player player = handler.getSelectedPlayer();
Player player = handler.GetSelectedPlayer();
if (!player)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -94,7 +94,7 @@ namespace Game.Chat.Commands
static bool HandleDeserterRemove(StringArguments args, CommandHandler handler, bool isInstance)
{
Player player = handler.getSelectedPlayer();
Player player = handler.GetSelectedPlayer();
if (!player)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
Source/Game/Chat/Commands/EventCommands.cs
+6 -6
View File
@@ -30,7 +30,7 @@ namespace Game.Chat
return false;
// id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r
string id = handler.extractKeyFromLink(args, "Hgameevent");
string id = handler.ExtractKeyFromLink(args, "Hgameevent");
if (string.IsNullOrEmpty(id))
return false;
@@ -45,7 +45,7 @@ namespace Game.Chat
}
GameEventData eventData = events[eventId];
if (!eventData.isValid())
if (!eventData.IsValid())
{
handler.SendSysMessage(CypherStrings.EventNotExist);
return false;
@@ -105,7 +105,7 @@ namespace Game.Chat
return false;
// id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r
string id = handler.extractKeyFromLink(args, "Hgameevent");
string id = handler.ExtractKeyFromLink(args, "Hgameevent");
if (string.IsNullOrEmpty(id))
return false;
@@ -120,7 +120,7 @@ namespace Game.Chat
}
GameEventData eventData = events[eventId];
if (!eventData.isValid())
if (!eventData.IsValid())
{
handler.SendSysMessage(CypherStrings.EventNotExist);
return false;
@@ -144,7 +144,7 @@ namespace Game.Chat
return false;
// id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r
string id = handler.extractKeyFromLink(args, "Hgameevent");
string id = handler.ExtractKeyFromLink(args, "Hgameevent");
if (string.IsNullOrEmpty(id))
return false;
@@ -159,7 +159,7 @@ namespace Game.Chat
}
GameEventData eventData = events[eventId];
if (!eventData.isValid())
if (!eventData.IsValid())
{
handler.SendSysMessage(CypherStrings.EventNotExist);
return false;
Source/Game/Chat/Commands/GMCommands.cs
+1 -1
View File
@@ -98,7 +98,7 @@ namespace Game.Chat
if (args.Empty())
return false;
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
if (target == null)
target = handler.GetPlayer();
Source/Game/Chat/Commands/GameObjectCommands.cs
+9 -9
View File
@@ -37,7 +37,7 @@ namespace Game.Chat
if (args.Empty())
return false;
string id = handler.extractKeyFromLink(args, "Hgameobject");
string id = handler.ExtractKeyFromLink(args, "Hgameobject");
if (string.IsNullOrEmpty(id))
return false;
@@ -63,7 +63,7 @@ namespace Game.Chat
static bool HandleGameObjectDeleteCommand(StringArguments args, CommandHandler handler)
{
// number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r
string id = handler.extractKeyFromLink(args, "Hgameobject");
string id = handler.ExtractKeyFromLink(args, "Hgameobject");
if (string.IsNullOrEmpty(id))
return false;
@@ -103,7 +103,7 @@ namespace Game.Chat
static bool HandleGameObjectMoveCommand(StringArguments args, CommandHandler handler)
{
// number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r
string id = handler.extractKeyFromLink(args, "Hgameobject");
string id = handler.ExtractKeyFromLink(args, "Hgameobject");
if (string.IsNullOrEmpty(id))
return false;
@@ -219,7 +219,7 @@ namespace Game.Chat
if (!args.Empty())
{
// number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r
string idStr = handler.extractKeyFromLink(args, "Hgameobject_entry");
string idStr = handler.ExtractKeyFromLink(args, "Hgameobject_entry");
if (string.IsNullOrEmpty(idStr))
return false;
@@ -328,7 +328,7 @@ namespace Game.Chat
static bool HandleGameObjectTurnCommand(StringArguments args, CommandHandler handler)
{
// number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r
string id = handler.extractKeyFromLink(args, "Hgameobject");
string id = handler.ExtractKeyFromLink(args, "Hgameobject");
if (string.IsNullOrEmpty(id))
return false;
@@ -401,13 +401,13 @@ namespace Game.Chat
if (args.Empty())
return false;
string param1 = handler.extractKeyFromLink(args, "Hgameobject_entry");
string param1 = handler.ExtractKeyFromLink(args, "Hgameobject_entry");
if (param1.IsEmpty())
return false;
if (param1.Equals("guid"))
{
string cValue = handler.extractKeyFromLink(args, "Hgameobject");
string cValue = handler.ExtractKeyFromLink(args, "Hgameobject");
if (cValue.IsEmpty())
return false;
@@ -462,7 +462,7 @@ namespace Game.Chat
return false;
// number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r
string idStr = handler.extractKeyFromLink(args, "Hgameobject_entry");
string idStr = handler.ExtractKeyFromLink(args, "Hgameobject_entry");
if (string.IsNullOrEmpty(idStr))
return false;
@@ -591,7 +591,7 @@ namespace Game.Chat
static bool HandleGameObjectSetStateCommand(StringArguments args, CommandHandler handler)
{
// number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r
string id = handler.extractKeyFromLink(args, "Hgameobject");
string id = handler.ExtractKeyFromLink(args, "Hgameobject");
if (string.IsNullOrEmpty(id))
return false;
Source/Game/Chat/Commands/GoCommands.cs
+5 -5
View File
@@ -39,7 +39,7 @@ namespace Game.Chat.Commands
Player player = handler.GetSession().GetPlayer();
// "id" or number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r
string param1 = handler.extractKeyFromLink(args, "Hcreature", "Hcreature_entry");
string param1 = handler.ExtractKeyFromLink(args, "Hcreature", "Hcreature_entry");
if (string.IsNullOrEmpty(param1))
return false;
@@ -195,7 +195,7 @@ namespace Game.Chat.Commands
Player player = handler.GetSession().GetPlayer();
// number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r
string id = handler.extractKeyFromLink(args, "Hgameobject");
string id = handler.ExtractKeyFromLink(args, "Hgameobject");
if (string.IsNullOrEmpty(id))
return false;
@@ -249,7 +249,7 @@ namespace Game.Chat.Commands
Player player = handler.GetSession().GetPlayer();
string id = handler.extractKeyFromLink(args, "Hquest");
string id = handler.ExtractKeyFromLink(args, "Hquest");
if (string.IsNullOrEmpty(id))
return false;
@@ -312,7 +312,7 @@ namespace Game.Chat.Commands
if (args.Empty())
return false;
string id = handler.extractKeyFromLink(args, "Htaxinode");
string id = handler.ExtractKeyFromLink(args, "Htaxinode");
if (string.IsNullOrEmpty(id))
return false;
@@ -405,7 +405,7 @@ namespace Game.Chat.Commands
if (x == 0.0f || y == 0.0f)
return false;
string idStr = handler.extractKeyFromLink(args, "Harea"); // string or [name] Shift-click form |color|Harea:area_id|h[name]|h|r
string idStr = handler.ExtractKeyFromLink(args, "Harea"); // string or [name] Shift-click form |color|Harea:area_id|h[name]|h|r
if (!uint.TryParse(idStr, out uint areaId))
areaId = player.GetZoneId();
Source/Game/Chat/Commands/GroupCommands.cs
+5 -5
View File
@@ -36,7 +36,7 @@ namespace Game.Chat
static bool HandleGroupSummonCommand(StringArguments args, CommandHandler handler)
{
Player target;
if (!handler.extractPlayerTarget(args, out target))
if (!handler.ExtractPlayerTarget(args, out target))
return false;
// check online security
@@ -68,7 +68,7 @@ namespace Game.Chat
return false;
}
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.next())
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next())
{
Player player = refe.GetSource();
@@ -100,7 +100,7 @@ namespace Game.Chat
}
handler.SendSysMessage(CypherStrings.Summoning, plNameLink, "");
if (handler.needReportToTarget(player))
if (handler.NeedReportToTarget(player))
player.SendSysMessage(CypherStrings.SummonedBy, handler.GetNameLink());
// stop flight if need
@@ -255,7 +255,7 @@ namespace Game.Chat
guidTarget = parseGUID;
}
// If not, we return false and end right away.
else if (!handler.extractPlayerTarget(args, out playerTarget, out guidTarget, out nameTarget))
else if (!handler.ExtractPlayerTarget(args, out playerTarget, out guidTarget, out nameTarget))
return false;
// Next, we need a group. So we define a group variable.
@@ -286,7 +286,7 @@ namespace Game.Chat
var members = groupTarget.GetMemberSlots();
// To avoid a cluster fuck, namely trying multiple queries to simply get a group member count...
handler.SendSysMessage(CypherStrings.GroupType, (groupTarget.isRaidGroup() ? "raid" : "party"), members.Count);
handler.SendSysMessage(CypherStrings.GroupType, (groupTarget.IsRaidGroup() ? "raid" : "party"), members.Count);
// ... we simply move the group type and member count print after retrieving the slots and simply output it's size.
// While rather dirty codestyle-wise, it saves space (if only a little). For each member, we look several informations up.
Source/Game/Chat/Commands/GuildCommands.cs
+11 -11
View File
@@ -32,10 +32,10 @@ namespace Game.Chat
return false;
Player target;
if (!handler.extractPlayerTarget(args[0] != '"' ? args : null, out target))
if (!handler.ExtractPlayerTarget(args[0] != '"' ? args : null, out target))
return false;
string guildname = handler.extractQuotedArg(args.NextString());
string guildname = handler.ExtractQuotedArg(args.NextString());
if (string.IsNullOrEmpty(guildname))
return false;
@@ -60,7 +60,7 @@ namespace Game.Chat
[Command("delete", RBACPermissions.CommandGuildDelete, true)]
static bool HandleGuildDeleteCommand(StringArguments args, CommandHandler handler)
{
string guildName = handler.extractQuotedArg(args.NextString());
string guildName = handler.ExtractQuotedArg(args.NextString());
if (string.IsNullOrEmpty(guildName))
return false;
@@ -79,10 +79,10 @@ namespace Game.Chat
return false;
Player target;
if (!handler.extractPlayerTarget(args[0] != '"' ? args : null, out target))
if (!handler.ExtractPlayerTarget(args[0] != '"' ? args : null, out target))
return false;
string guildName = handler.extractQuotedArg(args.NextString());
string guildName = handler.ExtractQuotedArg(args.NextString());
if (string.IsNullOrEmpty(guildName))
return false;
@@ -100,7 +100,7 @@ namespace Game.Chat
{
Player target;
ObjectGuid targetGuid = ObjectGuid.Empty;
if (!handler.extractPlayerTarget(args, out target, out targetGuid))
if (!handler.ExtractPlayerTarget(args, out target, out targetGuid))
return false;
ulong guildId = target != null ? target.GetGuildId() : Global.CharacterCacheStorage.GetCharacterGuildIdByGuid(targetGuid);
@@ -120,14 +120,14 @@ namespace Game.Chat
{
string nameStr;
string rankStr;
handler.extractOptFirstArg(args, out nameStr, out rankStr);
handler.ExtractOptFirstArg(args, out nameStr, out rankStr);
if (string.IsNullOrEmpty(rankStr))
return false;
Player target;
ObjectGuid targetGuid;
string target_name;
if (!handler.extractPlayerTarget(new StringArguments(nameStr), out target, out targetGuid, out target_name))
if (!handler.ExtractPlayerTarget(new StringArguments(nameStr), out target, out targetGuid, out target_name))
return false;
ulong guildId = target ? target.GetGuildId() : Global.CharacterCacheStorage.GetCharacterGuildIdByGuid(targetGuid);
@@ -150,14 +150,14 @@ namespace Game.Chat
if (args.Empty())
return false;
string oldGuildStr = handler.extractQuotedArg(args.NextString());
string oldGuildStr = handler.ExtractQuotedArg(args.NextString());
if (string.IsNullOrEmpty(oldGuildStr))
{
handler.SendSysMessage(CypherStrings.BadValue);
return false;
}
string newGuildStr = handler.extractQuotedArg(args.NextString());
string newGuildStr = handler.ExtractQuotedArg(args.NextString());
if (string.IsNullOrEmpty(newGuildStr))
{
handler.SendSysMessage(CypherStrings.InsertGuildName);
@@ -191,7 +191,7 @@ namespace Game.Chat
static bool HandleGuildInfoCommand(StringArguments args, CommandHandler handler)
{
Guild guild = null;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (!args.Empty() && args[0] != '\0')
{
Source/Game/Chat/Commands/HonorCommands.cs
+3 -3
View File
@@ -27,7 +27,7 @@ namespace Game.Chat.Commands
[Command("update", RBACPermissions.CommandHonorUpdate)]
static bool HandleHonorUpdateCommand(StringArguments args, CommandHandler handler)
{
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
if (!target)
{
handler.SendSysMessage(CypherStrings.PlayerNotFound);
@@ -51,7 +51,7 @@ namespace Game.Chat.Commands
if (args.Empty())
return false;
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
if (!target)
{
handler.SendSysMessage(CypherStrings.PlayerNotFound);
@@ -70,7 +70,7 @@ namespace Game.Chat.Commands
[Command("kill", RBACPermissions.CommandHonorAddKill)]
static bool HandleHonorAddKillCommand(StringArguments args, CommandHandler handler)
{
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (!target)
{
handler.SendSysMessage(CypherStrings.PlayerNotFound);
Source/Game/Chat/Commands/InstanceCommands.cs
+2 -2
View File
@@ -29,7 +29,7 @@ namespace Game.Chat
[Command("listbinds", RBACPermissions.CommandInstanceListbinds)]
static bool HandleInstanceListBinds(StringArguments args, CommandHandler handler)
{
Player player = handler.getSelectedPlayer();
Player player = handler.GetSelectedPlayer();
if (!player)
player = handler.GetSession().GetPlayer();
@@ -76,7 +76,7 @@ namespace Game.Chat
if (args.Empty())
return false;
Player player = handler.getSelectedPlayer();
Player player = handler.GetSelectedPlayer();
if (!player)
player = handler.GetSession().GetPlayer();
Source/Game/Chat/Commands/LFGCommands.cs
+3 -3
View File
@@ -33,7 +33,7 @@ namespace Game.Chat
Player target = null;
string playerName;
ObjectGuid guid;
if (!handler.extractPlayerTarget(args, out target, out guid, out playerName))
if (!handler.ExtractPlayerTarget(args, out target, out guid, out playerName))
return false;
GetPlayerInfo(handler, target);
@@ -56,7 +56,7 @@ namespace Game.Chat
playerTarget = Global.ObjAccessor.FindPlayer(parseGUID);
guidTarget = parseGUID;
}
else if (!handler.extractPlayerTarget(args, out playerTarget, out guidTarget, out nameTarget))
else if (!handler.ExtractPlayerTarget(args, out playerTarget, out guidTarget, out nameTarget))
return false;
Group groupTarget = null;
@@ -78,7 +78,7 @@ namespace Game.Chat
}
ObjectGuid guid = groupTarget.GetGUID();
handler.SendSysMessage(CypherStrings.LfgGroupInfo, groupTarget.isLFGGroup(), Global.LFGMgr.GetState(guid), Global.LFGMgr.GetDungeon(guid));
handler.SendSysMessage(CypherStrings.LfgGroupInfo, groupTarget.IsLFGGroup(), Global.LFGMgr.GetState(guid), Global.LFGMgr.GetDungeon(guid));
foreach (var slot in groupTarget.GetMemberSlots())
{
Source/Game/Chat/Commands/LearnCommands.cs
+7 -7
View File
@@ -31,7 +31,7 @@ namespace Game.Chat.Commands
[Command("", RBACPermissions.CommandLearn)]
static bool HandleLearnCommand(StringArguments args, CommandHandler handler)
{
Player targetPlayer = handler.getSelectedPlayerOrSelf();
Player targetPlayer = handler.GetSelectedPlayerOrSelf();
if (!targetPlayer)
{
@@ -40,7 +40,7 @@ namespace Game.Chat.Commands
}
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint spell = handler.extractSpellIdFromLink(args);
uint spell = handler.ExtractSpellIdFromLink(args);
if (spell == 0 || !Global.SpellMgr.HasSpellInfo(spell))
return false;
@@ -108,7 +108,7 @@ namespace Game.Chat.Commands
static bool HandleLearnAllDefaultCommand(StringArguments args, CommandHandler handler)
{
Player target;
if (!handler.extractPlayerTarget(args, out target))
if (!handler.ExtractPlayerTarget(args, out target))
return false;
target.LearnDefaultSkills();
@@ -123,7 +123,7 @@ namespace Game.Chat.Commands
static bool HandleLearnAllCraftsCommand(StringArguments args, CommandHandler handler)
{
Player target;
if (!handler.extractPlayerTarget(args, out target))
if (!handler.ExtractPlayerTarget(args, out target))
return false;
foreach (var skillInfo in CliDB.SkillLineStorage.Values)
@@ -144,7 +144,7 @@ namespace Game.Chat.Commands
// Learns all recipes of specified profession and sets skill to max
// Example: .learn all_recipes enchanting
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
if (!target)
{
handler.SendSysMessage(CypherStrings.PlayerNotFound);
@@ -320,14 +320,14 @@ namespace Game.Chat.Commands
return false;
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r
uint spellId = handler.extractSpellIdFromLink(args);
uint spellId = handler.ExtractSpellIdFromLink(args);
if (spellId == 0)
return false;
string allStr = args.NextString();
bool allRanks = !string.IsNullOrEmpty(allStr) && allStr == "all";
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
if (!target)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
Source/Game/Chat/Commands/ListCommands.cs
+9 -9
View File
@@ -30,7 +30,7 @@ namespace Game.Chat.Commands
[Command("auras", RBACPermissions.CommandListAuras)]
static bool HandleListAurasCommand(StringArguments args, CommandHandler handler)
{
Unit unit = handler.getSelectedUnit();
Unit unit = handler.GetSelectedUnit();
if (!unit)
{
handler.SendSysMessage(CypherStrings.SelectCharOrCreature);
@@ -81,7 +81,7 @@ namespace Game.Chat.Commands
return false;
// number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r
string id = handler.extractKeyFromLink(args, "Hcreature_entry");
string id = handler.ExtractKeyFromLink(args, "Hcreature_entry");
if (string.IsNullOrEmpty(id))
return false;
@@ -148,7 +148,7 @@ namespace Game.Chat.Commands
if (args.Empty())
return false;
string id = handler.extractKeyFromLink(args, "Hitem");
string id = handler.ExtractKeyFromLink(args, "Hitem");
if (string.IsNullOrEmpty(id))
return false;
@@ -350,7 +350,7 @@ namespace Game.Chat.Commands
target = Global.ObjAccessor.FindPlayer(parseGUID);
targetGuid = parseGUID;
}
else if (!handler.extractPlayerTarget(args, out target, out targetGuid, out targetName))
else if (!handler.ExtractPlayerTarget(args, out target, out targetGuid, out targetName))
return false;
stmt = DB.Characters.GetPreparedStatement(CharStatements.SEL_MAIL_LIST_COUNT);
@@ -360,7 +360,7 @@ namespace Game.Chat.Commands
{
uint countMail = result.Read<uint>(0);
string nameLink = handler.playerLink(targetName);
string nameLink = handler.PlayerLink(targetName);
handler.SendSysMessage(CypherStrings.ListMailHeader, countMail, nameLink, targetGuid.ToString());
handler.SendSysMessage(CypherStrings.AccountListBar);
@@ -385,8 +385,8 @@ namespace Game.Chat.Commands
uint gold = (uint)(money / MoneyConstants.Gold);
uint silv = (uint)(money % MoneyConstants.Gold) / MoneyConstants.Silver;
uint copp = (uint)(money % MoneyConstants.Gold) % MoneyConstants.Silver;
string receiverStr = handler.playerLink(receiver);
string senderStr = handler.playerLink(sender);
string receiverStr = handler.PlayerLink(receiver);
string senderStr = handler.PlayerLink(sender);
handler.SendSysMessage(CypherStrings.ListMailInfo1, messageId, subject, gold, silv, copp);
handler.SendSysMessage(CypherStrings.ListMailInfo2, senderStr, senderId, receiverStr, receiverId);
handler.SendSysMessage(CypherStrings.ListMailInfo3, Time.UnixTimeToDateTime(deliverTime).ToLongDateString(), Time.UnixTimeToDateTime(expireTime).ToLongDateString());
@@ -447,7 +447,7 @@ namespace Game.Chat.Commands
return false;
// number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r
string id = handler.extractKeyFromLink(args, "Hgameobject_entry");
string id = handler.ExtractKeyFromLink(args, "Hgameobject_entry");
if (string.IsNullOrEmpty(id))
return false;
@@ -512,7 +512,7 @@ namespace Game.Chat.Commands
[Command("scenes", RBACPermissions.CommandListScenes)]
static bool HandleListScenesCommand(StringArguments args, CommandHandler handler)
{
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
if (!target)
target = handler.GetSession().GetPlayer();
Source/Game/Chat/Commands/LookupCommands.cs
+7 -7
View File
@@ -222,7 +222,7 @@ namespace Game.Chat
return false;
// Can be NULL at console call
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
string namePart = args.NextString().ToLower();
@@ -490,7 +490,7 @@ namespace Game.Chat
return false;
// can be NULL at console call
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
string namePart = args.NextString().ToLower();
@@ -620,7 +620,7 @@ namespace Game.Chat
return false;
// can be NULL in console call
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
string namePart = args.NextString();
@@ -786,7 +786,7 @@ namespace Game.Chat
return false;
// can be NULL in console call
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
// title name have single string arg for player name
string targetName = target ? target.GetName() : "NAME";
@@ -943,7 +943,7 @@ namespace Game.Chat
int limit;
string limitStr;
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
if (args.Empty())
{
// NULL only if used from console
@@ -1058,7 +1058,7 @@ namespace Game.Chat
return false;
// can be NULL at console call
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
string namePart = args.NextString();
@@ -1157,7 +1157,7 @@ namespace Game.Chat
return false;
// can be NULL at console call
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
uint id = args.NextUInt32();
Source/Game/Chat/Commands/MMapsCommands.cs
+2 -2
View File
@@ -40,7 +40,7 @@ namespace Game.Chat
// units
Player player = handler.GetPlayer();
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (player == null || target == null)
{
handler.SendSysMessage("Invalid target/source selection.");
@@ -187,7 +187,7 @@ namespace Game.Chat
uint terrainMapId = PhasingHandler.GetTerrainMapId(player.GetPhaseShift(), player.GetMap(), player.GetPositionX(), player.GetPositionY());
handler.SendSysMessage("mmap stats:");
handler.SendSysMessage(" global mmap pathfinding is {0}abled", Global.DisableMgr.IsPathfindingEnabled(player.GetMapId()) ? "En" : "Dis");
handler.SendSysMessage(" {0} maps loaded with {1} tiles overall", Global.MMapMgr.getLoadedMapsCount(), Global.MMapMgr.getLoadedTilesCount());
handler.SendSysMessage(" {0} maps loaded with {1} tiles overall", Global.MMapMgr.GetLoadedMapsCount(), Global.MMapMgr.GetLoadedTilesCount());
Detour.dtNavMesh navmesh = Global.MMapMgr.GetNavMesh(terrainMapId);
if (navmesh == null)
Source/Game/Chat/Commands/MiscCommands.cs
+55 -55
View File
@@ -85,7 +85,7 @@ namespace Game.Chat
{
Player target;
ObjectGuid targetGuid;
if (!handler.extractPlayerTarget(args, out target, out targetGuid))
if (!handler.ExtractPlayerTarget(args, out target, out targetGuid))
return false;
if (target != null)
@@ -103,7 +103,7 @@ namespace Game.Chat
[CommandNonGroup("die", RBACPermissions.CommandDie)]
static bool Die(StringArguments args, CommandHandler handler)
{
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (!target && handler.GetPlayer().GetTarget().IsEmpty())
{
@@ -129,7 +129,7 @@ namespace Game.Chat
if (!args.Empty())
{
HighGuid guidHigh = 0;
ulong guidLow = handler.extractLowGuidFromLink(args, ref guidHigh);
ulong guidLow = handler.ExtractLowGuidFromLink(args, ref guidHigh);
if (guidLow == 0)
return false;
switch (guidHigh)
@@ -169,7 +169,7 @@ namespace Game.Chat
}
else
{
obj = handler.getSelectedUnit();
obj = handler.GetSelectedUnit();
if (!obj)
{
@@ -201,8 +201,8 @@ namespace Game.Chat
GridCoord gridCoord = GridDefines.ComputeGridCoord(obj.GetPositionX(), obj.GetPositionY());
// 63? WHY?
uint gridX = (MapConst.MaxGrids - 1) - gridCoord.x_coord;
uint gridY = (MapConst.MaxGrids - 1) - gridCoord.y_coord;
uint gridX = (MapConst.MaxGrids - 1) - gridCoord.X_coord;
uint gridY = (MapConst.MaxGrids - 1) - gridCoord.Y_coord;
bool haveMap = Map.ExistMap(mapId, gridX, gridY);
bool haveVMap = Map.ExistVMap(mapId, gridX, gridY);
@@ -237,7 +237,7 @@ namespace Game.Chat
zoneX, zoneY, groundZ, floorZ, haveMap, haveVMap, haveMMap);
LiquidData liquidStatus;
ZLiquidStatus status = map.getLiquidStatus(obj.GetPhaseShift(), obj.GetPositionX(), obj.GetPositionY(), obj.GetPositionZ(), MapConst.MapAllLiquidTypes, out liquidStatus);
ZLiquidStatus status = map.GetLiquidStatus(obj.GetPhaseShift(), obj.GetPositionX(), obj.GetPositionY(), obj.GetPositionZ(), MapConst.MapAllLiquidTypes, out liquidStatus);
if (liquidStatus != null)
handler.SendSysMessage(CypherStrings.LiquidStatus, liquidStatus.level, liquidStatus.depth_level, liquidStatus.entry, liquidStatus.type_flags, status);
@@ -281,7 +281,7 @@ namespace Game.Chat
}
else // item_id or [name] Shift-click form |color|Hitem:item_id:0:0:0|h[name]|h|r
{
string idStr = handler.extractKeyFromLink(args, "Hitem");
string idStr = handler.ExtractKeyFromLink(args, "Hitem");
if (string.IsNullOrEmpty(idStr))
return false;
@@ -309,7 +309,7 @@ namespace Game.Chat
}
Player player = handler.GetSession().GetPlayer();
Player playerTarget = handler.getSelectedPlayer();
Player playerTarget = handler.GetSelectedPlayer();
if (!playerTarget)
playerTarget = player;
@@ -377,7 +377,7 @@ namespace Game.Chat
if (args.Empty())
return false;
string idStr = handler.extractKeyFromLink(args, "Hitemset"); // number or [name] Shift-click form |color|Hitemset:itemset_id|h[name]|h|r
string idStr = handler.ExtractKeyFromLink(args, "Hitemset"); // number or [name] Shift-click form |color|Hitemset:itemset_id|h[name]|h|r
if (string.IsNullOrEmpty(idStr))
return false;
@@ -403,7 +403,7 @@ namespace Game.Chat
}
Player player = handler.GetSession().GetPlayer();
Player playerTarget = handler.getSelectedPlayer();
Player playerTarget = handler.GetSelectedPlayer();
if (!playerTarget)
playerTarget = player;
@@ -485,7 +485,7 @@ namespace Game.Chat
Player target;
ObjectGuid targetGuid;
string targetName;
if (!handler.extractPlayerTarget(args, out target, out targetGuid, out targetName))
if (!handler.ExtractPlayerTarget(args, out target, out targetGuid, out targetName))
return false;
Player _player = handler.GetSession().GetPlayer();
@@ -501,7 +501,7 @@ namespace Game.Chat
if (handler.HasLowerSecurity(target, ObjectGuid.Empty))
return false;
string chrNameLink = handler.playerLink(targetName);
string chrNameLink = handler.PlayerLink(targetName);
Map map = target.GetMap();
if (map.IsBattlegroundOrArena())
@@ -598,7 +598,7 @@ namespace Game.Chat
if (handler.HasLowerSecurity(null, targetGuid))
return false;
string nameLink = handler.playerLink(targetName);
string nameLink = handler.PlayerLink(targetName);
handler.SendSysMessage(CypherStrings.AppearingAt, nameLink);
@@ -632,7 +632,7 @@ namespace Game.Chat
Player target;
ObjectGuid targetGuid;
string targetName;
if (!handler.extractPlayerTarget(args, out target, out targetGuid, out targetName))
if (!handler.ExtractPlayerTarget(args, out target, out targetGuid, out targetName))
return false;
Player _player = handler.GetSession().GetPlayer();
@@ -645,7 +645,7 @@ namespace Game.Chat
if (target)
{
string nameLink = handler.playerLink(targetName);
string nameLink = handler.PlayerLink(targetName);
// check online security
if (handler.HasLowerSecurity(target, ObjectGuid.Empty))
return false;
@@ -698,8 +698,8 @@ namespace Game.Chat
}
handler.SendSysMessage(CypherStrings.Summoning, nameLink, "");
if (handler.needReportToTarget(target))
target.SendSysMessage(CypherStrings.SummonedBy, handler.playerLink(_player.GetName()));
if (handler.NeedReportToTarget(target))
target.SendSysMessage(CypherStrings.SummonedBy, handler.PlayerLink(_player.GetName()));
// stop flight if need
if (target.IsInFlight())
@@ -724,7 +724,7 @@ namespace Game.Chat
if (handler.HasLowerSecurity(null, targetGuid))
return false;
string nameLink = handler.playerLink(targetName);
string nameLink = handler.PlayerLink(targetName);
handler.SendSysMessage(CypherStrings.Summoning, nameLink, handler.GetCypherString(CypherStrings.Offline));
@@ -814,7 +814,7 @@ namespace Game.Chat
if (!args.Empty())
{
HighGuid guidHigh = 0;
ulong guidLow = handler.extractLowGuidFromLink(args, ref guidHigh);
ulong guidLow = handler.ExtractLowGuidFromLink(args, ref guidHigh);
if (guidLow == 0)
return false;
switch (guidHigh)
@@ -854,7 +854,7 @@ namespace Game.Chat
}
else
{
obj = handler.getSelectedUnit();
obj = handler.GetSelectedUnit();
if (!obj)
{
@@ -872,7 +872,7 @@ namespace Game.Chat
static bool Recall(StringArguments args, CommandHandler handler)
{
Player target;
if (!handler.extractPlayerTarget(args, out target))
if (!handler.ExtractPlayerTarget(args, out target))
return false;
// check online security
@@ -905,7 +905,7 @@ namespace Game.Chat
// save GM account without delay and output message
if (handler.GetSession().HasPermission(RBACPermissions.CommandsSaveWithoutDelay))
{
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
if (target)
target.SaveToDB();
else
@@ -938,7 +938,7 @@ namespace Game.Chat
Player target = null;
string playerName;
ObjectGuid guid;
if (!handler.extractPlayerTarget(args, out target, out guid, out playerName))
if (!handler.ExtractPlayerTarget(args, out target, out guid, out playerName))
return false;
if (handler.GetSession() != null && target == handler.GetSession().GetPlayer())
@@ -992,7 +992,7 @@ namespace Game.Chat
Player player = null;
ObjectGuid targetGUID;
if (!handler.extractPlayerTarget(args, out player, out targetGUID))
if (!handler.ExtractPlayerTarget(args, out player, out targetGUID))
return false;
if (!player)
@@ -1161,7 +1161,7 @@ namespace Game.Chat
if (args.Empty())
return false;
Player playerTarget = handler.getSelectedPlayer();
Player playerTarget = handler.GetSelectedPlayer();
if (!playerTarget)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -1201,7 +1201,7 @@ namespace Game.Chat
if (args.Empty())
return false;
Player playerTarget = handler.getSelectedPlayer();
Player playerTarget = handler.GetSelectedPlayer();
if (!playerTarget)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -1297,7 +1297,7 @@ namespace Game.Chat
targetGuid = parseGUID;
}
// if not, then return false. Which shouldn't happen, now should it ?
else if (!handler.extractPlayerTarget(args, out target, out targetGuid, out targetName))
else if (!handler.ExtractPlayerTarget(args, out target, out targetGuid, out targetName))
return false;
/* The variables we extract for the command. They are
@@ -1473,7 +1473,7 @@ namespace Game.Chat
}
// Creates a chat link to the character. Returns nameLink
string nameLink = handler.playerLink(targetName);
string nameLink = handler.PlayerLink(targetName);
// Returns banType, banTime, bannedBy, banreason
PreparedStatement stmt2 = DB.Login.GetPreparedStatement(LoginStatements.SEL_PINFO_BANS);
@@ -1632,7 +1632,7 @@ namespace Game.Chat
Player player = handler.GetSession().GetPlayer();
// accept only explicitly selected target (not implicitly self targeting case)
Creature target = !player.GetTarget().IsEmpty() ? handler.getSelectedCreature() : null;
Creature target = !player.GetTarget().IsEmpty() ? handler.GetSelectedCreature() : null;
if (target)
{
if (target.IsPet())
@@ -1658,7 +1658,7 @@ namespace Game.Chat
{
string nameStr;
string delayStr;
handler.extractOptFirstArg(args, out nameStr, out delayStr);
handler.ExtractOptFirstArg(args, out nameStr, out delayStr);
if (string.IsNullOrEmpty(delayStr))
return false;
@@ -1670,7 +1670,7 @@ namespace Game.Chat
Player target;
ObjectGuid targetGuid;
string targetName;
if (!handler.extractPlayerTarget(new StringArguments(nameStr), out target, out targetGuid, out targetName))
if (!handler.ExtractPlayerTarget(new StringArguments(nameStr), out target, out targetGuid, out targetName))
return false;
uint accountId = target ? target.GetSession().GetAccountId() : Global.CharacterCacheStorage.GetCharacterAccountIdByGuid(targetGuid);
@@ -1703,7 +1703,7 @@ namespace Game.Chat
long muteTime = Time.UnixTime + notSpeakTime * Time.Minute;
target.GetSession().m_muteTime = muteTime;
stmt.AddValue(0, muteTime);
string nameLink = handler.playerLink(targetName);
string nameLink = handler.PlayerLink(targetName);
if (WorldConfig.GetBoolValue(WorldCfg.ShowMuteInWorld))
{
@@ -1726,7 +1726,7 @@ namespace Game.Chat
stmt.AddValue(2, muteBy);
stmt.AddValue(3, accountId);
DB.Login.Execute(stmt);
string nameLink_ = handler.playerLink(targetName);
string nameLink_ = handler.PlayerLink(targetName);
if (WorldConfig.GetBoolValue(WorldCfg.ShowMuteInWorld) && !target)
Global.WorldMgr.SendWorldText(CypherStrings.CommandMutemessageWorld, handler.GetSession().GetPlayerName(), nameLink_, notSpeakTime, muteReasonStr);
@@ -1742,7 +1742,7 @@ namespace Game.Chat
Player target;
ObjectGuid targetGuid;
string targetName;
if (!handler.extractPlayerTarget(args, out target, out targetGuid, out targetName))
if (!handler.ExtractPlayerTarget(args, out target, out targetGuid, out targetName))
return false;
uint accountId = target ? target.GetSession().GetAccountId() : Global.CharacterCacheStorage.GetCharacterAccountIdByGuid(targetGuid);
@@ -1780,7 +1780,7 @@ namespace Game.Chat
if (target)
target.SendSysMessage(CypherStrings.YourChatEnabled);
string nameLink = handler.playerLink(targetName);
string nameLink = handler.PlayerLink(targetName);
handler.SendSysMessage(CypherStrings.YouEnableChat, nameLink);
@@ -1833,7 +1833,7 @@ namespace Game.Chat
[CommandNonGroup("movegens", RBACPermissions.CommandMovegens)]
static bool MoveGens(StringArguments args, CommandHandler handler)
{
Unit unit = handler.getSelectedUnit();
Unit unit = handler.GetSelectedUnit();
if (!unit)
{
handler.SendSysMessage(CypherStrings.SelectCharOrCreature);
@@ -1877,9 +1877,9 @@ namespace Game.Chat
{
Unit target = null;
if (unit.IsTypeId(TypeId.Player))
target = ((ChaseMovementGenerator<Player>)movementGenerator).target;
target = ((ChaseMovementGenerator<Player>)movementGenerator).Target;
else
target = ((ChaseMovementGenerator<Creature>)movementGenerator).target;
target = ((ChaseMovementGenerator<Creature>)movementGenerator).Target;
if (!target)
handler.SendSysMessage(CypherStrings.MovegensChaseNull);
@@ -1893,9 +1893,9 @@ namespace Game.Chat
{
Unit target = null;
if (unit.IsTypeId(TypeId.Player))
target = ((FollowMovementGenerator<Player>)movementGenerator).target;
target = ((FollowMovementGenerator<Player>)movementGenerator).Target;
else
target = ((FollowMovementGenerator<Creature>)movementGenerator).target;
target = ((FollowMovementGenerator<Creature>)movementGenerator).Target;
if (!target)
handler.SendSysMessage(CypherStrings.MovegensFollowNull);
@@ -1941,7 +1941,7 @@ namespace Game.Chat
[CommandNonGroup("cometome", RBACPermissions.CommandCometome)]
static bool HandleComeToMeCommand(StringArguments args, CommandHandler handler)
{
Creature caster = handler.getSelectedCreature();
Creature caster = handler.GetSelectedCreature();
if (!caster)
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -2000,7 +2000,7 @@ namespace Game.Chat
return true;
}
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (!target || handler.GetSession().GetPlayer().GetTarget().IsEmpty())
{
handler.SendSysMessage(CypherStrings.SelectCharOrCreature);
@@ -2066,7 +2066,7 @@ namespace Game.Chat
// non-melee damage
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint spellid = handler.extractSpellIdFromLink(args);
uint spellid = handler.ExtractSpellIdFromLink(args);
if (spellid == 0)
return false;
@@ -2099,7 +2099,7 @@ namespace Game.Chat
if (!target)
{
if (!handler.extractPlayerTarget(args, out target))
if (!handler.ExtractPlayerTarget(args, out target))
return false;
}
@@ -2108,7 +2108,7 @@ namespace Game.Chat
return false;
target.CombatStop();
target.GetHostileRefManager().deleteReferences();
target.GetHostileRefManager().DeleteReferences();
return true;
}
@@ -2116,7 +2116,7 @@ namespace Game.Chat
static bool RepairItems(StringArguments args, CommandHandler handler)
{
Player target;
if (!handler.extractPlayerTarget(args, out target))
if (!handler.ExtractPlayerTarget(args, out target))
return false;
// check online security
@@ -2127,7 +2127,7 @@ namespace Game.Chat
target.DurabilityRepairAll(false, 0, false);
handler.SendSysMessage(CypherStrings.YouRepairItems, handler.GetNameLink(target));
if (handler.needReportToTarget(target))
if (handler.NeedReportToTarget(target))
target.SendSysMessage(CypherStrings.YourItemsRepaired, handler.GetNameLink());
return true;
@@ -2136,7 +2136,7 @@ namespace Game.Chat
[CommandNonGroup("freeze", RBACPermissions.CommandFreeze)]
static bool HandleFreezeCommand(StringArguments args, CommandHandler handler)
{
Player player = handler.getSelectedPlayer(); // Selected player, if any. Might be null.
Player player = handler.GetSelectedPlayer(); // Selected player, if any. Might be null.
int freezeDuration = 0; // Freeze Duration (in seconds)
bool canApplyFreeze = false; // Determines if every possible argument is set so Freeze can be applied
bool getDurationFromConfig = false; // If there's no given duration, we'll retrieve the world cfg value later
@@ -2240,7 +2240,7 @@ namespace Game.Chat
}
else // If no name was entered - use target
{
player = handler.getSelectedPlayer();
player = handler.GetSelectedPlayer();
if (player)
name = player.GetName();
}
@@ -2344,7 +2344,7 @@ namespace Game.Chat
[CommandNonGroup("possess", RBACPermissions.CommandPossess)]
static bool Possess(StringArguments args, CommandHandler handler)
{
Unit unit = handler.getSelectedUnit();
Unit unit = handler.GetSelectedUnit();
if (!unit)
return false;
@@ -2355,7 +2355,7 @@ namespace Game.Chat
[CommandNonGroup("unpossess", RBACPermissions.CommandUnpossess)]
static bool UnPossess(StringArguments args, CommandHandler handler)
{
Unit unit = handler.getSelectedUnit();
Unit unit = handler.GetSelectedUnit();
if (!unit)
unit = handler.GetSession().GetPlayer();
@@ -2367,7 +2367,7 @@ namespace Game.Chat
[CommandNonGroup("bindsight", RBACPermissions.CommandBindsight)]
static bool BindSight(StringArguments args, CommandHandler handler)
{
Unit unit = handler.getSelectedUnit();
Unit unit = handler.GetSelectedUnit();
if (!unit)
return false;
@@ -2434,14 +2434,14 @@ namespace Game.Chat
if (args.Empty())
return false;
string idStr = handler.extractKeyFromLink(args, "Hachievement");
string idStr = handler.ExtractKeyFromLink(args, "Hachievement");
if (string.IsNullOrEmpty(idStr))
return false;
if (!uint.TryParse(idStr, out uint achievementId) || achievementId == 0)
return false;
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
if (!target)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
Source/Game/Chat/Commands/ModifyCommands.cs
+33 -33
View File
@@ -32,7 +32,7 @@ namespace Game.Chat
static bool HandleModifyHPCommand(StringArguments args, CommandHandler handler)
{
int hp, hpmax = 0;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (CheckModifyResources(args, handler, target, out hp, out hpmax))
{
NotifyModification(handler, target, CypherStrings.YouChangeHp, CypherStrings.YoursHpChanged, hp, hpmax);
@@ -47,7 +47,7 @@ namespace Game.Chat
static bool HandleModifyManaCommand(StringArguments args, CommandHandler handler)
{
int mana, manamax;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (CheckModifyResources(args, handler, target, out mana, out manamax))
{
@@ -64,7 +64,7 @@ namespace Game.Chat
static bool HandleModifyEnergyCommand(StringArguments args, CommandHandler handler)
{
int energy, energymax;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
byte energyMultiplier = 10;
if (CheckModifyResources(args, handler, target, out energy, out energymax, energyMultiplier))
{
@@ -80,7 +80,7 @@ namespace Game.Chat
static bool HandleModifyRageCommand(StringArguments args, CommandHandler handler)
{
int rage, ragemax;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
byte rageMultiplier = 10;
if (CheckModifyResources(args, handler, target, out rage, out ragemax, rageMultiplier))
{
@@ -96,7 +96,7 @@ namespace Game.Chat
static bool HandleModifyRunicPowerCommand(StringArguments args, CommandHandler handler)
{
int rune, runemax;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
byte runeMultiplier = 10;
if (CheckModifyResources(args, handler, target, out rune, out runemax, runeMultiplier))
{
@@ -111,9 +111,9 @@ namespace Game.Chat
[Command("faction", RBACPermissions.CommandModifyFaction)]
static bool HandleModifyFactionCommand(StringArguments args, CommandHandler handler)
{
string pfactionid = handler.extractKeyFromLink(args, "Hfaction");
string pfactionid = handler.ExtractKeyFromLink(args, "Hfaction");
Creature target = handler.getSelectedCreature();
Creature target = handler.GetSelectedCreature();
if (!target)
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -177,7 +177,7 @@ namespace Game.Chat
if (!ushort.TryParse(args.NextString(), out ushort mark))
mark = 65535;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (!target)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -189,7 +189,7 @@ namespace Game.Chat
return false;
handler.SendSysMessage(CypherStrings.YouChangeSpellflatid, spellflatid, val, mark, handler.GetNameLink(target));
if (handler.needReportToTarget(target))
if (handler.NeedReportToTarget(target))
target.SendSysMessage(CypherStrings.YoursSpellflatidChanged, handler.GetNameLink(), spellflatid, val, mark);
SetSpellModifier packet = new SetSpellModifier(ServerOpcodes.SetFlatSpellModifier);
@@ -212,7 +212,7 @@ namespace Game.Chat
static bool HandleModifyScaleCommand(StringArguments args, CommandHandler handler)
{
float Scale;
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (CheckModifySpeed(args, handler, target, out Scale, 0.1f, 10.0f, false))
{
NotifyModification(handler, target, CypherStrings.YouChangeSize, CypherStrings.YoursSizeChanged, Scale);
@@ -241,7 +241,7 @@ namespace Game.Chat
return false;
}
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (!target)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -266,7 +266,7 @@ namespace Game.Chat
[Command("money", RBACPermissions.CommandModifyMoney)]
static bool HandleModifyMoneyCommand(StringArguments args, CommandHandler handler)
{
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (!target)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -288,7 +288,7 @@ namespace Game.Chat
if (newmoney <= 0)
{
handler.SendSysMessage(CypherStrings.YouTakeAllMoney, handler.GetNameLink(target));
if (handler.needReportToTarget(target))
if (handler.NeedReportToTarget(target))
target.SendSysMessage(CypherStrings.YoursAllMoneyGone, handler.GetNameLink());
target.SetMoney(0);
@@ -300,7 +300,7 @@ namespace Game.Chat
newmoney = (long)PlayerConst.MaxMoneyAmount;
handler.SendSysMessage(CypherStrings.YouTakeMoney, moneyToAddMsg, handler.GetNameLink(target));
if (handler.needReportToTarget(target))
if (handler.NeedReportToTarget(target))
target.SendSysMessage(CypherStrings.YoursMoneyTaken, handler.GetNameLink(), moneyToAddMsg);
target.SetMoney((ulong)newmoney);
}
@@ -308,7 +308,7 @@ namespace Game.Chat
else
{
handler.SendSysMessage(CypherStrings.YouGiveMoney, moneyToAdd, handler.GetNameLink(target));
if (handler.needReportToTarget(target))
if (handler.NeedReportToTarget(target))
target.SendSysMessage(CypherStrings.YoursMoneyGiven, handler.GetNameLink(), moneyToAdd);
if ((ulong)moneyToAdd >= PlayerConst.MaxMoneyAmount)
@@ -329,7 +329,7 @@ namespace Game.Chat
if (args.Empty())
return false;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (!target)
{
handler.SendSysMessage(CypherStrings.PlayerNotFound);
@@ -359,7 +359,7 @@ namespace Game.Chat
if (drunklevel > 100)
drunklevel = 100;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (target)
target.SetDrunkValue(drunklevel);
@@ -372,7 +372,7 @@ namespace Game.Chat
if (args.Empty())
return false;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (!target)
{
handler.SendSysMessage(CypherStrings.PlayerNotFound);
@@ -383,7 +383,7 @@ namespace Game.Chat
if (handler.HasLowerSecurity(target, ObjectGuid.Empty))
return false;
string factionTxt = handler.extractKeyFromLink(args, "Hfaction");
string factionTxt = handler.ExtractKeyFromLink(args, "Hfaction");
if (string.IsNullOrEmpty(factionTxt))
return false;
@@ -465,7 +465,7 @@ namespace Game.Chat
return false;
}
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (visibleMapId != 0)
{
@@ -499,7 +499,7 @@ namespace Game.Chat
if (args.Empty())
return false;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (!target)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -558,7 +558,7 @@ namespace Game.Chat
if (args.Empty())
return false;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (!target)
{
handler.SendSysMessage(CypherStrings.PlayerNotFound);
@@ -601,7 +601,7 @@ namespace Game.Chat
handler.SendSysMessage(CypherStrings.YouChangeGender, handler.GetNameLink(target), gender);
if (handler.needReportToTarget(target))
if (handler.NeedReportToTarget(target))
target.SendSysMessage(CypherStrings.YourGenderChanged, gender, handler.GetNameLink());
return true;
@@ -613,7 +613,7 @@ namespace Game.Chat
if (args.Empty())
return false;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (!target)
{
handler.SendSysMessage(CypherStrings.PlayerNotFound);
@@ -642,7 +642,7 @@ namespace Game.Chat
uint display_id = args.NextUInt32();
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (!target)
target = handler.GetSession().GetPlayer();
@@ -658,7 +658,7 @@ namespace Game.Chat
[CommandNonGroup("demorph", RBACPermissions.CommandDemorph)]
static bool HandleDeMorphCommand(StringArguments args, CommandHandler handler)
{
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (!target)
target = handler.GetSession().GetPlayer();
@@ -685,7 +685,7 @@ namespace Game.Chat
return false;
}
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (!target)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -713,7 +713,7 @@ namespace Game.Chat
static bool HandleModifyASpeedCommand(StringArguments args, CommandHandler handler)
{
float allSpeed;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (CheckModifySpeed(args, handler, target, out allSpeed, 0.1f, 50.0f))
{
NotifyModification(handler, target, CypherStrings.YouChangeAspeed, CypherStrings.YoursAspeedChanged, allSpeed);
@@ -730,7 +730,7 @@ namespace Game.Chat
static bool HandleModifySwimCommand(StringArguments args, CommandHandler handler)
{
float swimSpeed;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (CheckModifySpeed(args, handler, target, out swimSpeed, 0.1f, 50.0f))
{
NotifyModification(handler, target, CypherStrings.YouChangeSwimSpeed, CypherStrings.YoursSwimSpeedChanged, swimSpeed);
@@ -744,7 +744,7 @@ namespace Game.Chat
static bool HandleModifyBWalkCommand(StringArguments args, CommandHandler handler)
{
float backSpeed;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (CheckModifySpeed(args, handler, target, out backSpeed, 0.1f, 50.0f))
{
NotifyModification(handler, target, CypherStrings.YouChangeBackSpeed, CypherStrings.YoursBackSpeedChanged, backSpeed);
@@ -758,7 +758,7 @@ namespace Game.Chat
static bool HandleModifyFlyCommand(StringArguments args, CommandHandler handler)
{
float flySpeed;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (CheckModifySpeed(args, handler, target, out flySpeed, 0.1f, 50.0f, false))
{
NotifyModification(handler, target, CypherStrings.YouChangeFlySpeed, CypherStrings.YoursFlySpeedChanged, flySpeed);
@@ -772,7 +772,7 @@ namespace Game.Chat
static bool HandleModifyWalkSpeedCommand(StringArguments args, CommandHandler handler)
{
float Speed;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (CheckModifySpeed(args, handler, target, out Speed, 0.1f, 50.0f))
{
NotifyModification(handler, target, CypherStrings.YouChangeSpeed, CypherStrings.YoursSpeedChanged, Speed);
@@ -789,7 +789,7 @@ namespace Game.Chat
if (player)
{
handler.SendSysMessage(resourceMessage, new object[] { handler.GetNameLink(player) }.Combine(args));
if (handler.needReportToTarget(player))
if (handler.NeedReportToTarget(player))
player.SendSysMessage(resourceReportMessage, new object[] { handler.GetNameLink() }.Combine(args));
}
}
Source/Game/Chat/Commands/NPCCommands.cs
+35 -35
View File
@@ -35,7 +35,7 @@ namespace Game.Chat
[Command("info", RBACPermissions.CommandNpcInfo)]
static bool Info(StringArguments args, CommandHandler handler)
{
Creature target = handler.getSelectedCreature();
Creature target = handler.GetSelectedCreature();
if (!target)
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -115,11 +115,11 @@ namespace Game.Chat
{
ulong lowguid = 0;
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature)
{
// number or [name] Shift-click form |color|Hcreature:creature_guid|h[name]|h|r
string cId = handler.extractKeyFromLink(args, "Hcreature");
string cId = handler.ExtractKeyFromLink(args, "Hcreature");
if (string.IsNullOrEmpty(cId))
return false;
@@ -236,7 +236,7 @@ namespace Game.Chat
{
uint emote = args.NextUInt32();
Creature target = handler.getSelectedCreature();
Creature target = handler.GetSelectedCreature();
if (!target)
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -254,7 +254,7 @@ namespace Game.Chat
if (args.Empty())
return false;
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature)
{
@@ -273,7 +273,7 @@ namespace Game.Chat
if (args.Empty())
return false;
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature)
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -314,7 +314,7 @@ namespace Game.Chat
return false;
}
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature)
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -341,7 +341,7 @@ namespace Game.Chat
if (args.Empty())
return false;
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature)
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -359,7 +359,7 @@ namespace Game.Chat
[Command("tame", RBACPermissions.CommandNpcTame)]
static bool Tame(StringArguments args, CommandHandler handler)
{
Creature creatureTarget = handler.getSelectedCreature();
Creature creatureTarget = handler.GetSelectedCreature();
if (!creatureTarget || creatureTarget.IsPet())
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -422,7 +422,7 @@ namespace Game.Chat
[Command("evade", RBACPermissions.CommandNpcEvade)]
static bool HandleNpcEvadeCommand(StringArguments args, CommandHandler handler)
{
Creature creatureTarget = handler.getSelectedCreature();
Creature creatureTarget = handler.GetSelectedCreature();
if (!creatureTarget || creatureTarget.IsPet())
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -470,7 +470,7 @@ namespace Game.Chat
static bool HandleNpcFollowCommand(StringArguments args, CommandHandler handler)
{
Player player = handler.GetSession().GetPlayer();
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature)
{
@@ -489,7 +489,7 @@ namespace Game.Chat
static bool HandleNpcUnFollowCommand(StringArguments args, CommandHandler handler)
{
Player player = handler.GetPlayer();
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature)
{
@@ -504,9 +504,9 @@ namespace Game.Chat
return false;
}
FollowMovementGenerator<Creature> mgen = (FollowMovementGenerator<Creature>)creature.GetMotionMaster().top();
FollowMovementGenerator<Creature> mgen = (FollowMovementGenerator<Creature>)creature.GetMotionMaster().Top();
if (mgen.target != player)
if (mgen.Target != player)
{
handler.SendSysMessage(CypherStrings.CreatureNotFollowYou, creature.GetName());
return false;
@@ -531,7 +531,7 @@ namespace Game.Chat
if (!args.Empty())
{
// number or [name] Shift-click form |color|Hcreature:creature_guid|h[name]|h|r
string cId = handler.extractKeyFromLink(args, "Hcreature");
string cId = handler.ExtractKeyFromLink(args, "Hcreature");
if (string.IsNullOrEmpty(cId))
return false;
@@ -541,7 +541,7 @@ namespace Game.Chat
unit = handler.GetCreatureFromPlayerMapByDbGuid(guidLow);
}
else
unit = handler.getSelectedCreature();
unit = handler.GetSelectedCreature();
if (!unit || unit.IsPet() || unit.IsTotem())
{
@@ -565,14 +565,14 @@ namespace Game.Chat
if (args.Empty())
return false;
Creature vendor = handler.getSelectedCreature();
Creature vendor = handler.GetSelectedCreature();
if (!vendor || !vendor.IsVendor())
{
handler.SendSysMessage(CypherStrings.CommandVendorselection);
return false;
}
string pitem = handler.extractKeyFromLink(args, "Hitem");
string pitem = handler.ExtractKeyFromLink(args, "Hitem");
if (string.IsNullOrEmpty(pitem))
{
handler.SendSysMessage(CypherStrings.CommandNeeditemsend);
@@ -627,7 +627,7 @@ namespace Game.Chat
if (newEntryNum == 0)
return false;
Unit unit = handler.getSelectedUnit();
Unit unit = handler.GetSelectedUnit();
if (!unit || !unit.IsTypeId(TypeId.Unit))
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -655,7 +655,7 @@ namespace Game.Chat
return false;
}
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature || creature.IsPet())
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -678,7 +678,7 @@ namespace Game.Chat
ulong npcFlags = args.NextUInt64();
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature)
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -712,7 +712,7 @@ namespace Game.Chat
return false;
}
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature)
{
@@ -753,7 +753,7 @@ namespace Game.Chat
if (data_1 == 0 || data_2 == 0)
return false;
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature)
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -774,7 +774,7 @@ namespace Game.Chat
uint displayId = args.NextUInt32();
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature || creature.IsPet())
{
@@ -843,7 +843,7 @@ namespace Game.Chat
if (string.IsNullOrEmpty(type)) // case .setmovetype $move_type (with selected creature)
{
type = guid_str;
creature = handler.getSelectedCreature();
creature = handler.GetSelectedCreature();
if (!creature || creature.IsPet())
return false;
lowguid = creature.GetSpawnId();
@@ -923,7 +923,7 @@ namespace Game.Chat
return false;
}
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature || creature.IsPet())
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -946,7 +946,7 @@ namespace Game.Chat
int phaseGroupId = args.NextInt32();
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature || creature.IsPet())
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -979,7 +979,7 @@ namespace Game.Chat
if (option > 0.0f)
mtype = MovementGeneratorType.Random;
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
ulong guidLow = 0;
if (creature)
@@ -1015,7 +1015,7 @@ namespace Game.Chat
uint spawnTime = args.NextUInt32();
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature)
return false;
@@ -1040,7 +1040,7 @@ namespace Game.Chat
ulong linkguid = args.NextUInt64();
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature)
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -1073,7 +1073,7 @@ namespace Game.Chat
if (args.Empty())
return false;
string charID = handler.extractKeyFromLink(args, "Hcreature_entry");
string charID = handler.ExtractKeyFromLink(args, "Hcreature_entry");
if (string.IsNullOrEmpty(charID))
return false;
@@ -1130,7 +1130,7 @@ namespace Game.Chat
byte type = 1; // FIXME: make type (1 item, 2 currency) an argument
string pitem = handler.extractKeyFromLink(args, "Hitem");
string pitem = handler.ExtractKeyFromLink(args, "Hitem");
if (string.IsNullOrEmpty(pitem))
{
handler.SendSysMessage(CypherStrings.CommandNeeditemsend);
@@ -1145,7 +1145,7 @@ namespace Game.Chat
uint extendedcost = args.NextUInt32();
string fbonuslist = args.NextString();
Creature vendor = handler.getSelectedCreature();
Creature vendor = handler.GetSelectedCreature();
if (!vendor)
{
handler.SendSysMessage(CypherStrings.SelectCreature);
@@ -1223,7 +1223,7 @@ namespace Game.Chat
return false;
uint leaderGUID = args.NextUInt32();
Creature creature = handler.getSelectedCreature();
Creature creature = handler.GetSelectedCreature();
if (!creature || creature.GetSpawnId() == 0)
{
@@ -1278,7 +1278,7 @@ namespace Game.Chat
else if (spawntype_str.Equals("NOLOOT"))
loot = false;
string charID = handler.extractKeyFromLink(args, "Hcreature_entry");
string charID = handler.ExtractKeyFromLink(args, "Hcreature_entry");
if (string.IsNullOrEmpty(charID))
return false;
Source/Game/Chat/Commands/PetCommands.cs
+4 -4
View File
@@ -29,7 +29,7 @@ namespace Game.Chat
static bool HandlePetCreateCommand(StringArguments args, CommandHandler handler)
{
Player player = handler.GetSession().GetPlayer();
Creature creatureTarget = handler.getSelectedCreature();
Creature creatureTarget = handler.GetSelectedCreature();
if (!creatureTarget || creatureTarget.IsPet() || creatureTarget.IsTypeId(TypeId.Player))
{
@@ -106,7 +106,7 @@ namespace Game.Chat
return false;
}
uint spellId = handler.extractSpellIdFromLink(args);
uint spellId = handler.ExtractSpellIdFromLink(args);
if (spellId == 0 || !Global.SpellMgr.HasSpellInfo(spellId))
return false;
@@ -144,7 +144,7 @@ namespace Game.Chat
return false;
}
uint spellId = handler.extractSpellIdFromLink(args);
uint spellId = handler.ExtractSpellIdFromLink(args);
if (pet.HasSpell(spellId))
pet.RemoveSpell(spellId, false);
@@ -186,7 +186,7 @@ namespace Game.Chat
static Pet GetSelectedPlayerPetOrOwn(CommandHandler handler)
{
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (target)
{
if (target.IsTypeId(TypeId.Player))
Source/Game/Chat/Commands/QuestCommands.cs
+8 -8
View File
@@ -30,7 +30,7 @@ namespace Game.Chat
[Command("add", RBACPermissions.CommandQuestAdd)]
static bool Add(StringArguments args, CommandHandler handler)
{
Player player = handler.getSelectedPlayer();
Player player = handler.GetSelectedPlayer();
if (!player)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -39,7 +39,7 @@ namespace Game.Chat
// .addquest #entry'
// number or [name] Shift-click form |color|Hquest:quest_id:quest_level:min_level:max_level:scaling_faction|h[name]|h|r
string cId = handler.extractKeyFromLink(args, "Hquest");
string cId = handler.ExtractKeyFromLink(args, "Hquest");
if (!uint.TryParse(cId, out uint entry))
return false;
@@ -70,7 +70,7 @@ namespace Game.Chat
[Command("complete", RBACPermissions.CommandQuestComplete)]
static bool Complete(StringArguments args, CommandHandler handler)
{
Player player = handler.getSelectedPlayer();
Player player = handler.GetSelectedPlayer();
if (!player)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -79,7 +79,7 @@ namespace Game.Chat
// .quest complete #entry
// number or [name] Shift-click form |color|Hquest:quest_id:quest_level:min_level:max_level:scaling_faction|h[name]|h|r
string cId = handler.extractKeyFromLink(args, "Hquest");
string cId = handler.ExtractKeyFromLink(args, "Hquest");
if (!uint.TryParse(cId, out uint entry))
return false;
@@ -162,7 +162,7 @@ namespace Game.Chat
[Command("remove", RBACPermissions.CommandQuestRemove)]
static bool Remove(StringArguments args, CommandHandler handler)
{
Player player = handler.getSelectedPlayer();
Player player = handler.GetSelectedPlayer();
if (!player)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -171,7 +171,7 @@ namespace Game.Chat
// .removequest #entry'
// number or [name] Shift-click form |color|Hquest:quest_id:quest_level:min_level:max_level:scaling_faction|h[name]|h|r
string cId = handler.extractKeyFromLink(args, "Hquest");
string cId = handler.ExtractKeyFromLink(args, "Hquest");
if (!uint.TryParse(cId, out uint entry))
return false;
@@ -216,7 +216,7 @@ namespace Game.Chat
[Command("reward", RBACPermissions.CommandQuestReward)]
static bool Reward(StringArguments args, CommandHandler handler)
{
Player player = handler.getSelectedPlayer();
Player player = handler.GetSelectedPlayer();
if (!player)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -225,7 +225,7 @@ namespace Game.Chat
// .quest reward #entry
// number or [name] Shift-click form |color|Hquest:quest_id:quest_level:min_level:max_level:scaling_faction|h[name]|h|r
string cId = handler.extractKeyFromLink(args, "Hquest");
string cId = handler.ExtractKeyFromLink(args, "Hquest");
if (!uint.TryParse(cId, out uint entry))
return false;
Source/Game/Chat/Commands/RbacCommands.cs
+1 -1
View File
@@ -269,7 +269,7 @@ namespace Game.Chat.Commands
if (useSelectedPlayer)
{
Player player = handler.getSelectedPlayer();
Player player = handler.GetSelectedPlayer();
if (!player)
return null;
Source/Game/Chat/Commands/ResetCommands.cs
+7 -7
View File
@@ -33,7 +33,7 @@ namespace Game.Chat
{
Player target;
ObjectGuid targetGuid;
if (!handler.extractPlayerTarget(args, out target, out targetGuid))
if (!handler.ExtractPlayerTarget(args, out target, out targetGuid))
return false;
if (target)
@@ -48,7 +48,7 @@ namespace Game.Chat
static bool HandleResetHonorCommand(StringArguments args, CommandHandler handler)
{
Player target;
if (!handler.extractPlayerTarget(args, out target))
if (!handler.ExtractPlayerTarget(args, out target))
return false;
target.ResetHonorStats();
@@ -92,7 +92,7 @@ namespace Game.Chat
static bool HandleResetLevelCommand(StringArguments args, CommandHandler handler)
{
Player target;
if (!handler.extractPlayerTarget(args, out target))
if (!handler.ExtractPlayerTarget(args, out target))
return false;
if (!HandleResetStatsOrLevelHelper(target))
@@ -129,7 +129,7 @@ namespace Game.Chat
Player target;
ObjectGuid targetGuid;
string targetName;
if (!handler.extractPlayerTarget(args, out target, out targetGuid, out targetName))
if (!handler.ExtractPlayerTarget(args, out target, out targetGuid, out targetName))
return false;
if (target)
@@ -157,7 +157,7 @@ namespace Game.Chat
static bool HandleResetStatsCommand(StringArguments args, CommandHandler handler)
{
Player target;
if (!handler.extractPlayerTarget(args, out target))
if (!handler.ExtractPlayerTarget(args, out target))
return false;
if (!HandleResetStatsOrLevelHelper(target))
@@ -178,7 +178,7 @@ namespace Game.Chat
ObjectGuid targetGuid;
string targetName;
if (!handler.extractPlayerTarget(args, out target, out targetGuid, out targetName))
if (!handler.ExtractPlayerTarget(args, out target, out targetGuid, out targetName))
{
/* TODO: 6.x remove/update pet talents
// Try reset talents as Hunter Pet
@@ -227,7 +227,7 @@ namespace Game.Chat
stmt.AddValue(1, targetGuid.GetCounter());
DB.Characters.Execute(stmt);
string nameLink = handler.playerLink(targetName);
string nameLink = handler.PlayerLink(targetName);
handler.SendSysMessage(CypherStrings.ResetTalentsOffline, nameLink);
return true;
}
Source/Game/Chat/Commands/SceneCommands.cs
+3 -3
View File
@@ -31,7 +31,7 @@ namespace Game.Chat
if (args.Empty())
return false;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (!target)
{
handler.SendSysMessage(CypherStrings.PlayerNotFound);
@@ -67,7 +67,7 @@ namespace Game.Chat
return false;
uint sceneId = args.NextUInt32();
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (!target)
{
handler.SendSysMessage(CypherStrings.PlayerNotFound);
@@ -91,7 +91,7 @@ namespace Game.Chat
if (!uint.TryParse(args.NextString(""), out uint flags))
flags = (uint)SceneFlags.Unk16;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (!target)
{
handler.SendSysMessage(CypherStrings.PlayerNotFound);
Source/Game/Chat/Commands/SendCommands.cs
+14 -14
View File
@@ -34,14 +34,14 @@ namespace Game.Chat.Commands
Player target;
ObjectGuid targetGuid;
string targetName;
if (!handler.extractPlayerTarget(args, out target, out targetGuid, out targetName))
if (!handler.ExtractPlayerTarget(args, out target, out targetGuid, out targetName))
return false;
string tail1 = args.NextString("");
if (string.IsNullOrEmpty(tail1))
return false;
string subject = handler.extractQuotedArg(tail1);
string subject = handler.ExtractQuotedArg(tail1);
if (string.IsNullOrEmpty(subject))
return false;
@@ -49,7 +49,7 @@ namespace Game.Chat.Commands
if (string.IsNullOrEmpty(tail2))
return false;
string text = handler.extractQuotedArg(tail2);
string text = handler.ExtractQuotedArg(tail2);
if (string.IsNullOrEmpty(text))
return false;
@@ -63,7 +63,7 @@ namespace Game.Chat.Commands
DB.Characters.CommitTransaction(trans);
string nameLink = handler.playerLink(targetName);
string nameLink = handler.PlayerLink(targetName);
handler.SendSysMessage(CypherStrings.MailSent, nameLink);
return true;
}
@@ -75,14 +75,14 @@ namespace Game.Chat.Commands
Player receiver;
ObjectGuid receiverGuid;
string receiverName;
if (!handler.extractPlayerTarget(args, out receiver, out receiverGuid, out receiverName))
if (!handler.ExtractPlayerTarget(args, out receiver, out receiverGuid, out receiverName))
return false;
string tail1 = args.NextString("");
if (string.IsNullOrEmpty(tail1))
return false;
string subject = handler.extractQuotedArg(tail1);
string subject = handler.ExtractQuotedArg(tail1);
if (string.IsNullOrEmpty(subject))
return false;
@@ -90,7 +90,7 @@ namespace Game.Chat.Commands
if (string.IsNullOrEmpty(tail2))
return false;
string text = handler.extractQuotedArg(tail2);
string text = handler.ExtractQuotedArg(tail2);
if (string.IsNullOrEmpty(text))
return false;
@@ -164,7 +164,7 @@ namespace Game.Chat.Commands
draft.SendMailTo(trans, new MailReceiver(receiver, receiverGuid.GetCounter()), sender);
DB.Characters.CommitTransaction(trans);
string nameLink = handler.playerLink(receiverName);
string nameLink = handler.PlayerLink(receiverName);
handler.SendSysMessage(CypherStrings.MailSent, nameLink);
return true;
}
@@ -177,14 +177,14 @@ namespace Game.Chat.Commands
Player receiver;
ObjectGuid receiverGuid;
string receiverName;
if (!handler.extractPlayerTarget(args, out receiver, out receiverGuid, out receiverName))
if (!handler.ExtractPlayerTarget(args, out receiver, out receiverGuid, out receiverName))
return false;
string tail1 = args.NextString("");
if (string.IsNullOrEmpty(tail1))
return false;
string subject = handler.extractQuotedArg(tail1);
string subject = handler.ExtractQuotedArg(tail1);
if (string.IsNullOrEmpty(subject))
return false;
@@ -192,7 +192,7 @@ namespace Game.Chat.Commands
if (string.IsNullOrEmpty(tail2))
return false;
string text = handler.extractQuotedArg(tail2);
string text = handler.ExtractQuotedArg(tail2);
if (string.IsNullOrEmpty(text))
return false;
@@ -213,7 +213,7 @@ namespace Game.Chat.Commands
DB.Characters.CommitTransaction(trans);
string nameLink = handler.playerLink(receiverName);
string nameLink = handler.PlayerLink(receiverName);
handler.SendSysMessage(CypherStrings.MailSent, nameLink);
return true;
}
@@ -223,7 +223,7 @@ namespace Game.Chat.Commands
{
// - Find the player
Player player;
if (!handler.extractPlayerTarget(args, out player))
if (!handler.ExtractPlayerTarget(args, out player))
return false;
string msgStr = args.NextString("");
@@ -231,7 +231,7 @@ namespace Game.Chat.Commands
return false;
// Check that he is not logging out.
if (player.GetSession().isLogingOut())
if (player.GetSession().IsLogingOut())
{
handler.SendSysMessage(CypherStrings.PlayerNotFound);
return false;
Source/Game/Chat/Commands/SpellCommands.cs
+9 -9
View File
@@ -29,7 +29,7 @@ namespace Game.Chat
[CommandNonGroup("cooldown", RBACPermissions.CommandCooldown)]
static bool HandleCooldownCommand(StringArguments args, CommandHandler handler)
{
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (!target)
{
handler.SendSysMessage(CypherStrings.PlayerNotFound);
@@ -53,7 +53,7 @@ namespace Game.Chat
else
{
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint spellIid = handler.extractSpellIdFromLink(args);
uint spellIid = handler.ExtractSpellIdFromLink(args);
if (spellIid == 0)
return false;
@@ -74,7 +74,7 @@ namespace Game.Chat
[CommandNonGroup("aura", RBACPermissions.CommandAura)]
static bool Auracommand(StringArguments args, CommandHandler handler)
{
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (!target)
{
handler.SendSysMessage(CypherStrings.SelectCharOrCreature);
@@ -83,7 +83,7 @@ namespace Game.Chat
}
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint spellId = handler.extractSpellIdFromLink(args);
uint spellId = handler.ExtractSpellIdFromLink(args);
SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(spellId);
if (spellInfo != null)
@@ -98,7 +98,7 @@ namespace Game.Chat
[CommandNonGroup("unaura", RBACPermissions.CommandUnaura)]
static bool UnAura(StringArguments args, CommandHandler handler)
{
Unit target = handler.getSelectedUnit();
Unit target = handler.GetSelectedUnit();
if (!target)
{
handler.SendSysMessage(CypherStrings.SelectCharOrCreature);
@@ -114,7 +114,7 @@ namespace Game.Chat
}
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint spellId = handler.extractSpellIdFromLink(args);
uint spellId = handler.ExtractSpellIdFromLink(args);
if (spellId == 0)
return false;
@@ -126,7 +126,7 @@ namespace Game.Chat
[CommandNonGroup("maxskill", RBACPermissions.CommandMaxskill)]
static bool HandleMaxSkillCommand(StringArguments args, CommandHandler handler)
{
Player player = handler.getSelectedPlayerOrSelf();
Player player = handler.GetSelectedPlayerOrSelf();
if (!player)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -142,7 +142,7 @@ namespace Game.Chat
static bool SetSkill(StringArguments args, CommandHandler handler)
{
// number or [name] Shift-click form |color|Hskill:skill_id|h[name]|h|r
string skillStr = handler.extractKeyFromLink(args, "Hskill");
string skillStr = handler.ExtractKeyFromLink(args, "Hskill");
if (string.IsNullOrEmpty(skillStr))
return false;
@@ -156,7 +156,7 @@ namespace Game.Chat
if (level == 0)
return false;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (!target)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
Source/Game/Chat/Commands/TeleCommands.cs
+5 -5
View File
@@ -35,7 +35,7 @@ namespace Game.Chat
Player me = handler.GetPlayer();
GameTele tele = handler.extractGameTeleFromLink(args);
GameTele tele = handler.ExtractGameTeleFromLink(args);
if (tele == null)
{
@@ -88,7 +88,7 @@ namespace Game.Chat
if (args.Empty())
return false;
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
if (!target)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -100,7 +100,7 @@ namespace Game.Chat
return false;
// id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r
GameTele tele = handler.extractGameTeleFromLink(args);
GameTele tele = handler.ExtractGameTeleFromLink(args);
if (tele == null)
{
handler.SendSysMessage(CypherStrings.CommandTeleNotfound);
@@ -123,7 +123,7 @@ namespace Game.Chat
return false;
}
for (GroupReference refe = grp.GetFirstMember(); refe != null; refe = refe.next())
for (GroupReference refe = grp.GetFirstMember(); refe != null; refe = refe.Next())
{
Player player = refe.GetSource();
if (!player || !player.GetSession())
@@ -142,7 +142,7 @@ namespace Game.Chat
}
handler.SendSysMessage(CypherStrings.TeleportingTo, plNameLink, "", tele.name);
if (handler.needReportToTarget(player))
if (handler.NeedReportToTarget(player))
player.SendSysMessage(CypherStrings.TeleportedToBy, nameLink);
// stop flight if need
Source/Game/Chat/Commands/TitleCommands.cs
+7 -7
View File
@@ -31,7 +31,7 @@ namespace Game.Chat.Commands
static bool HandleTitlesCurrentCommand(StringArguments args, CommandHandler handler)
{
// number or [name] Shift-click form |color|Htitle:title_id|h[name]|h|r
string id_p = handler.extractKeyFromLink(args, "Htitle");
string id_p = handler.ExtractKeyFromLink(args, "Htitle");
if (string.IsNullOrEmpty(id_p))
return false;
@@ -41,7 +41,7 @@ namespace Game.Chat.Commands
return false;
}
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
if (!target)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -72,7 +72,7 @@ namespace Game.Chat.Commands
static bool HandleTitlesAddCommand(StringArguments args, CommandHandler handler)
{
// number or [name] Shift-click form |color|Htitle:title_id|h[name]|h|r
string id_p = handler.extractKeyFromLink(args, "Htitle");
string id_p = handler.ExtractKeyFromLink(args, "Htitle");
if (string.IsNullOrEmpty(id_p))
return false;
@@ -82,7 +82,7 @@ namespace Game.Chat.Commands
return false;
}
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
if (!target)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -114,7 +114,7 @@ namespace Game.Chat.Commands
static bool HandleTitlesRemoveCommand(StringArguments args, CommandHandler handler)
{
// number or [name] Shift-click form |color|Htitle:title_id|h[name]|h|r
string id_p = handler.extractKeyFromLink(args, "Htitle");
string id_p = handler.ExtractKeyFromLink(args, "Htitle");
if (string.IsNullOrEmpty(id_p))
return false;
@@ -124,7 +124,7 @@ namespace Game.Chat.Commands
return false;
}
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
if (!target)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
@@ -171,7 +171,7 @@ namespace Game.Chat.Commands
ulong titles = args.NextUInt64();
Player target = handler.getSelectedPlayer();
Player target = handler.GetSelectedPlayer();
if (!target)
{
handler.SendSysMessage(CypherStrings.NoCharSelected);
Source/Game/Chat/Commands/WPCommands.cs
+5 -5
View File
@@ -39,7 +39,7 @@ namespace Game.Chat.Commands
path_number = args.NextString();
uint point = 0;
Creature target = handler.getSelectedCreature();
Creature target = handler.GetSelectedCreature();
PreparedStatement stmt;
@@ -365,7 +365,7 @@ namespace Game.Chat.Commands
string path_number = args.NextString();
uint pathid;
Creature target = handler.getSelectedCreature();
Creature target = handler.GetSelectedCreature();
// Did player provide a path_id?
if (string.IsNullOrEmpty(path_number))
@@ -450,7 +450,7 @@ namespace Game.Chat.Commands
// . variable lowguid is filled with the GUID of the NPC
uint pathid;
uint point;
Creature target = handler.getSelectedCreature();
Creature target = handler.GetSelectedCreature();
// User did select a visual waypoint?
if (!target || target.GetEntry() != 1)
@@ -625,7 +625,7 @@ namespace Game.Chat.Commands
string guid_str = args.NextString();
uint pathid = 0;
Creature target = handler.getSelectedCreature();
Creature target = handler.GetSelectedCreature();
// Did player provide a PathID?
@@ -973,7 +973,7 @@ namespace Game.Chat.Commands
[Command("unload", RBACPermissions.CommandWpUnload)]
static bool HandleWpUnLoadCommand(StringArguments args, CommandHandler handler)
{
Creature target = handler.getSelectedCreature();
Creature target = handler.GetSelectedCreature();
if (!target)
{
handler.SendSysMessage("|cff33ffffYou must select a target.|r");