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

6
TShockAPI/TShock.cs
View file

@ -528,7 +528,7 @@ namespace TShockAPI
{
player.ProjectileThreshold = 0;
}
if (player.ForceSpawn && (DateTime.Now - player.LastDeath).Seconds >= 3)
if (player.Dead && (DateTime.Now - player.LastDeath).Seconds >= 3 && player.Difficulty != 2)
{
player.Spawn();
}
@ -761,7 +761,7 @@ namespace TShockAPI
return;
}
if ((player.State < 10 || player.ForceSpawn) && (int)type > 12 && (int)type != 16 && (int)type != 42 && (int)type != 50 && (int)type != 38)
if ((player.State < 10 || player.Dead) && (int)type > 12 && (int)type != 16 && (int)type != 42 && (int)type != 50 && (int)type != 38)
{
e.Handled = true;
return;
@ -1016,7 +1016,7 @@ namespace TShockAPI
return true;
}
if (type == 17 && !player.Group.HasPermission(Permissions.usebanneditem) && TShock.Itembans.ItemIsBanned("Dirt Wand", player)) //Dirt Wand Projectile
if (type == 17 && !player.Group.HasPermission(Permissions.usebanneditem) && TShock.Itembans.ItemIsBanned("Dirt Rod", player)) //Dirt Rod Projectile
{
return true;
}