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 into test

Browse source
This commit is contained in:
high 2011-06-27 01:52:39 -04:00
commit 9d2db09ae7
8 changed files with 6 additions and 404 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.3.0.0625")]
[assembly: AssemblyFileVersion("2.3.0.0625")]
[assembly: AssemblyVersion("2.3.0.0627")]
[assembly: AssemblyFileVersion("2.3.0.0627")]

7
TShockAPI/TShock.cs
View file

@ -220,11 +220,12 @@ namespace TShockAPI
if (!player.Group.HasPermission("usebanneditem"))
{
for (int i = 0; i < Main.player[player.Index].inventory.Length; i++)
var inv = Main.player[player.Index].inventory;
for (int i = 0; i < inv.Length; i++)
{
if (ItemManager.ItemIsBanned(Main.player[player.Index].inventory[i].name))
if (inv[i] != null && ItemManager.ItemIsBanned(inv[i].name))
{
player.Disconnect("Using banned item: " + Main.player[player.Index].inventory[i].name + ", remove it and rejoin");
player.Disconnect("Using banned item: " + inv[i].name + ", remove it and rejoin");
break;
}
}