themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Cleaned up some redundant code.

Browse source
This commit is contained in:
Deathmax 2011-06-01 20:13:15 +08:00
parent e9461f49d7
commit 3ab1c9e906
1 changed files with 35 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

124
TShockAPI/TShock.cs
View file

@ -319,26 +319,14 @@ namespace TShockAPI
if (args.Length == 3) if (args.Length == 3)
int.TryParse(args[2], out amount); int.TryParse(args[2], out amount);
if (int.TryParse(inputtype, out type)) if (!int.TryParse(inputtype, out type))
{
if (type >= 1 && type <= 43)
{
for (int i = 0; i < amount; i++)
npcid = NPC.NewNPC(x, y, type, 0);
Tools.Broadcast(string.Format("{0} was spawned {1} time(s).", Main.npc[npcid].name, amount));
handler.Handled = true;
}
}
else
{
type = GetNPCID(inputtype); type = GetNPCID(inputtype);
if (type > 0) if (type >= 1 && type <= 43)
{ {
for (int i = 0; i < amount; i++) for (int i = 0; i < amount; i++)
npcid = NPC.NewNPC(x, y, type, 0); npcid = NPC.NewNPC(x, y, type, 0);
Tools.Broadcast(string.Format("{0} was spawned {1} time(s).", Main.npc[npcid].name, amount)); Tools.Broadcast(string.Format("{0} was spawned {1} time(s).", Main.npc[npcid].name, amount));
handler.Handled = true; handler.Handled = true;
}
} }
} }
} }
@ -349,40 +337,20 @@ namespace TShockAPI
{ {
args = ((args.TrimEnd('"')).TrimStart('"')); args = ((args.TrimEnd('"')).TrimStart('"'));
int type = 0; int type = 0;
if (int.TryParse(args, out type)) if (!int.TryParse(args, out type))
{
if (type >= 1 && type <= 235)
{
for (int i = 0; i < 40; i++)
{
if (!Main.player[ply].inventory[i].active)
{
Main.player[ply].inventory[i].SetDefaults(type);
Main.player[ply].inventory[i].stack = Main.player[ply].inventory[i].maxStack;
Tools.SendMessage(ply, "Got some " + Main.player[ply].inventory[i].name + ".");
UpdateInventories();
handler.Handled = true;
break;
}
}
}
}
else
{
type = GetItemID(args); type = GetItemID(args);
if (type != -1) if (type >= 1 && type <= 235)
{
for (int i = 0; i < 40; i++)
{ {
for (int i = 0; i < 40; i++) if (!Main.player[ply].inventory[i].active)
{ {
if (!Main.player[ply].inventory[i].active) Main.player[ply].inventory[i].SetDefaults(type);
{ Main.player[ply].inventory[i].stack = Main.player[ply].inventory[i].maxStack;
Main.player[ply].inventory[i].SetDefaults(type); Tools.SendMessage(ply, "Got some " + Main.player[ply].inventory[i].name + ".");
Main.player[ply].inventory[i].stack = Main.player[ply].inventory[i].maxStack; UpdateInventories();
Tools.SendMessage(ply, "Got some " + Main.player[ply].inventory[i].name + "."); handler.Handled = true;
UpdateInventories(); break;
handler.Handled = true;
break;
}
} }
} }
} }
@ -397,49 +365,24 @@ namespace TShockAPI
args[i] = ((args[i].TrimEnd('"')).TrimStart('"')); args[i] = ((args[i].TrimEnd('"')).TrimStart('"'));
int type = 0; int type = 0;
int player = -1; int player = -1;
if (int.TryParse(args[1], out type)) if (!int.TryParse(args[1], out type))
{
if (type >= 1 && type <= 235)
{
player = Tools.FindPlayer(args[2]);
if (player != -1)
{
for (int i = 0; i < 40; i++)
{
if (!Main.player[player].inventory[i].active)
{
Main.player[player].inventory[i].SetDefaults(type);
Main.player[player].inventory[i].stack = Main.player[player].inventory[i].maxStack;
Tools.SendMessage(ply, string.Format("Gave {0} some {1}.", args[2], Main.player[player].inventory[i].name));
Tools.SendMessage(player, string.Format("{0} gave you some {1}.", Tools.FindPlayer(ply), Main.player[player].inventory[i].name));
UpdateInventories();
handler.Handled = true;
break;
}
}
}
}
}
else
{
type = GetItemID(args[1]); type = GetItemID(args[1]);
if (type != -1) if (type >= 1 && type <= 235)
{
player = Tools.FindPlayer(args[2]);
if (player != -1)
{ {
player = Tools.FindPlayer(args[2]); for (int i = 0; i < 40; i++)
if (player != -1)
{ {
for (int i = 0; i < 40; i++) if (!Main.player[player].inventory[i].active)
{ {
if (!Main.player[player].inventory[i].active) Main.player[player].inventory[i].SetDefaults(type);
{ Main.player[player].inventory[i].stack = Main.player[player].inventory[i].maxStack;
Main.player[player].inventory[i].SetDefaults(type); Tools.SendMessage(ply, string.Format("Gave {0} some {1}.", args[2], Main.player[player].inventory[i].name));
Main.player[player].inventory[i].stack = Main.player[player].inventory[i].maxStack; Tools.SendMessage(player, string.Format("{0} gave you some {1}.", Tools.FindPlayer(ply), Main.player[player].inventory[i].name));
Tools.SendMessage(ply, string.Format("Gave {0} some {1}.", args[2], Main.player[player].inventory[i].name)); UpdateInventories();
Tools.SendMessage(player, string.Format("{0} gave you some {1}.", Tools.FindPlayer(ply), Main.player[player].inventory[i].name)); handler.Handled = true;
UpdateInventories(); break;
handler.Handled = true;
break;
}
} }
} }
} }
@ -451,7 +394,8 @@ namespace TShockAPI
{ {
Tools.SendMessage(ply, "TShock Commands:"); Tools.SendMessage(ply, "TShock Commands:");
Tools.SendMessage(ply, "/kick, /ban, /reload, /off, /dropmeteor, /invade"); Tools.SendMessage(ply, "/kick, /ban, /reload, /off, /dropmeteor, /invade");
Tools.SendMessage(ply, "/star, /skeletron, /eye, /eater, /hardcore"); Tools.SendMessage(ply, "/star, /skeletron, /eye, /eater, /hardcore, /give");
Tools.SendMessage(ply, "/password, /save, /item, /spawnmob, /tp, /tphere");
Tools.SendMessage(ply, "Terraria commands:"); Tools.SendMessage(ply, "Terraria commands:");
Tools.SendMessage(ply, "/playing, /p, /me"); Tools.SendMessage(ply, "/playing, /p, /me");
handler.Handled = true; handler.Handled = true;