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

Merge pull request #331 from k0rd/general-devel

Browse source 
Fix for skeletron prime disabling players & new config option to ignore shrapnel
This commit is contained in:
Zack 2012-01-23 09:41:55 -08:00
commit 1666c657d6
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TShockAPI/ConfigFile.cs
View file

@ -175,6 +175,9 @@ namespace TShockAPI
[Description("Disable a player if they exceed this number of projectile new within 1 second.")] public int [Description("Disable a player if they exceed this number of projectile new within 1 second.")] public int
ProjectileThreshold = 50; ProjectileThreshold = 50;
[Description("Ignore shrapnel from crystal bullets for Projectile Threshold.")] public bool
ProjIgnoreShrapnel = true;
[Description("Require all players to register or login before being allowed to play.")] public bool RequireLogin; [Description("Require all players to register or login before being allowed to play.")] public bool RequireLogin;
[Description( [Description(

14
TShockAPI/GetDataHandlers.cs
View file

@ -1915,9 +1915,16 @@ namespace TShockAPI
} }
if (!TShock.Config.IgnoreProjUpdate && TShock.CheckProjectilePermission(args.Player, index, type)) if (!TShock.Config.IgnoreProjUpdate && TShock.CheckProjectilePermission(args.Player, index, type))
{
if (type == 100)
{ //fix for skele prime
Log.Debug("Skeletron Prime's death laser ignored for cheat detection..");
}
else
{ {
args.Player.Disable("Does not have projectile permission to update projectile."); args.Player.Disable("Does not have projectile permission to update projectile.");
args.Player.RemoveProjectile(ident, owner); args.Player.RemoveProjectile(ident, owner);
}
return true; return true;
} }
@ -1935,9 +1942,16 @@ namespace TShockAPI
} }
if (!args.Player.Group.HasPermission(Permissions.ignoreprojectiledetection)) if (!args.Player.Group.HasPermission(Permissions.ignoreprojectiledetection))
{
if ((type ==90) && (TShock.Config.ProjIgnoreShrapnel))// ignore shrapnel
{
Log.Debug("Ignoring shrapnel per config..");
}
else
{ {
args.Player.ProjectileThreshold++; args.Player.ProjectileThreshold++;
} }
}
return false; return false;
} }