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

Quick fixes to new features.

Browse source
This commit is contained in:
Zidonuke 2011-12-20 17:40:04 -05:00
parent 318bbac56a
commit 7c09a174e8
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/GetDataHandlers.cs
View file

@ -571,10 +571,14 @@ namespace TShockAPI
float distance = Vector2.Distance(new Vector2((pos.X / 16f), (pos.Y / 16f)), new Vector2(Main.spawnTileX, Main.spawnTileY));
if (TShock.CheckIgnores(args.Player) && distance > 6f)
{
if (TShock.Config.AlwaysPvP)
if (TShock.Config.AlwaysPvP && !args.TPlayer.hostile)
{
args.Player.SendMessage("PvP is forced! Enable PvP else you can't move or do anything!", Color.Red);
}
else if (TShock.Config.ServerSideInventory && !args.Player.IsLoggedIn)
{
args.Player.SendMessage("Server Side Inventory is enabled! Please /register or /login to play!", Color.Red);
}
args.Player.Spawn();
return true;
}