Core/Refactor: Part 1

This commit is contained in:
hondacrx
2018-05-07 18:56:09 -04:00
parent b2c1554065
commit 216db1c23a
83 changed files with 298 additions and 296 deletions
+1 -1
View File
@@ -27,7 +27,7 @@ namespace Game.Chat.Commands
[Command("god", RBACPermissions.CommandCheatGod)]
static bool HandleGodModeCheat(StringArguments args, CommandHandler handler)
{
if (handler.GetSession() == null || handler.GetSession().GetPlayer())
if (handler.GetSession() == null || !handler.GetSession().GetPlayer())
return false;
string argstr = args.NextString();
@@ -34,7 +34,6 @@ namespace Game.Chat.Commands
if (entry == 0)
return false;
string flagsStr = args.NextString();
uint flags = args.NextUInt32();
string disableComment = args.NextString("");
-1
View File
@@ -570,7 +570,6 @@ namespace Game.Chat.Commands
string goX = args.NextString();
string goY = args.NextString();
string goZ = args.NextString();
string id = args.NextString();
string port = args.NextString();
float x, y, z, o;
@@ -98,7 +98,6 @@ namespace Game.Chat.Commands
return false;
}
string countStr = args.NextString();
if (!uint.TryParse(args.NextString(), out uint count))
count = 10;
+6 -6
View File
@@ -277,7 +277,7 @@ namespace Game.Chat
if (moneyToAdd < 0)
{
ulong newmoney = (targetMoney + (ulong)moneyToAdd);
long newmoney = (long)targetMoney + moneyToAdd;
Log.outDebug(LogFilter.ChatSystem, Global.ObjectMgr.GetCypherString(CypherStrings.CurrentMoney), targetMoney, moneyToAdd, newmoney);
if (newmoney <= 0)
@@ -291,13 +291,13 @@ namespace Game.Chat
else
{
ulong moneyToAddMsg = (ulong)(moneyToAdd * -1);
if (newmoney > PlayerConst.MaxMoneyAmount)
newmoney = PlayerConst.MaxMoneyAmount;
if (newmoney > (long)PlayerConst.MaxMoneyAmount)
newmoney = (long)PlayerConst.MaxMoneyAmount;
handler.SendSysMessage(CypherStrings.YouTakeMoney, Math.Abs(moneyToAdd), handler.GetNameLink(target));
handler.SendSysMessage(CypherStrings.YouTakeMoney, moneyToAddMsg, handler.GetNameLink(target));
if (handler.needReportToTarget(target))
target.SendSysMessage(CypherStrings.YoursMoneyTaken, handler.GetNameLink(), Math.Abs(moneyToAdd));
target.SetMoney(newmoney);
target.SendSysMessage(CypherStrings.YoursMoneyTaken, handler.GetNameLink(), moneyToAddMsg);
target.SetMoney((ulong)newmoney);
}
}
else
@@ -83,8 +83,6 @@ namespace Game.Chat
if (string.IsNullOrEmpty(paramStr))
return false;
int limit = paramStr.Length;
switch (paramStr.ToLower())
{
case "player":
+1 -1
View File
@@ -314,7 +314,7 @@ namespace Game.Chat.Commands
return false;
stmt = DB.World.GetPreparedStatement(WorldStatements.UPD_WAYPOINT_SCRIPT_Z);
stmt.AddValue(0, args);
stmt.AddValue(0, arg3);
stmt.AddValue(1, id);
DB.World.Execute(stmt);