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

Some refactoring of code. and some cleanups

Browse Source
This commit is contained in:
hondacrx
2019-09-21 12:11:16 -04:00
parent 7c405230cc
commit 35c06c09fd
214 changed files with 1235 additions and 1341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/Channels/Channel.cs
+4 -4
View File
@@ -218,7 +218,7 @@ namespace Game.Chat
bool newChannel = _playersStore.Empty();
PlayerInfo playerInfo = new PlayerInfo();
playerInfo.SetInvisible(!player.isGMVisible());
playerInfo.SetInvisible(!player.IsGMVisible());
_playersStore[guid] = playerInfo;
/*
@@ -696,7 +696,7 @@ namespace Game.Chat
}
Player newp = Global.ObjAccessor.FindPlayerByName(newname);
if (!newp || !newp.isGMVisible())
if (!newp || !newp.IsGMVisible())
{
ChannelNameBuilder builder = new ChannelNameBuilder(this, new PlayerNotFoundAppend(newname));
SendToOne(builder, guid);
@@ -830,7 +830,7 @@ namespace Game.Chat
}
}
void SendToAll(MessageBuilder builder, ObjectGuid guid = default(ObjectGuid))
void SendToAll(MessageBuilder builder, ObjectGuid guid = default)
{
LocalizedPacketDo localizer = new LocalizedPacketDo(builder);
@@ -867,7 +867,7 @@ namespace Game.Chat
localizer.Invoke(player);
}
void SendToAllWithAddon(MessageBuilder builder, string addonPrefix, ObjectGuid guid = default(ObjectGuid))
void SendToAllWithAddon(MessageBuilder builder, string addonPrefix, ObjectGuid guid = default)
{
LocalizedPacketDo localizer = new LocalizedPacketDo(builder);
Source/Game/Chat/Commands/CharacterCommands.cs
+2 -2
View File
@@ -216,7 +216,7 @@ namespace Game.Chat
if (!handler.extractPlayerTarget(new StringArguments(nameStr), out target, out targetGuid, out targetName))
return false;
int oldlevel = (int)(target ? target.getLevel() : Global.CharacterCacheStorage.GetCharacterLevelByGuid(targetGuid));
int oldlevel = (int)(target ? target.GetLevel() : Global.CharacterCacheStorage.GetCharacterLevelByGuid(targetGuid));
if (!int.TryParse(levelStr, out int newlevel))
newlevel = oldlevel;
@@ -750,7 +750,7 @@ namespace Game.Chat
if (!handler.extractPlayerTarget(new StringArguments(nameStr), out target, out targetGuid, out targetName))
return false;
int oldlevel = (int)(target ? target.getLevel() : Global.CharacterCacheStorage.GetCharacterLevelByGuid(targetGuid));
int oldlevel = (int)(target ? target.GetLevel() : Global.CharacterCacheStorage.GetCharacterLevelByGuid(targetGuid));
if (!int.TryParse(levelStr, out int addlevel))
addlevel = 1;
Source/Game/Chat/Commands/CheatCommands.cs
+2 -2
View File
@@ -145,7 +145,7 @@ namespace Game.Chat.Commands
handler.SendSysMessage(CypherStrings.CommandCheatCt, player.GetCommandStatus(PlayerCommandStates.Casttime) ? enabled : disabled);
handler.SendSysMessage(CypherStrings.CommandCheatPower, player.GetCommandStatus(PlayerCommandStates.Power) ? enabled : disabled);
handler.SendSysMessage(CypherStrings.CommandCheatWw, player.GetCommandStatus(PlayerCommandStates.Waterwalk) ? enabled : disabled);
handler.SendSysMessage(CypherStrings.CommandCheatTaxinodes, player.isTaxiCheater() ? enabled : disabled);
handler.SendSysMessage(CypherStrings.CommandCheatTaxinodes, player.IsTaxiCheater() ? enabled : disabled);
return true;
}
@@ -191,7 +191,7 @@ namespace Game.Chat.Commands
return false;
if (args.Empty())
argstr = (chr.isTaxiCheater()) ? "off" : "on";
argstr = (chr.IsTaxiCheater()) ? "off" : "on";
if (argstr == "off")
{
Source/Game/Chat/Commands/DebugCommands.cs
+5 -5
View File
@@ -50,15 +50,15 @@ namespace Game.Chat
static bool HandleDebugAreaTriggersCommand(StringArguments args, CommandHandler handler)
{
Player player = handler.GetSession().GetPlayer();
if (!player.isDebugAreaTriggers)
if (!player.IsDebugAreaTriggers)
{
handler.SendSysMessage(CypherStrings.DebugAreatriggerOn);
player.isDebugAreaTriggers = true;
player.IsDebugAreaTriggers = true;
}
else
{
handler.SendSysMessage(CypherStrings.DebugAreatriggerOff);
player.isDebugAreaTriggers = false;
player.IsDebugAreaTriggers = false;
}
return true;
}
@@ -441,7 +441,7 @@ namespace Game.Chat
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)
@@ -485,7 +485,7 @@ namespace Game.Chat
return false;
handler.SendSysMessage("Loot recipient for creature {0} (GUID {1}, DB GUID {2}) is {3}", target.GetName(), target.GetGUID().ToString(), target.GetSpawnId(),
target.hasLootRecipient() ? (target.GetLootRecipient() ? target.GetLootRecipient().GetName() : "offline") : "no loot recipient");
target.HasLootRecipient() ? (target.GetLootRecipient() ? target.GetLootRecipient().GetName() : "offline") : "no loot recipient");
return true;
}
Source/Game/Chat/Commands/GMCommands.cs
+2 -2
View File
@@ -64,7 +64,7 @@ namespace Game.Chat
{
if (args.Empty())
{
if (session.HasPermission(RBACPermissions.ChatUseStaffBadge) && session.GetPlayer().isGMChat())
if (session.HasPermission(RBACPermissions.ChatUseStaffBadge) && session.GetPlayer().IsGMChat())
session.SendNotification(CypherStrings.GmChatOn);
else
session.SendNotification(CypherStrings.GmChatOff);
@@ -206,7 +206,7 @@ namespace Game.Chat
if (args.Empty())
{
handler.SendSysMessage(CypherStrings.YouAre, _player.isGMVisible() ? Global.ObjectMgr.GetCypherString(CypherStrings.Visible) : Global.ObjectMgr.GetCypherString(CypherStrings.Invisible));
handler.SendSysMessage(CypherStrings.YouAre, _player.IsGMVisible() ? Global.ObjectMgr.GetCypherString(CypherStrings.Visible) : Global.ObjectMgr.GetCypherString(CypherStrings.Invisible));
return true;
}
Source/Game/Chat/Commands/LearnCommands.cs
+1 -1
View File
@@ -208,7 +208,7 @@ namespace Game.Chat.Commands
static void HandleLearnSkillRecipesHelper(Player player, uint skillId)
{
uint classmask = player.getClassMask();
uint classmask = player.GetClassMask();
foreach (var skillLine in CliDB.SkillLineAbilityStorage.Values)
{
Source/Game/Chat/Commands/MessageCommands.cs
+1 -1
View File
@@ -111,7 +111,7 @@ namespace Game.Chat
{
if (args.Empty())
{
handler.SendSysMessage(CypherStrings.CommandWhisperaccepting, handler.GetSession().GetPlayer().isAcceptWhispers() ? handler.GetCypherString(CypherStrings.On) : handler.GetCypherString(CypherStrings.Off));
handler.SendSysMessage(CypherStrings.CommandWhisperaccepting, handler.GetSession().GetPlayer().IsAcceptWhispers() ? handler.GetCypherString(CypherStrings.On) : handler.GetCypherString(CypherStrings.Off));
return true;
}
Source/Game/Chat/Commands/MiscCommands.cs
+3 -3
View File
@@ -1394,7 +1394,7 @@ namespace Game.Chat
accId = target.GetSession().GetAccountId();
money = target.GetMoney();
totalPlayerTime = target.GetTotalPlayedTime();
level = target.getLevel();
level = target.GetLevel();
latency = target.GetSession().GetLatency();
raceid = target.GetRace();
classid = target.GetClass();
@@ -2108,7 +2108,7 @@ namespace Game.Chat
return false;
target.CombatStop();
target.getHostileRefManager().deleteReferences();
target.GetHostileRefManager().deleteReferences();
return true;
}
@@ -2380,7 +2380,7 @@ namespace Game.Chat
{
Player player = handler.GetSession().GetPlayer();
if (player.isPossessing())
if (player.IsPossessing())
return false;
player.StopCastingBindSight();
Source/Game/Chat/Commands/NPCCommands.cs
+5 -5
View File
@@ -58,7 +58,7 @@ namespace Game.Chat
string defRespawnDelayStr = Time.secsToTimeString(target.GetRespawnDelay(), true);
handler.SendSysMessage(CypherStrings.NpcinfoChar, target.GetSpawnId(), target.GetGUID().ToString(), faction, npcflags, Entry, displayid, nativeid);
handler.SendSysMessage(CypherStrings.NpcinfoLevel, target.getLevel());
handler.SendSysMessage(CypherStrings.NpcinfoLevel, target.GetLevel());
handler.SendSysMessage(CypherStrings.NpcinfoEquipment, target.GetCurrentEquipmentId(), target.GetOriginalEquipmentId());
handler.SendSysMessage(CypherStrings.NpcinfoHealth, target.GetCreateHealth(), target.GetMaxHealth(), target.GetHealth());
handler.SendSysMessage(CypherStrings.NpcinfoInhabitType, cInfo.InhabitType);
@@ -166,7 +166,7 @@ namespace Game.Chat
creature.GetMotionMaster().Initialize();
if (creature.IsAlive()) // dead creature will reset movement generator at respawn
{
creature.setDeathState(DeathState.JustDied);
creature.SetDeathState(DeathState.JustDied);
creature.Respawn();
}
}
@@ -399,7 +399,7 @@ namespace Game.Chat
pet.SetReactState(ReactStates.Defensive);
// calculate proper level
uint level = (creatureTarget.getLevel() < (player.getLevel() - 5)) ? (player.getLevel() - 5) : creatureTarget.getLevel();
uint level = (creatureTarget.GetLevel() < (player.GetLevel() - 5)) ? (player.GetLevel() - 5) : creatureTarget.GetLevel();
// prepare visual effect for levelup
pet.SetLevel(level - 1);
@@ -893,7 +893,7 @@ namespace Game.Chat
creature.GetMotionMaster().Initialize();
if (creature.IsAlive()) // dead creature will reset movement generator at respawn
{
creature.setDeathState(DeathState.JustDied);
creature.SetDeathState(DeathState.JustDied);
creature.Respawn();
}
creature.SaveToDB();
@@ -992,7 +992,7 @@ namespace Game.Chat
creature.GetMotionMaster().Initialize();
if (creature.IsAlive()) // dead creature will reset movement generator at respawn
{
creature.setDeathState(DeathState.JustDied);
creature.SetDeathState(DeathState.JustDied);
creature.Respawn();
}
Source/Game/Chat/Commands/PetCommands.cs
+10 -10
View File
@@ -59,14 +59,14 @@ namespace Game.Chat
return false;
}
creatureTarget.setDeathState(DeathState.JustDied);
creatureTarget.SetDeathState(DeathState.JustDied);
creatureTarget.RemoveCorpse();
creatureTarget.SetHealth(0); // just for nice GM-mode view
pet.SetCreatorGUID(player.GetGUID());
pet.SetFaction(player.GetFaction());
if (!pet.InitStatsForLevel(creatureTarget.getLevel()))
if (!pet.InitStatsForLevel(creatureTarget.GetLevel()))
{
Log.outError(LogFilter.ChatSystem, "InitStatsForLevel() in EffectTameCreature failed! Pet deleted.");
handler.SendSysMessage("Error 2");
@@ -74,7 +74,7 @@ namespace Game.Chat
}
// prepare visual effect for levelup
pet.SetLevel(creatureTarget.getLevel() - 1);
pet.SetLevel(creatureTarget.GetLevel() - 1);
pet.GetCharmInfo().SetPetNumber(Global.ObjectMgr.GeneratePetNumber(), true);
// this enables pet details window (Shift+P)
@@ -84,7 +84,7 @@ namespace Game.Chat
pet.GetMap().AddToMap(pet.ToCreature());
// visual effect for levelup
pet.SetLevel(creatureTarget.getLevel());
pet.SetLevel(creatureTarget.GetLevel());
player.SetMinion(pet, true);
pet.SavePetToDB(PetSaveMode.AsCurrent);
@@ -125,7 +125,7 @@ namespace Game.Chat
return false;
}
pet.learnSpell(spellId);
pet.LearnSpell(spellId);
handler.SendSysMessage("Pet has learned spell {0}", spellId);
return true;
@@ -147,7 +147,7 @@ namespace Game.Chat
uint spellId = handler.extractSpellIdFromLink(args);
if (pet.HasSpell(spellId))
pet.removeSpell(spellId, false);
pet.RemoveSpell(spellId, false);
else
handler.SendSysMessage("Pet doesn't have that spell");
@@ -167,18 +167,18 @@ namespace Game.Chat
int level = args.NextInt32();
if (level == 0)
level = (int)(owner.getLevel() - pet.getLevel());
level = (int)(owner.GetLevel() - pet.GetLevel());
if (level == 0 || level < -SharedConst.StrongMaxLevel || level > SharedConst.StrongMaxLevel)
{
handler.SendSysMessage(CypherStrings.BadValue);
return false;
}
int newLevel = (int)pet.getLevel() + level;
int newLevel = (int)pet.GetLevel() + level;
if (newLevel < 1)
newLevel = 1;
else if (newLevel > owner.getLevel())
newLevel = (int)owner.getLevel();
else if (newLevel > owner.GetLevel())
newLevel = (int)owner.GetLevel();
pet.GivePetLevel(newLevel);
return true;
Source/Game/Chat/Commands/ResetCommands.cs
+2 -2
View File
@@ -72,7 +72,7 @@ namespace Game.Chat
if (!player.HasAuraType(AuraType.ModShapeshift))
player.SetShapeshiftForm(ShapeShiftForm.None);
player.setFactionForRace(player.GetRace());
player.SetFactionForRace(player.GetRace());
player.SetPowerType(powerType);
// reset only if player not in some form;
@@ -98,7 +98,7 @@ namespace Game.Chat
if (!HandleResetStatsOrLevelHelper(target))
return false;
byte oldLevel = (byte)target.getLevel();
byte oldLevel = (byte)target.GetLevel();
// set starting level
uint startLevel = (uint)(target.GetClass() != Class.Deathknight ? WorldConfig.GetIntValue(WorldCfg.StartPlayerLevel) : WorldConfig.GetIntValue(WorldCfg.StartDeathKnightPlayerLevel));
Source/Game/Chat/Commands/SceneCommands.cs
-1
View File
@@ -19,7 +19,6 @@ using Framework.Constants;
using Framework.IO;
using Game.DataStorage;
using Game.Entities;
using System;
namespace Game.Chat
{