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

Merge pull request #2299 from moisterrific/patch-20

Browse source 
Update HealOtherPlayer check to respect ignoredamagecap permission
This commit is contained in:
Chris 2021-05-13 17:43:34 +09:30 • committed by GitHub
commit 356cdaa7ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -15,6 +15,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
## Upcoming changes ## Upcoming changes
* Added permissions for using Teleportation Potions, Magic Conch, and Demon Conch. (@drunderscore) * Added permissions for using Teleportation Potions, Magic Conch, and Demon Conch. (@drunderscore)
* `tshock.tp.tppotion`, `tshock.tp.magicconch`, and `tshock.tp.demonconch` respectively. * `tshock.tp.tppotion`, `tshock.tp.magicconch`, and `tshock.tp.demonconch` respectively.
* Updated HealOtherPlayer damage check to make more sense by respecting `ignoredamagecap` permission. (@moisterrific)
## TShock 4.5.2 ## TShock 4.5.2
* Added preliminary support for Terraria 1.4.2.2. (@hakusaro) * Added preliminary support for Terraria 1.4.2.2. (@hakusaro)

2
TShockAPI/Bouncer.cs
View file

@ -1603,7 +1603,7 @@ namespace TShockAPI
// Why 0.2? // Why 0.2?
// @bartico6: Because heal other player only happens when you are using the spectre armor with the hood, // @bartico6: Because heal other player only happens when you are using the spectre armor with the hood,
// and the healing you can do with that is 20% of your damage. // and the healing you can do with that is 20% of your damage.
if (amount >= TShock.Config.Settings.MaxDamage * 0.2) if (amount >= TShock.Config.Settings.MaxDamage * 0.2 && !args.Player.HasPermission(Permissions.ignoredamagecap))
{ {
TShock.Log.ConsoleDebug("Bouncer / OnHealOtherPlayer 0.2 check from {0}", args.Player.Name); TShock.Log.ConsoleDebug("Bouncer / OnHealOtherPlayer 0.2 check from {0}", args.Player.Name);
args.Player.Disable("HealOtherPlayer cheat attempt!", DisableFlags.WriteToLogAndConsole); args.Player.Disable("HealOtherPlayer cheat attempt!", DisableFlags.WriteToLogAndConsole);