From 6ca9a98a913a120f554f8cbbaccc70b382f7d873 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sun, 31 May 2020 13:11:01 -0700 Subject: [PATCH] Bump max player damage to 42,000 for empress of light Based on feedback from #1936, empress of light needs to do more damage, so we're going to boost it to a higher arbitrary number than it was before. --- CHANGELOG.md | 1 + TShockAPI/Bouncer.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 775dc6d3..e8c895eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * To add this command to your guest group, give them `tshock.synclocalarea`, with `/group addperm guest tshock.synclocalarea`. * This command may be removed at any time in the future (and will likely be removed when send tile square handling is fixed). * Fixed smart door automatic door desync and deletion issue. (@hakusaro) +* Bump default max damage received cap to 42,000 to accommodate the Empress of Light's instant kill death amount. (@hakusaro, @moisterrific, @Irethia, @Ayrawei) ## TShock 4.4.0 (Pre-release 8) * Update for OTAPI 2.0.0.36 and Terraria 1.4.0.4. (@hakusaro, @Patrikkk, @DeathCradle) diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs index fb7c7182..eb0cd7b0 100644 --- a/TShockAPI/Bouncer.cs +++ b/TShockAPI/Bouncer.cs @@ -2043,7 +2043,7 @@ namespace TShockAPI short id = args.PlayerId; PlayerDeathReason playerDeathReason = args.PlayerDeathReason; - if (damage > 20000) //Abnormal values have the potential to cause infinite loops in the server. + if (damage > 42000) //Abnormal values have the potential to cause infinite loops in the server. { TShock.Log.ConsoleDebug("Bouncer / OnKillMe rejected high damage from {0} {1}", args.Player.Name, damage); args.Player.Kick("Failed to shade polygon normals.", true, true);