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

Re-add prefix name support to /item and /give

Browse source
This commit is contained in:
Deathmax 2011-12-16 17:07:17 +08:00
parent 905538de30
commit 08295343d7
2 changed files with 12 additions and 13 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 id]", Color.Red); args.Player.SendMessage("Invalid syntax! Proper syntax: /item <item name/id> [item amount] [prefix id/name]", 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);
int.TryParse(args.Parameters[2], out prefix); var found = TShock.Utils.GetPrefixByIdOrName(args.Parameters[2]);
if (prefix < 0 || prefix > 83) if (found.Count == 1)
prefix = 0; prefix = found[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]", Color.Red); args.Player.SendMessage("Invalid syntax! Proper syntax: /give <item type/id> <player> [item amount] [prefix id/name]", 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);
int.TryParse(args.Parameters[1], out prefix); var found = TShock.Utils.GetPrefixByIdOrName(args.Parameters[1]);
if (prefix < 0 || prefix > 83) if (found.Count == 1)
prefix = 0; prefix = found[0];
} }
if (items.Count == 0) if (items.Count == 0)

9
TShockAPI/Utils.cs
View file

@ -343,11 +343,11 @@ namespace TShockAPI
public List<int> GetPrefixByName(string name) public List<int> GetPrefixByName(string name)
{ {
Item item = new Item(); Item item = new Item();
item.SetDefaults(0);
for (int i = 1; i < 83; i++) for (int i = 1; i < 83; i++)
{ {
item.prefix = (byte) i; item.prefix = (byte) i;
item.AffixName(); if (item.AffixName().Trim() == name)
if (item.name.Trim() == name)
return new List<int> { i }; return new List<int> { i };
} }
var found = new List<int>(); var found = new List<int>();
@ -356,10 +356,9 @@ namespace TShockAPI
try try
{ {
item.prefix = (byte) i; item.prefix = (byte) i;
item.AffixName(); if (item.AffixName().Trim().ToLower() == name.ToLower())
if (item.name.Trim().ToLower() == name.ToLower())
return new List<int> { i }; return new List<int> { i };
if (item.name.Trim().ToLower().StartsWith(name.ToLower())) if (item.AffixName().Trim().ToLower().StartsWith(name.ToLower()))
found.Add(i); found.Add(i);
} }
catch { } catch { }