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

Remove name support for prefixes

Browse source 
Searching by name causes a null exception
This commit is contained in:
Deathmax 2011-12-16 09:06:33 +08:00
parent b23b6789f2
commit d3e0acacaa
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
TShockAPI/Commands.cs
View file

@ -2497,7 +2497,7 @@ namespace TShockAPI
{ {
if (args.Parameters.Count < 1) if (args.Parameters.Count < 1)
{ {
args.Player.SendMessage("Invalid syntax! Proper syntax: /item <item name/id> [item amount] [prefix name/id]", Color.Red); args.Player.SendMessage("Invalid syntax! Proper syntax: /item <item name/id> [item amount] [prefix id]", Color.Red);
return; return;
} }
if (args.Parameters[0].Length == 0) if (args.Parameters[0].Length == 0)
@ -2512,9 +2512,9 @@ namespace TShockAPI
else if (args.Parameters.Count == 3) else if (args.Parameters.Count == 3)
{ {
int.TryParse(args.Parameters[1], out itemAmount); int.TryParse(args.Parameters[1], out itemAmount);
var found = TShock.Utils.GetPrefixByIdOrName(args.Parameters[2]); int.TryParse(args.Parameters[2], out prefix);
if (found.Count == 1) if (prefix < 0 || prefix > 83)
prefix = found[0]; prefix = 0;
} }
var items = TShock.Utils.GetItemByIdOrName(args.Parameters[0]); var items = TShock.Utils.GetItemByIdOrName(args.Parameters[0]);
if (items.Count == 0) if (items.Count == 0)
@ -2553,7 +2553,7 @@ namespace TShockAPI
{ {
if (args.Parameters.Count < 2) if (args.Parameters.Count < 2)
{ {
args.Player.SendMessage("Invalid syntax! Proper syntax: /give <item type/id> <player> [item amount] [prefix id/name]", Color.Red); args.Player.SendMessage("Invalid syntax! Proper syntax: /give <item type/id> <player> [item amount] [prefix id]", Color.Red);
return; return;
} }
if (args.Parameters[0].Length == 0) if (args.Parameters[0].Length == 0)
@ -2577,9 +2577,9 @@ namespace TShockAPI
else if (args.Parameters.Count == 2) else if (args.Parameters.Count == 2)
{ {
int.TryParse(args.Parameters[0], out itemAmount); int.TryParse(args.Parameters[0], out itemAmount);
var found = TShock.Utils.GetPrefixByIdOrName(args.Parameters[1]); int.TryParse(args.Parameters[1], out prefix);
if (found.Count == 1) if (prefix < 0 || prefix > 83)
prefix = found[0]; prefix = 0;
} }
if (items.Count == 0) if (items.Count == 0)

1
TShockAPI/TSPlayer.cs
View file

@ -277,6 +277,7 @@ namespace TShockAPI
Main.item[itemid].wet = Collision.WetCollision(Main.item[itemid].position, Main.item[itemid].width, Main.item[itemid].height); Main.item[itemid].wet = Collision.WetCollision(Main.item[itemid].position, Main.item[itemid].width, Main.item[itemid].height);
Main.item[itemid].stack = stack; Main.item[itemid].stack = stack;
Main.item[itemid].owner = Index; Main.item[itemid].owner = Index;
Main.item[itemid].prefix = (byte) prefix;
NetMessage.SendData((int)PacketTypes.ItemDrop, -1, -1, "", itemid, 0f, 0f, 0f); NetMessage.SendData((int)PacketTypes.ItemDrop, -1, -1, "", itemid, 0f, 0f, 0f);
NetMessage.SendData((int)PacketTypes.ItemOwner, -1, -1, "", itemid, 0f, 0f, 0f); NetMessage.SendData((int)PacketTypes.ItemOwner, -1, -1, "", itemid, 0f, 0f, 0f);
} }