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

Fixes #1226

Browse source
This commit is contained in:
Patrikk 2016-06-25 13:46:30 +02:00
parent dd8c253911
commit ee3e47c1c1
1 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
TShockAPI/Commands.cs
View file

@ -5242,22 +5242,6 @@ namespace TShockAPI
args.Parameters.RemoveAt(0); args.Parameters.RemoveAt(0);
if (args.Parameters.Count == 1) if (args.Parameters.Count == 1)
int.TryParse(args.Parameters[0], out itemAmount); int.TryParse(args.Parameters[0], out itemAmount);
else if (args.Parameters.Count == 2)
{
int.TryParse(args.Parameters[0], out itemAmount);
var prefixIds = TShock.Utils.GetPrefixByIdOrName(args.Parameters[1]);
if (items[0].accessory && prefixIds.Contains(42))
{
prefixIds.Remove(42);
prefixIds.Remove(76);
prefixIds.Add(76);
}
else if (!items[0].accessory && prefixIds.Contains(42))
prefixIds.Remove(76);
if (prefixIds.Count == 1)
prefix = prefixIds[0];
}
if (items.Count == 0) if (items.Count == 0)
{ {
args.Player.SendErrorMessage("Invalid item type!"); args.Player.SendErrorMessage("Invalid item type!");
@ -5269,6 +5253,23 @@ namespace TShockAPI
else else
{ {
var item = items[0]; var item = items[0];
if (args.Parameters.Count == 2)
{
int.TryParse(args.Parameters[0], out itemAmount);
var prefixIds = TShock.Utils.GetPrefixByIdOrName(args.Parameters[1]);
if (item.accessory && prefixIds.Contains(42))
{
prefixIds.Remove(42);
prefixIds.Remove(76);
prefixIds.Add(76);
}
else if (!item.accessory && prefixIds.Contains(42))
prefixIds.Remove(76);
if (prefixIds.Count == 1)
prefix = prefixIds[0];
}
if (item.type >= 1 && item.type < Main.maxItemTypes) if (item.type >= 1 && item.type < Main.maxItemTypes)
{ {
var players = TShock.Utils.FindPlayer(plStr); var players = TShock.Utils.FindPlayer(plStr);