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

Fix anti dead protection, some item bans, and default configs.

Browse source
This commit is contained in:
Zidonuke 2011-12-29 02:50:05 -05:00
parent bbf1818512
commit 6353f9c877
4 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
TShockAPI/GetDataHandlers.cs
View file

@ -597,7 +597,7 @@ namespace TShockAPI
args.Player.SendTileSquare(tileX, tileY);
return true;
}
if (tiletype == 48 && !args.Player.Group.HasPermission(Permissions.usebanneditem) && TShock.Itembans.ItemIsBanned("Spikes", args.Player))
if (tiletype == 48 && !args.Player.Group.HasPermission(Permissions.usebanneditem) && TShock.Itembans.ItemIsBanned("Spike", args.Player))
{
args.Player.SendTileSquare(tileX, tileY);
return true;
@ -757,6 +757,11 @@ namespace TShockAPI
return true;
}
if (args.Player.Dead)
{
return true;
}
if (!args.Player.Group.HasPermission(Permissions.ignorenoclipdetection) && Collision.SolidCollision(pos, args.TPlayer.width, args.TPlayer.height))
{
int lastTileX = (int)(args.Player.LastNetPosition.X / 16f);
@ -959,9 +964,7 @@ namespace TShockAPI
}
args.Player.LastDeath = DateTime.Now;
if (args.Player.Difficulty != 2)
args.Player.ForceSpawn = true;
args.Player.Dead = true;
return false;
}
@ -1107,7 +1110,7 @@ namespace TShockAPI
else
args.Player.InitSpawn = true;
args.Player.ForceSpawn = false;
args.Player.Dead = false;
return false;
}