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

dmg -> damage

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-15 21:43:21 -07:00
parent 007c685c19
commit d03e899452
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
TShockAPI/Bouncer.cs
View file

@ -66,7 +66,7 @@ namespace TShockAPI
{ {
short id = args.ID; short id = args.ID;
byte direction = args.Direction; byte direction = args.Direction;
short dmg = args.Damage; short damage = args.Damage;
float knockback = args.Knockback; float knockback = args.Knockback;
byte crit = args.Critical; byte crit = args.Critical;
@ -76,7 +76,7 @@ namespace TShockAPI
return; return;
} }
if (dmg > TShock.Config.MaxDamage && !args.Player.HasPermission(Permissions.ignoredamagecap)) if (damage > TShock.Config.MaxDamage && !args.Player.HasPermission(Permissions.ignoredamagecap))
{ {
if (TShock.Config.KickOnDamageThresholdBroken) if (TShock.Config.KickOnDamageThresholdBroken)
{ {
@ -122,7 +122,7 @@ namespace TShockAPI
internal void OnPlayerDamage(object sender, GetDataHandlers.PlayerDamageEventArgs args) internal void OnPlayerDamage(object sender, GetDataHandlers.PlayerDamageEventArgs args)
{ {
byte id = args.ID; byte id = args.ID;
short dmg = args.Damage; short damage = args.Damage;
bool pvp = args.PVP; bool pvp = args.PVP;
bool crit = args.Critical; bool crit = args.Critical;
byte direction = args.Direction; byte direction = args.Direction;
@ -133,7 +133,7 @@ namespace TShockAPI
return; return;
} }
if (dmg > TShock.Config.MaxDamage && !args.Player.HasPermission(Permissions.ignoredamagecap) && id != args.Player.Index) if (damage > TShock.Config.MaxDamage && !args.Player.HasPermission(Permissions.ignoredamagecap) && id != args.Player.Index)
{ {
if (TShock.Config.KickOnDamageThresholdBroken) if (TShock.Config.KickOnDamageThresholdBroken)
{ {
@ -758,14 +758,14 @@ namespace TShockAPI
/// <param name="args">The packet arguments that the event has.</param> /// <param name="args">The packet arguments that the event has.</param>
internal void OnKillMe(object sender, GetDataHandlers.KillMeEventArgs args) internal void OnKillMe(object sender, GetDataHandlers.KillMeEventArgs args)
{ {
short dmg = args.Damage; short damage = args.Damage;
short id = args.PlayerId; short id = args.PlayerId;
PlayerDeathReason playerDeathReason = args.PlayerDeathReason; PlayerDeathReason playerDeathReason = args.PlayerDeathReason;
if (dmg > 20000) //Abnormal values have the potential to cause infinite loops in the server. if (damage > 20000) //Abnormal values have the potential to cause infinite loops in the server.
{ {
TShock.Utils.ForceKick(args.Player, "Crash Exploit Attempt", true); TShock.Utils.ForceKick(args.Player, "Crash Exploit Attempt", true);
TShock.Log.ConsoleError("Death Exploit Attempt: Damage {0}", dmg); TShock.Log.ConsoleError("Death Exploit Attempt: Damage {0}", damage);
args.Handled = true; args.Handled = true;
return; return;
} }
@ -797,7 +797,7 @@ namespace TShockAPI
Vector2 pos = args.Position; Vector2 pos = args.Position;
Vector2 vel = args.Velocity; Vector2 vel = args.Velocity;
float knockback = args.Knockback; float knockback = args.Knockback;
short dmg = args.Damage; short damage = args.Damage;
byte owner = args.Owner; byte owner = args.Owner;
short type = args.Type; short type = args.Type;
int index = args.Index; int index = args.Index;
@ -818,7 +818,7 @@ namespace TShockAPI
return; return;
} }
if (dmg > TShock.Config.MaxProjDamage && !args.Player.HasPermission(Permissions.ignoredamagecap)) if (damage > TShock.Config.MaxProjDamage && !args.Player.HasPermission(Permissions.ignoredamagecap))
{ {
args.Player.Disable(String.Format("Projectile damage is higher than {0}.", TShock.Config.MaxProjDamage), DisableFlags.WriteToLogAndConsole); args.Player.Disable(String.Format("Projectile damage is higher than {0}.", TShock.Config.MaxProjDamage), DisableFlags.WriteToLogAndConsole);
args.Player.RemoveProjectile(ident, owner); args.Player.RemoveProjectile(ident, owner);