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

Merge branch 'general-devel' of github.com:TShock/TShock into general-devel

Browse source
This commit is contained in:
high 2011-06-28 10:32:25 -04:00
commit ae1e16de10
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/GetDataHandlers.cs
View file

@ -397,10 +397,10 @@ namespace TShockAPI
private static bool HandlePlayerDamage(GetDataHandlerArgs args)
{
byte playerid = args.Data.ReadInt8();
if (playerid >= 0 && playerid <= Main.maxPlayers && TShock.Players[playerid] != null)
if (playerid >= 0 && playerid <= Main.maxPlayers)
return !TShock.Players[playerid].TPlayer.hostile;
return ConfigurationManager.PermaPvp;
else
return true;
}
private static bool HandleLiquidSet(GetDataHandlerArgs args)

13
TShockAPI/TShock.cs
View file

@ -37,7 +37,7 @@ namespace TShockAPI
public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version;
public static readonly string VersionCodename = "Lol, packet changes.";
public static readonly string SavePath = "tshock";
public static string SavePath = "tshock";
public static TSPlayer[] Players = new TSPlayer[Main.maxPlayers];
public static BanManager Bans = new BanManager(Path.Combine(SavePath, "bans.txt"));
@ -167,6 +167,15 @@ namespace TShockAPI
Console.WriteLine("Bad IP: {0}", parms[i]);
}
}
if (parms[i].ToLower() == "-configpath")
{
var path = parms[++i];
if (path.IndexOfAny(Path.GetInvalidPathChars()) == -1)
{
SavePath = path;
Log.ConsoleInfo("Config path has been set to " + path);
}
}
}
}
@ -223,7 +232,7 @@ namespace TShockAPI
if (!player.Group.HasPermission("usebanneditem"))
{
var inv = Main.player[player.Index].inventory;
var inv = player.TPlayer.inventory;
for (int i = 0; i < inv.Length; i++)
{
if (inv[i] != null && ItemManager.ItemIsBanned(inv[i].name))