Core: SOme code cleanup, more to follow.

This commit is contained in:
hondacrx
2021-03-20 22:48:48 -04:00
parent 62f554f2e0
commit 62ec699ec6
318 changed files with 5080 additions and 5125 deletions
+51 -51
View File
@@ -81,7 +81,7 @@ namespace Game.Chat
var tokens = new StringArray(bannedList, ' ');
for (var i = 0; i < tokens.Length; ++i)
{
ObjectGuid bannedGuid = new ObjectGuid();
ObjectGuid bannedGuid = new();
if (ulong.TryParse(tokens[i].Substring(0, 16), out ulong highguid) && ulong.TryParse(tokens[i].Substring(16), out ulong lowguid))
bannedGuid.SetRawValue(highguid, lowguid);
@@ -219,7 +219,7 @@ namespace Game.Chat
bool newChannel = _playersStore.Empty();
PlayerInfo playerInfo = new PlayerInfo();
PlayerInfo playerInfo = new();
playerInfo.SetInvisible(!player.IsGMVisible());
_playersStore[guid] = playerInfo;
@@ -328,7 +328,7 @@ namespace Game.Chat
if (!IsOn(good))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotMemberAppend());
ChannelNameBuilder builder = new(this, new NotMemberAppend());
SendToOne(builder, good);
return;
}
@@ -336,7 +336,7 @@ namespace Game.Chat
PlayerInfo info = _playersStore.LookupByKey(good);
if (!info.IsModerator() && !player.GetSession().HasPermission(RBACPermissions.ChangeChannelNotModerator))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotModeratorAppend());
ChannelNameBuilder builder = new(this, new NotModeratorAppend());
SendToOne(builder, good);
return;
}
@@ -345,7 +345,7 @@ namespace Game.Chat
ObjectGuid victim = bad ? bad.GetGUID() : ObjectGuid.Empty;
if (victim.IsEmpty() || !IsOn(victim))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new PlayerNotFoundAppend(badname));
ChannelNameBuilder builder = new(this, new PlayerNotFoundAppend(badname));
SendToOne(builder, good);
return;
}
@@ -354,7 +354,7 @@ namespace Game.Chat
if (!player.GetSession().HasPermission(RBACPermissions.ChangeChannelNotModerator) && changeowner && good != _ownerGuid)
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotOwnerAppend());
ChannelNameBuilder builder = new(this, new NotOwnerAppend());
SendToOne(builder, good);
return;
}
@@ -366,14 +366,14 @@ namespace Game.Chat
if (!player.GetSession().HasPermission(RBACPermissions.SilentlyJoinChannel))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new PlayerBannedAppend(good, victim));
ChannelNameBuilder builder = new(this, new PlayerBannedAppend(good, victim));
SendToAll(builder);
}
}
else if (!player.GetSession().HasPermission(RBACPermissions.SilentlyJoinChannel))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new PlayerKickedAppend(good, victim));
ChannelNameBuilder builder = new(this, new PlayerKickedAppend(good, victim));
SendToAll(builder);
}
@@ -393,7 +393,7 @@ namespace Game.Chat
if (!IsOn(good))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotMemberAppend());
ChannelNameBuilder builder = new(this, new NotMemberAppend());
SendToOne(builder, good);
return;
}
@@ -401,7 +401,7 @@ namespace Game.Chat
PlayerInfo info = _playersStore.LookupByKey(good);
if (!info.IsModerator() && !player.GetSession().HasPermission(RBACPermissions.ChangeChannelNotModerator))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotModeratorAppend());
ChannelNameBuilder builder = new(this, new NotModeratorAppend());
SendToOne(builder, good);
return;
}
@@ -411,14 +411,14 @@ namespace Game.Chat
if (victim.IsEmpty() || !IsBanned(victim))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new PlayerNotFoundAppend(badname));
ChannelNameBuilder builder = new(this, new PlayerNotFoundAppend(badname));
SendToOne(builder, good);
return;
}
_bannedStore.Remove(victim);
ChannelNameBuilder builder1 = new ChannelNameBuilder(this, new PlayerUnbannedAppend(good, victim));
ChannelNameBuilder builder1 = new(this, new PlayerUnbannedAppend(good, victim));
SendToAll(builder1);
UpdateChannelInDB();
@@ -430,7 +430,7 @@ namespace Game.Chat
if (!IsOn(guid))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotMemberAppend());
ChannelNameBuilder builder = new(this, new NotMemberAppend());
SendToOne(builder, guid);
return;
}
@@ -438,14 +438,14 @@ namespace Game.Chat
PlayerInfo info = _playersStore.LookupByKey(guid);
if (!info.IsModerator() && !player.GetSession().HasPermission(RBACPermissions.ChangeChannelNotModerator))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotModeratorAppend());
ChannelNameBuilder builder = new(this, new NotModeratorAppend());
SendToOne(builder, guid);
return;
}
_channelPassword = pass;
ChannelNameBuilder builder1 = new ChannelNameBuilder(this, new PasswordChangedAppend(guid));
ChannelNameBuilder builder1 = new(this, new PasswordChangedAppend(guid));
SendToAll(builder1);
UpdateChannelInDB();
@@ -457,7 +457,7 @@ namespace Game.Chat
if (!IsOn(guid))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotMemberAppend());
ChannelNameBuilder builder = new(this, new NotMemberAppend());
SendToOne(builder, guid);
return;
}
@@ -465,7 +465,7 @@ namespace Game.Chat
PlayerInfo info = _playersStore.LookupByKey(guid);
if (!info.IsModerator() && !player.GetSession().HasPermission(RBACPermissions.ChangeChannelNotModerator))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotModeratorAppend());
ChannelNameBuilder builder = new(this, new NotModeratorAppend());
SendToOne(builder, guid);
return;
}
@@ -481,14 +481,14 @@ namespace Game.Chat
(!player.GetSession().HasPermission(RBACPermissions.TwoSideInteractionChannel) ||
!newp.GetSession().HasPermission(RBACPermissions.TwoSideInteractionChannel))))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new PlayerNotFoundAppend(p2n));
ChannelNameBuilder builder = new(this, new PlayerNotFoundAppend(p2n));
SendToOne(builder, guid);
return;
}
if (_ownerGuid == victim && _ownerGuid != guid)
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotOwnerAppend());
ChannelNameBuilder builder = new(this, new NotOwnerAppend());
SendToOne(builder, guid);
return;
}
@@ -518,13 +518,13 @@ namespace Game.Chat
if (!IsOn(guid))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotMemberAppend());
ChannelNameBuilder builder = new(this, new NotMemberAppend());
SendToOne(builder, guid);
return;
}
if (!player.GetSession().HasPermission(RBACPermissions.ChangeChannelNotModerator) && guid != _ownerGuid)
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotOwnerAppend());
ChannelNameBuilder builder = new(this, new NotOwnerAppend());
SendToOne(builder, guid);
return;
}
@@ -537,7 +537,7 @@ namespace Game.Chat
(!player.GetSession().HasPermission(RBACPermissions.TwoSideInteractionChannel) ||
!newp.GetSession().HasPermission(RBACPermissions.TwoSideInteractionChannel))))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new PlayerNotFoundAppend(newname));
ChannelNameBuilder builder = new(this, new PlayerNotFoundAppend(newname));
SendToOne(builder, guid);
return;
}
@@ -551,12 +551,12 @@ namespace Game.Chat
ObjectGuid guid = player.GetGUID();
if (IsOn(guid))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new ChannelOwnerAppend(this, _ownerGuid));
ChannelNameBuilder builder = new(this, new ChannelOwnerAppend(this, _ownerGuid));
SendToOne(builder, guid);
}
else
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotMemberAppend());
ChannelNameBuilder builder = new(this, new NotMemberAppend());
SendToOne(builder, guid);
}
}
@@ -567,7 +567,7 @@ namespace Game.Chat
if (!IsOn(guid))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotMemberAppend());
ChannelNameBuilder builder = new(this, new NotMemberAppend());
SendToOne(builder, guid);
return;
}
@@ -575,7 +575,7 @@ namespace Game.Chat
string channelName = GetName(player.GetSession().GetSessionDbcLocale());
Log.outDebug(LogFilter.ChatSystem, "SMSG_CHANNEL_LIST {0} Channel: {1}", player.GetSession().GetPlayerInfo(), channelName);
ChannelListResponse list = new ChannelListResponse();
ChannelListResponse list = new();
list.Display = true; // always true?
list.Channel = channelName;
list.ChannelFlags = GetFlags();
@@ -605,7 +605,7 @@ namespace Game.Chat
if (!IsOn(guid))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotMemberAppend());
ChannelNameBuilder builder = new(this, new NotMemberAppend());
SendToOne(builder, guid);
return;
}
@@ -613,7 +613,7 @@ namespace Game.Chat
PlayerInfo playerInfo = _playersStore.LookupByKey(guid);
if (!playerInfo.IsModerator() && !player.GetSession().HasPermission(RBACPermissions.ChangeChannelNotModerator))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotModeratorAppend());
ChannelNameBuilder builder = new(this, new NotModeratorAppend());
SendToOne(builder, guid);
return;
}
@@ -622,12 +622,12 @@ namespace Game.Chat
if (_announceEnabled)
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new AnnouncementsOnAppend(guid));
ChannelNameBuilder builder = new(this, new AnnouncementsOnAppend(guid));
SendToAll(builder);
}
else
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new AnnouncementsOffAppend(guid));
ChannelNameBuilder builder = new(this, new AnnouncementsOffAppend(guid));
SendToAll(builder);
}
@@ -645,7 +645,7 @@ namespace Game.Chat
if (!IsOn(guid))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotMemberAppend());
ChannelNameBuilder builder = new(this, new NotMemberAppend());
SendToOne(builder, guid);
return;
}
@@ -653,7 +653,7 @@ namespace Game.Chat
PlayerInfo playerInfo = _playersStore.LookupByKey(guid);
if (playerInfo.IsMuted())
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new MutedAppend());
ChannelNameBuilder builder = new(this, new MutedAppend());
SendToOne(builder, guid);
return;
}
@@ -669,7 +669,7 @@ namespace Game.Chat
if (!IsOn(guid))
{
NotMemberAppend appender;
ChannelNameBuilder builder = new ChannelNameBuilder(this, appender);
ChannelNameBuilder builder = new(this, appender);
SendToOne(builder, guid);
return;
}
@@ -678,7 +678,7 @@ namespace Game.Chat
if (playerInfo.IsMuted())
{
MutedAppend appender;
ChannelNameBuilder builder = new ChannelNameBuilder(this, appender);
ChannelNameBuilder builder = new(this, appender);
SendToOne(builder, guid);
return;
}
@@ -692,7 +692,7 @@ namespace Game.Chat
if (!IsOn(guid))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new NotMemberAppend());
ChannelNameBuilder builder = new(this, new NotMemberAppend());
SendToOne(builder, guid);
return;
}
@@ -700,14 +700,14 @@ namespace Game.Chat
Player newp = Global.ObjAccessor.FindPlayerByName(newname);
if (!newp || !newp.IsGMVisible())
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new PlayerNotFoundAppend(newname));
ChannelNameBuilder builder = new(this, new PlayerNotFoundAppend(newname));
SendToOne(builder, guid);
return;
}
if (IsBanned(newp.GetGUID()))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new PlayerInviteBannedAppend(newname));
ChannelNameBuilder builder = new(this, new PlayerInviteBannedAppend(newname));
SendToOne(builder, guid);
return;
}
@@ -716,25 +716,25 @@ namespace Game.Chat
(!player.GetSession().HasPermission(RBACPermissions.TwoSideInteractionChannel) ||
!newp.GetSession().HasPermission(RBACPermissions.TwoSideInteractionChannel)))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new InviteWrongFactionAppend());
ChannelNameBuilder builder = new(this, new InviteWrongFactionAppend());
SendToOne(builder, guid);
return;
}
if (IsOn(newp.GetGUID()))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new PlayerAlreadyMemberAppend(newp.GetGUID()));
ChannelNameBuilder builder = new(this, new PlayerAlreadyMemberAppend(newp.GetGUID()));
SendToOne(builder, guid);
return;
}
if (!newp.GetSocial().HasIgnore(guid))
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new InviteAppend(guid));
ChannelNameBuilder builder = new(this, new InviteAppend(guid));
SendToOne(builder, newp.GetGUID());
}
ChannelNameBuilder builder1 = new ChannelNameBuilder(this, new PlayerInvitedAppend(newp.GetName()));
ChannelNameBuilder builder1 = new(this, new PlayerInvitedAppend(newp.GetName()));
SendToOne(builder1, guid);
}
@@ -759,12 +759,12 @@ namespace Game.Chat
playerInfo.SetModerator(true);
playerInfo.SetOwner(true);
ChannelNameBuilder builder = new ChannelNameBuilder(this, new ModeChangeAppend(_ownerGuid, oldFlag, GetPlayerFlags(_ownerGuid)));
ChannelNameBuilder builder = new(this, new ModeChangeAppend(_ownerGuid, oldFlag, GetPlayerFlags(_ownerGuid)));
SendToAll(builder);
if (exclaim)
{
ChannelNameBuilder ownerChangedBuilder = new ChannelNameBuilder(this, new OwnerChangedAppend(_ownerGuid));
ChannelNameBuilder ownerChangedBuilder = new(this, new OwnerChangedAppend(_ownerGuid));
SendToAll(ownerChangedBuilder);
}
@@ -811,7 +811,7 @@ namespace Game.Chat
ChannelMemberFlags oldFlag = _playersStore[guid].GetFlags();
playerInfo.SetModerator(set);
ChannelNameBuilder builder = new ChannelNameBuilder(this, new ModeChangeAppend(guid, oldFlag, playerInfo.GetFlags()));
ChannelNameBuilder builder = new(this, new ModeChangeAppend(guid, oldFlag, playerInfo.GetFlags()));
SendToAll(builder);
}
}
@@ -827,14 +827,14 @@ namespace Game.Chat
ChannelMemberFlags oldFlag = _playersStore[guid].GetFlags();
playerInfo.SetMuted(set);
ChannelNameBuilder builder = new ChannelNameBuilder(this, new ModeChangeAppend(guid, oldFlag, playerInfo.GetFlags()));
ChannelNameBuilder builder = new(this, new ModeChangeAppend(guid, oldFlag, playerInfo.GetFlags()));
SendToAll(builder);
}
}
void SendToAll(MessageBuilder builder, ObjectGuid guid = default)
{
LocalizedPacketDo localizer = new LocalizedPacketDo(builder);
LocalizedPacketDo localizer = new(builder);
foreach (var pair in _playersStore)
{
@@ -847,7 +847,7 @@ namespace Game.Chat
void SendToAllButOne(MessageBuilder builder, ObjectGuid who)
{
LocalizedPacketDo localizer = new LocalizedPacketDo(builder);
LocalizedPacketDo localizer = new(builder);
foreach (var pair in _playersStore)
{
@@ -862,7 +862,7 @@ namespace Game.Chat
void SendToOne(MessageBuilder builder, ObjectGuid who)
{
LocalizedPacketDo localizer = new LocalizedPacketDo(builder);
LocalizedPacketDo localizer = new(builder);
Player player = Global.ObjAccessor.FindConnectedPlayer(who);
if (player)
@@ -871,7 +871,7 @@ namespace Game.Chat
void SendToAllWithAddon(MessageBuilder builder, string addonPrefix, ObjectGuid guid = default)
{
LocalizedPacketDo localizer = new LocalizedPacketDo(builder);
LocalizedPacketDo localizer = new(builder);
foreach (var pair in _playersStore)
{
@@ -931,8 +931,8 @@ namespace Game.Chat
ObjectGuid _ownerGuid;
string _channelName;
string _channelPassword;
Dictionary<ObjectGuid, PlayerInfo> _playersStore = new Dictionary<ObjectGuid, PlayerInfo>();
List<ObjectGuid> _bannedStore = new List<ObjectGuid>();
Dictionary<ObjectGuid, PlayerInfo> _playersStore = new();
List<ObjectGuid> _bannedStore = new();
AreaTableRecord _zoneEntry;
@@ -43,7 +43,7 @@ namespace Game.Chat
// LocalizedPacketDo sends client DBC locale, we need to get available to server locale
Locale localeIdx = Global.WorldMgr.GetAvailableDbcLocale(locale);
ChannelNotify data = new ChannelNotify();
ChannelNotify data = new();
data.Type = _modifier.GetNotificationType();
data.Channel = _source.GetName(localeIdx);
_modifier.Append(data);
@@ -65,7 +65,7 @@ namespace Game.Chat
{
Locale localeIdx = Global.WorldMgr.GetAvailableDbcLocale(locale);
ChannelNotifyJoined notify = new ChannelNotifyJoined();
ChannelNotifyJoined notify = new();
//notify.ChannelWelcomeMsg = "";
notify.ChatChannelID = (int)_source.GetChannelId();
//notify.InstanceID = 0;
@@ -90,7 +90,7 @@ namespace Game.Chat
{
Locale localeIdx = Global.WorldMgr.GetAvailableDbcLocale(locale);
ChannelNotifyLeft notify = new ChannelNotifyLeft();
ChannelNotifyLeft notify = new();
notify.Channel = _source.GetName(localeIdx);
notify.ChatChannelID = _source.GetChannelId();
notify.Suspended = _suspended;
@@ -115,7 +115,7 @@ namespace Game.Chat
{
Locale localeIdx = Global.WorldMgr.GetAvailableDbcLocale(locale);
ChatPkt packet = new ChatPkt();
ChatPkt packet = new();
Player player = Global.ObjAccessor.FindConnectedPlayer(_guid);
if (player)
packet.Initialize(ChatMsg.Channel, _lang, player, player, _what, 0, _source.GetName(localeIdx));
@@ -150,7 +150,7 @@ namespace Game.Chat
{
Locale localeIdx = Global.WorldMgr.GetAvailableDbcLocale(locale);
ChatPkt packet = new ChatPkt();
ChatPkt packet = new();
Player player = Global.ObjAccessor.FindConnectedPlayer(_guid);
if (player)
packet.Initialize(ChatMsg.Channel, _lang, player, player, _what, 0, _source.GetName(localeIdx), Locale.enUS, _prefix);
@@ -183,7 +183,7 @@ namespace Game.Chat
{
Locale localeIdx = Global.WorldMgr.GetAvailableDbcLocale(locale);
UserlistAdd userlistAdd = new UserlistAdd();
UserlistAdd userlistAdd = new();
userlistAdd.AddedUserGUID = _guid;
userlistAdd.ChannelFlags = _source.GetFlags();
userlistAdd.UserFlags = _source.GetPlayerFlags(_guid);
@@ -208,7 +208,7 @@ namespace Game.Chat
{
Locale localeIdx = Global.WorldMgr.GetAvailableDbcLocale(locale);
UserlistUpdate userlistUpdate = new UserlistUpdate();
UserlistUpdate userlistUpdate = new();
userlistUpdate.UpdatedUserGUID = _guid;
userlistUpdate.ChannelFlags = _source.GetFlags();
userlistUpdate.UserFlags = _source.GetPlayerFlags(_guid);
@@ -233,7 +233,7 @@ namespace Game.Chat
{
Locale localeIdx = Global.WorldMgr.GetAvailableDbcLocale(locale);
UserlistRemove userlistRemove = new UserlistRemove();
UserlistRemove userlistRemove = new();
userlistRemove.RemovedUserGUID = _guid;
userlistRemove.ChannelFlags = _source.GetFlags();
userlistRemove.ChannelID = _source.GetChannelId();
+9 -9
View File
@@ -67,7 +67,7 @@ namespace Game.Chat
if (channel != null)
return channel;
Channel newChannel = new Channel(channelGuid, channelId, _team, zoneEntry);
Channel newChannel = new(channelGuid, channelId, _team, zoneEntry);
_channels[channelGuid] = newChannel;
return newChannel;
}
@@ -77,7 +77,7 @@ namespace Game.Chat
if (channel != null)
return channel;
Channel newChannel = new Channel(CreateCustomChannelGuid(), name, _team);
Channel newChannel = new(CreateCustomChannelGuid(), name, _team);
_customChannels[name.ToLower()] = newChannel;
return newChannel;
}
@@ -135,7 +135,7 @@ namespace Game.Chat
public static void SendNotOnChannelNotify(Player player, string name)
{
ChannelNotify notify = new ChannelNotify();
ChannelNotify notify = new();
notify.Type = ChatNotify.NotMemberNotice;
notify.Channel = name;
player.SendPacket(notify);
@@ -148,7 +148,7 @@ namespace Game.Chat
high |= (ulong)Global.WorldMgr.GetRealmId().Index << 42;
high |= (ulong)(_team == Team.Alliance ? 3 : 5) << 4;
ObjectGuid channelGuid = new ObjectGuid();
ObjectGuid channelGuid = new();
channelGuid.SetRawValue(high, _guidGenerator.Generate());
return channelGuid;
}
@@ -171,17 +171,17 @@ namespace Game.Chat
high |= (ulong)(zoneId) << 10;
high |= (ulong)(_team == Team.Alliance ? 3 : 5) << 4;
ObjectGuid channelGuid = new ObjectGuid();
ObjectGuid channelGuid = new();
channelGuid.SetRawValue(high, channelId);
return channelGuid;
}
Dictionary<string, Channel> _customChannels = new Dictionary<string, Channel>();
Dictionary<ObjectGuid, Channel> _channels = new Dictionary<ObjectGuid, Channel>();
Dictionary<string, Channel> _customChannels = new();
Dictionary<ObjectGuid, Channel> _channels = new();
Team _team;
ObjectGuidGenerator _guidGenerator;
static ChannelManager allianceChannelMgr = new ChannelManager(Team.Alliance);
static ChannelManager hordeChannelMgr = new ChannelManager(Team.Horde);
static ChannelManager allianceChannelMgr = new(Team.Alliance);
static ChannelManager hordeChannelMgr = new(Team.Horde);
}
}
+9 -9
View File
@@ -73,7 +73,7 @@ namespace Game.Chat
public bool ExecuteCommandInTable(ICollection<ChatCommand> table, string text, string fullcmd)
{
StringArguments args = new StringArguments(text);
StringArguments args = new(text);
string cmd = args.NextString();
foreach (var command in table)
@@ -170,7 +170,7 @@ namespace Game.Chat
public bool ShowHelpForCommand(ICollection<ChatCommand> table, string text)
{
StringArguments args = new StringArguments(text);
StringArguments args = new(text);
if (!args.Empty())
{
string cmd = args.NextString();
@@ -626,8 +626,8 @@ namespace Game.Chat
return null;
Player pl = _session.GetPlayer();
NearestGameObjectCheck check = new NearestGameObjectCheck(pl);
GameObjectLastSearcher searcher = new GameObjectLastSearcher(pl, check);
NearestGameObjectCheck check = new(pl);
GameObjectLastSearcher searcher = new(pl, check);
Cell.VisitGridObjects(pl, searcher, MapConst.SizeofGrids);
return searcher.GetTarget();
}
@@ -764,7 +764,7 @@ namespace Game.Chat
if (escapeCharacters)
str.Replace("|", "||");
ChatPkt messageChat = new ChatPkt();
ChatPkt messageChat = new();
var lines = new StringArray(str, "\n", "\r");
for (var i = 0; i < lines.Length; ++i)
@@ -782,7 +782,7 @@ namespace Game.Chat
public void SendGlobalSysMessage(string str)
{
// Chat output
ChatPkt data = new ChatPkt();
ChatPkt data = new();
data.Initialize(ChatMsg.System, Language.Universal, null, null, str);
Global.WorldMgr.SendGlobalMessage(data);
}
@@ -790,7 +790,7 @@ namespace Game.Chat
public void SendGlobalGMSysMessage(string str)
{
// Chat output
ChatPkt data = new ChatPkt();
ChatPkt data = new();
data.Initialize(ChatMsg.System, Language.Universal, null, null, str);
Global.WorldMgr.SendGlobalGMMessage(data);
}
@@ -893,7 +893,7 @@ namespace Game.Chat
void Send(string msg)
{
ChatPkt chat = new ChatPkt();
ChatPkt chat = new();
chat.Initialize(ChatMsg.Whisper, Language.Addon, GetSession().GetPlayer(), GetSession().GetPlayer(), msg, 0, "", Locale.enUS, PREFIX);
GetSession().SendPacket(chat);
}
@@ -919,7 +919,7 @@ namespace Game.Chat
if (!hadAck)
SendAck();
StringBuilder msg = new StringBuilder("m");
StringBuilder msg = new("m");
msg.Append(echo, 0, 4);
string body = str;
if (escapeCharacters)
+3 -3
View File
@@ -71,7 +71,7 @@ namespace Game.Chat
static bool SetDataForCommandInTable(ICollection<ChatCommand> table, string text, uint permission, string help, string fullcommand)
{
StringArguments args = new StringArguments(text);
StringArguments args = new(text);
string cmd = args.NextString().ToLower();
foreach (var command in table)
@@ -140,7 +140,7 @@ namespace Game.Chat
return _commands.Values;
}
static SortedDictionary<string, ChatCommand> _commands = new SortedDictionary<string, ChatCommand>();
static SortedDictionary<string, ChatCommand> _commands = new();
}
public delegate bool HandleCommandDelegate(StringArguments args, CommandHandler handler);
@@ -192,6 +192,6 @@ namespace Game.Chat
public bool AllowConsole;
public HandleCommandDelegate Handler;
public string Help;
public List<ChatCommand> ChildCommands = new List<ChatCommand>();
public List<ChatCommand> ChildCommands = new();
}
}
+1 -1
View File
@@ -57,7 +57,7 @@ namespace Game.Chat
return false;
}
ArenaTeam arena = new ArenaTeam();
ArenaTeam arena = new();
if (!arena.Create(target.GetGUID(), type, name, 4293102085, 101, 4293253939, 4, 4284049911))
{
@@ -415,7 +415,7 @@ namespace Game.Chat
string factionName = factionEntry != null ? factionEntry.Name[loc] : "#Not found#";
ReputationRank rank = target.GetReputationMgr().GetRank(factionEntry);
string rankName = handler.GetCypherString(ReputationMgr.ReputationRankStrIndex[(int)rank]);
StringBuilder ss = new StringBuilder();
StringBuilder ss = new();
if (handler.GetSession() != null)
ss.AppendFormat("{0} - |cffffffff|Hfaction:{0}|h[{1} {2}]|h|r", faction.Id, factionName, loc);
else
@@ -495,7 +495,7 @@ namespace Game.Chat
if (args.Empty())
return false;
List<DeletedInfo> foundList = new List<DeletedInfo>();
List<DeletedInfo> foundList = new();
if (!GetDeletedCharacterInfoList(foundList, args.NextString()))
return false;
@@ -518,7 +518,7 @@ namespace Game.Chat
[Command("list", RBACPermissions.CommandCharacterDeletedList, true)]
static bool HandleCharacterDeletedListCommand(StringArguments args, CommandHandler handler)
{
List<DeletedInfo> foundList = new List<DeletedInfo>();
List<DeletedInfo> foundList = new();
if (!GetDeletedCharacterInfoList(foundList, args.NextString()))
return false;
@@ -545,7 +545,7 @@ namespace Game.Chat
string newCharName = args.NextString();
uint newAccount = args.NextUInt32();
List<DeletedInfo> foundList = new List<DeletedInfo>();
List<DeletedInfo> foundList = new();
if (!GetDeletedCharacterInfoList(foundList, searchString))
return false;
+7 -7
View File
@@ -542,7 +542,7 @@ namespace Game.Chat
target.DestroyForNearbyPlayers(); // Force new SMSG_UPDATE_OBJECT:CreateObject
else
{
MoveUpdate moveUpdate = new MoveUpdate();
MoveUpdate moveUpdate = new();
moveUpdate.Status = target.m_movementInfo;
target.SendMessageToSet(moveUpdate, true);
}
@@ -775,7 +775,7 @@ namespace Game.Chat
return false;
Map map = handler.GetSession().GetPlayer().GetMap();
Position pos = new Position(x, y, z, o);
Position pos = new(x, y, z, o);
Creature creature = Creature.CreateCreature(entry, map, pos, id);
if (!creature)
@@ -1075,7 +1075,7 @@ namespace Game.Chat
string name = "test";
byte code = args.NextByte();
ChannelNotify packet = new ChannelNotify();
ChannelNotify packet = new();
packet.Type = (ChatNotify)code;
packet.Channel = name;
handler.GetSession().SendPacket(packet);
@@ -1090,7 +1090,7 @@ namespace Game.Chat
string msg = "testtest";
byte type = args.NextByte();
ChatPkt data = new ChatPkt();
ChatPkt data = new();
data.Initialize((ChatMsg)type, Language.Universal, handler.GetSession().GetPlayer(), handler.GetSession().GetPlayer(), msg, 0, "chan");
handler.GetSession().SendPacket(data);
return true;
@@ -1111,7 +1111,7 @@ namespace Game.Chat
static bool HandleDebugSendLargePacketCommand(StringArguments args, CommandHandler handler)
{
const string stuffingString = "This is a dummy string to push the packet's size beyond 128000 bytes. ";
StringBuilder ss = new StringBuilder();
StringBuilder ss = new();
while (ss.Length < 128000)
ss.Append(stuffingString);
handler.SendSysMessage(ss.ToString());
@@ -1171,7 +1171,7 @@ namespace Game.Chat
if (args.Empty())
return false;
PhaseShift phaseShift = new PhaseShift();
PhaseShift phaseShift = new();
if (uint.TryParse(args.NextString(), out uint terrain))
phaseShift.AddVisibleMapId(terrain, null);
@@ -1198,7 +1198,7 @@ namespace Game.Chat
int failArg1 = args.NextInt32();
int failArg2 = args.NextInt32();
CastFailed castFailed = new CastFailed();
CastFailed castFailed = new();
castFailed.CastID = ObjectGuid.Empty;
castFailed.SpellID = 133;
castFailed.Reason = (SpellCastResult)failNum;
@@ -366,7 +366,7 @@ namespace Game.Chat
Player player = handler.GetSession().GetPlayer();
List<WorldObject> creatureList = new List<WorldObject>();
List<WorldObject> creatureList = new();
if (!player.GetMap().SpawnGroupSpawn(groupId, ignoreRespawn, force, creatureList))
{
handler.SendSysMessage(CypherStrings.SpawngroupBadgroup, groupId);
@@ -407,7 +407,7 @@ namespace Game.Chat
}
else
{
StringBuilder eventFilter = new StringBuilder();
StringBuilder eventFilter = new();
eventFilter.Append(" AND (eventEntry IS NULL ");
bool initString = true;
+1 -1
View File
@@ -45,7 +45,7 @@ namespace Game.Chat
return true;
}
Guild guild = new Guild();
Guild guild = new();
if (!guild.Create(target, guildname))
{
handler.SendSysMessage(CypherStrings.GuildNotCreated);
+1 -1
View File
@@ -577,7 +577,7 @@ namespace Game.Chat.Commands
if (!args.Empty())
range = args.NextUInt32();
List<RespawnInfo> respawns = new List<RespawnInfo>();
List<RespawnInfo> respawns = new();
Locale locale = handler.GetSession().GetSessionDbcLocale();
string stringOverdue = Global.ObjectMgr.GetCypherString(CypherStrings.ListRespawnsOverdue, locale);
string stringCreature = Global.ObjectMgr.GetCypherString(CypherStrings.ListRespawnsCreatures, locale);
+5 -5
View File
@@ -267,7 +267,7 @@ namespace Game.Chat
// send faction in "id - [faction] rank reputation [visible] [at war] [own team] [unknown] [invisible] [inactive]" format
// or "id - [faction] [no reputation]" format
StringBuilder ss = new StringBuilder();
StringBuilder ss = new();
if (handler.GetSession() != null)
ss.AppendFormat("{0} - |cffffffff|Hfaction:{0}|h[{1}]|h|r", factionEntry.Id, name);
else
@@ -772,7 +772,7 @@ namespace Game.Chat
string namePart = args.NextString().ToLower();
StringBuilder reply = new StringBuilder();
StringBuilder reply = new();
uint count = 0;
bool limitReached = false;
@@ -924,7 +924,7 @@ namespace Game.Chat
return true;
}
StringBuilder ss = new StringBuilder();
StringBuilder ss = new();
ss.Append(mapInfo.Id + " - [" + name + ']');
if (mapInfo.IsContinent())
@@ -1141,7 +1141,7 @@ namespace Game.Chat
uint rank = learn && learnSpellInfo != null ? learnSpellInfo.GetRank() : spellInfo.GetRank();
// send spell in "id - [name, rank N] [talent] [passive] [learn] [known]" format
StringBuilder ss = new StringBuilder();
StringBuilder ss = new();
if (handler.GetSession() != null)
ss.Append(spellInfo.Id + " - |cffffffff|Hspell:" + spellInfo.Id + "|h[" + name);
else
@@ -1215,7 +1215,7 @@ namespace Game.Chat
uint rank = learn && learnSpellInfo != null ? learnSpellInfo.GetRank() : spellInfo.GetRank();
// send spell in "id - [name, rank N] [talent] [passive] [learn] [known]" format
StringBuilder ss = new StringBuilder();
StringBuilder ss = new();
if (handler.GetSession() != null)
ss.Append(id + " - |cffffffff|Hspell:" + id + "|h[" + name);
else
+6 -6
View File
@@ -62,7 +62,7 @@ namespace Game.Chat
player.GetPosition(out x, out y, out z);
// path
PathGenerator path = new PathGenerator(target);
PathGenerator path = new(target);
path.SetUseStraightPath(useStraightPath);
bool result = path.CalculatePath(x, y, z, false, useStraightLine);
@@ -125,7 +125,7 @@ namespace Game.Chat
handler.SendSysMessage("Calc [{0:D2}, {1:D2}]", tilex, tiley);
// navmesh poly . navmesh tile location
Detour.dtQueryFilter filter = new Detour.dtQueryFilter();
Detour.dtQueryFilter filter = new();
float[] nothing = new float[3];
ulong polyRef = 0;
if (Detour.dtStatusFailed(navmeshquery.findNearestPoly(location, extents, filter, ref polyRef, ref nothing)))
@@ -138,8 +138,8 @@ namespace Game.Chat
handler.SendSysMessage("Dt [??, ??] (invalid poly, probably no tile loaded)");
else
{
Detour.dtMeshTile tile = new Detour.dtMeshTile();
Detour.dtPoly poly = new Detour.dtPoly();
Detour.dtMeshTile tile = new();
Detour.dtPoly poly = new();
if (Detour.dtStatusSucceed(navmesh.getTileAndPolyByRef(polyRef, ref tile, ref poly)))
{
if (tile != null)
@@ -231,7 +231,7 @@ namespace Game.Chat
WorldObject obj = handler.GetPlayer();
// Get Creatures
List<Unit> creatureList = new List<Unit>();
List<Unit> creatureList = new();
var go_check = new AnyUnitInObjectRangeCheck(obj, radius);
var go_search = new UnitListSearcher(obj, creatureList, go_check);
@@ -248,7 +248,7 @@ namespace Game.Chat
obj.GetPosition(out gx, out gy, out gz);
foreach (var creature in creatureList)
{
PathGenerator path = new PathGenerator(creature);
PathGenerator path = new(creature);
path.CalculatePath(gx, gy, gz);
++paths;
}
+8 -8
View File
@@ -80,7 +80,7 @@ namespace Game.Chat
if (count == 0)
count = 1;
List<uint> bonusListIDs = new List<uint>();
List<uint> bonusListIDs = new();
var bonuses = args.NextString();
// semicolon separated bonuslist ids (parse them after all arguments are extracted by strtok!)
@@ -121,7 +121,7 @@ namespace Game.Chat
uint noSpaceForCount = 0;
// check space and find places
List<ItemPosCount> dest = new List<ItemPosCount>();
List<ItemPosCount> dest = new();
InventoryResult msg = playerTarget.CanStoreNewItem(ItemConst.NullBag, ItemConst.NullSlot, dest, itemId, (uint)count, out noSpaceForCount);
if (msg != InventoryResult.Ok) // convert to possible store amount
count -= (int)noSpaceForCount;
@@ -175,7 +175,7 @@ namespace Game.Chat
return false;
}
List<uint> bonusListIDs = new List<uint>();
List<uint> bonusListIDs = new();
var bonuses = args.NextString();
// semicolon separated bonuslist ids (parse them after all arguments are extracted by strtok!)
@@ -203,7 +203,7 @@ namespace Game.Chat
if (template.Value.GetItemSet() == itemSetId)
{
found = true;
List<ItemPosCount> dest = new List<ItemPosCount>();
List<ItemPosCount> dest = new();
InventoryResult msg = playerTarget.CanStoreNewItem(ItemConst.NullBag, ItemConst.NullSlot, dest, template.Value.GetId(), 1);
if (msg == InventoryResult.Ok)
{
@@ -565,7 +565,7 @@ namespace Game.Chat
// melee damage by specific school
if (string.IsNullOrEmpty(spellStr))
{
DamageInfo dmgInfo = new DamageInfo(attacker, target, damage_, null, schoolmask, DamageEffectType.SpellDirect, WeaponAttackType.BaseAttack);
DamageInfo dmgInfo = new(attacker, target, damage_, null, schoolmask, DamageEffectType.SpellDirect, WeaponAttackType.BaseAttack);
attacker.CalcAbsorbResist(dmgInfo);
if (dmgInfo.GetDamage() == 0)
@@ -591,7 +591,7 @@ namespace Game.Chat
if (spellInfo == null)
return false;
SpellNonMeleeDamage damageInfo = new SpellNonMeleeDamage(attacker, target, spellInfo, new Networking.Packets.SpellCastVisual(spellInfo.GetSpellXSpellVisualId(attacker), 0), spellInfo.SchoolMask);
SpellNonMeleeDamage damageInfo = new(attacker, target, spellInfo, new Networking.Packets.SpellCastVisual(spellInfo.GetSpellXSpellVisualId(attacker), 0), spellInfo.SchoolMask);
damageInfo.damage = damage_;
attacker.DealDamageMods(damageInfo.target, ref damageInfo.damage, ref damageInfo.absorb);
target.DealSpellDamage(damageInfo, true);
@@ -886,7 +886,7 @@ namespace Game.Chat
}
CellCoord cellCoord = GridDefines.ComputeCellCoord(obj.GetPositionX(), obj.GetPositionY());
Cell cell = new Cell(cellCoord);
Cell cell = new(cellCoord);
uint zoneId, areaId;
obj.GetZoneAndAreaId(out zoneId, out areaId);
@@ -1957,7 +1957,7 @@ namespace Game.Chat
Cell.VisitGridObjects(player, worker, player.GetGridActivationRange());
// Now handle any that had despawned, but had respawn time logged.
List<RespawnInfo> data = new List<RespawnInfo>();
List<RespawnInfo> data = new();
player.GetMap().GetRespawnInfo(data, SpawnObjectTypeMask.All, 0);
if (!data.Empty())
{
+4 -4
View File
@@ -191,8 +191,8 @@ namespace Game.Chat
if (handler.NeedReportToTarget(target))
target.SendSysMessage(CypherStrings.YoursSpellflatidChanged, handler.GetNameLink(), spellflatid, val, mark);
SetSpellModifier packet = new SetSpellModifier(ServerOpcodes.SetFlatSpellModifier);
SpellModifierInfo spellMod = new SpellModifierInfo();
SetSpellModifier packet = new(ServerOpcodes.SetFlatSpellModifier);
SpellModifierInfo spellMod = new();
spellMod.ModIndex = op;
SpellModifierData modData;
modData.ClassIndex = spellflatid;
@@ -601,7 +601,7 @@ namespace Game.Chat
Global.CharacterCacheStorage.UpdateCharacterGender(target.GetGUID(), (byte)gender);
// Generate random customizations
List<ChrCustomizationChoice> customizations = new List<ChrCustomizationChoice>();
List<ChrCustomizationChoice> customizations = new();
var options = Global.DB2Mgr.GetCustomiztionOptions(target.GetRace(), gender);
WorldSession worldSession = target.GetSession();
@@ -620,7 +620,7 @@ namespace Game.Chat
continue;
ChrCustomizationChoiceRecord choiceEntry = choicesForOption[0];
ChrCustomizationChoice choice = new ChrCustomizationChoice();
ChrCustomizationChoice choice = new();
choice.ChrCustomizationOptionID = option.Id;
choice.ChrCustomizationChoiceID = choiceEntry.Id;
customizations.Add(choice);
+3 -3
View File
@@ -446,7 +446,7 @@ namespace Game.Chat
Player player = handler.GetSession().GetPlayer();
List<WorldObject> creatureList = new List<WorldObject>();
List<WorldObject> creatureList = new();
if (!player.GetMap().SpawnGroupSpawn(groupId, ignoreRespawn, force, creatureList))
{
handler.SendSysMessage(CypherStrings.SpawngroupBadgroup, groupId);
@@ -719,7 +719,7 @@ namespace Game.Chat
uint vendor_entry = vendor.GetEntry();
VendorItem vItem = new VendorItem();
VendorItem vItem = new();
vItem.item = itemId;
vItem.maxcount = maxcount;
vItem.incrtime = incrtime;
@@ -807,7 +807,7 @@ namespace Game.Chat
return false;
Player chr = handler.GetSession().GetPlayer();
FormationInfo group_member = new FormationInfo();
FormationInfo group_member = new();
group_member.follow_angle = (creature.GetAngle(chr) - chr.GetOrientation()) * 180 / MathFunctions.PI;
group_member.follow_dist = (float)Math.Sqrt(Math.Pow(chr.GetPositionX() - creature.GetPositionX(), 2) + Math.Pow(chr.GetPositionY() - creature.GetPositionY(), 2));
group_member.leaderGUID = leaderGUID;
+1 -1
View File
@@ -52,7 +52,7 @@ namespace Game.Chat
}
// Everything looks OK, create new pet
Pet pet = new Pet(player, PetType.Hunter);
Pet pet = new(player, PetType.Hunter);
if (!pet.CreateBaseAtCreature(creatureTarget))
{
handler.SendSysMessage("Error 1");
+1 -1
View File
@@ -101,7 +101,7 @@ namespace Game.Chat
case QuestObjectiveType.Item:
{
uint curItemCount = player.GetItemCount((uint)obj.ObjectID, true);
List<ItemPosCount> dest = new List<ItemPosCount>();
List<ItemPosCount> dest = new();
InventoryResult msg = player.CanStoreNewItem(ItemConst.NullBag, ItemConst.NullSlot, dest, (uint)obj.ObjectID, (uint)(obj.Amount - curItemCount));
if (msg == InventoryResult.Ok)
{
+1 -1
View File
@@ -292,7 +292,7 @@ namespace Game.Chat.Commands
if (checkParams && handler.HasLowerSecurityAccount(null, accountId, true))
return null;
RBACCommandData data = new RBACCommandData();
RBACCommandData data = new();
if (rdata == null)
{
+9 -9
View File
@@ -54,10 +54,10 @@ namespace Game.Chat.Commands
return false;
// from console show not existed sender
MailSender sender = new MailSender(MailMessageType.Normal, handler.GetSession() ? handler.GetSession().GetPlayer().GetGUID().GetCounter() : 0, MailStationery.Gm);
MailSender sender = new(MailMessageType.Normal, handler.GetSession() ? handler.GetSession().GetPlayer().GetGUID().GetCounter() : 0, MailStationery.Gm);
// @todo Fix poor design
SQLTransaction trans = new SQLTransaction();
SQLTransaction trans = new();
new MailDraft(subject, text)
.SendMailTo(trans, new MailReceiver(target, targetGuid.GetCounter()), sender);
@@ -95,10 +95,10 @@ namespace Game.Chat.Commands
return false;
// extract items
List<KeyValuePair<uint, uint>> items = new List<KeyValuePair<uint, uint>>();
List<KeyValuePair<uint, uint>> items = new();
// get all tail string
StringArguments tail = new StringArguments(args.NextString(""));
StringArguments tail = new(args.NextString(""));
// get from tail next item str
StringArguments itemStr;
@@ -143,12 +143,12 @@ namespace Game.Chat.Commands
}
// from console show not existed sender
MailSender sender = new MailSender(MailMessageType.Normal, handler.GetSession() ? handler.GetSession().GetPlayer().GetGUID().GetCounter() : 0, MailStationery.Gm);
MailSender sender = new(MailMessageType.Normal, handler.GetSession() ? handler.GetSession().GetPlayer().GetGUID().GetCounter() : 0, MailStationery.Gm);
// fill mail
MailDraft draft = new MailDraft(subject, text);
MailDraft draft = new(subject, text);
SQLTransaction trans = new SQLTransaction();
SQLTransaction trans = new();
foreach (var pair in items)
{
@@ -202,9 +202,9 @@ namespace Game.Chat.Commands
return false;
// from console show not existed sender
MailSender sender = new MailSender(MailMessageType.Normal, handler.GetSession() ? handler.GetSession().GetPlayer().GetGUID().GetCounter() : 0, MailStationery.Gm);
MailSender sender = new(MailMessageType.Normal, handler.GetSession() ? handler.GetSession().GetPlayer().GetGUID().GetCounter() : 0, MailStationery.Gm);
SQLTransaction trans = new SQLTransaction();
SQLTransaction trans = new();
new MailDraft(subject, text)
.AddMoney((uint)money)
+2 -2
View File
@@ -90,7 +90,7 @@ namespace Game.Chat
return false;
}
GameTele tele = new GameTele();
GameTele tele = new();
tele.posX = player.GetPositionX();
tele.posY = player.GetPositionY();
tele.posZ = player.GetPositionZ();
@@ -232,7 +232,7 @@ namespace Game.Chat
if (!result.IsEmpty())
{
WorldLocation loc = new WorldLocation(result.Read<ushort>(0), result.Read<float>(2), result.Read<float>(3), result.Read<float>(4), 0.0f);
WorldLocation loc = new(result.Read<ushort>(0), result.Read<float>(2), result.Read<float>(3), result.Read<float>(4), 0.0f);
uint zoneId = result.Read<ushort>(1);
Player.SavePositionInDB(loc, zoneId, targetGuid, null);
+3 -3
View File
@@ -760,7 +760,7 @@ namespace Game.Chat.Commands
Player chr = handler.GetSession().GetPlayer();
Map map = chr.GetMap();
Position pos = new Position(x, y, z, chr.GetOrientation());
Position pos = new(x, y, z, chr.GetOrientation());
Creature creature = Creature.CreateCreature(id, map, pos);
if (!creature)
@@ -826,7 +826,7 @@ namespace Game.Chat.Commands
Player chr = handler.GetSession().GetPlayer();
Map map = chr.GetMap();
Position pos = new Position(x, y, z, chr.GetOrientation());
Position pos = new(x, y, z, chr.GetOrientation());
Creature creature = Creature.CreateCreature(1, map, pos);
if (!creature)
@@ -881,7 +881,7 @@ namespace Game.Chat.Commands
Player chr = handler.GetSession().GetPlayer();
Map map = chr.GetMap();
Position pos = new Position(x, y, z, o);
Position pos = new(x, y, z, o);
Creature creature = Creature.CreateCreature(1, map, pos);
if (!creature)