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

Merge branch 'master' of github.com:TShock/TShock

Browse source
This commit is contained in:
high 2011-06-10 19:47:40 -04:00
commit 022fd43660
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/TShock.cs
View file

@ -806,7 +806,7 @@ namespace TShockAPI
public static int GetNPCID(string name, bool exact = false)
{
NPC npc = new NPC();
for (int i = 1; i <= 45; i++)
for (int i = 1; i < Main.maxNPCTypes; i++)
{
if (exact)
{
@ -831,7 +831,7 @@ namespace TShockAPI
{
Item item = new Item();
name = name.ToLower();
for (int i = 1; i <= 238; i++)
for (int i = 1; i < Main.maxItemTypes; i++)
{
item.SetDefaults(i);
if (item.name.ToLower().StartsWith(name))