From c1edbea1a21c4c2ef207dd50f85c8cd9727e8c7d Mon Sep 17 00:00:00 2001 From: James Puleo Date: Fri, 7 Oct 2022 18:24:06 -0400 Subject: [PATCH 1/2] Allow Blood Butcherer and Shimmer buffs to be applied to NPCs by players --- TShockAPI/Bouncer.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs index 469b6ee9..8b46d17d 100644 --- a/TShockAPI/Bouncer.cs +++ b/TShockAPI/Bouncer.cs @@ -1739,7 +1739,8 @@ namespace TShockAPI if (npc.townNPC && npc.netID != NPCID.Guide && npc.netID != NPCID.Clothier) { if (type != BuffID.Lovestruck && type != BuffID.Stinky && type != BuffID.DryadsWard && - type != BuffID.Wet && type != BuffID.Slimed && type != BuffID.GelBalloonBuff && type != BuffID.Frostburn2) + type != BuffID.Wet && type != BuffID.Slimed && type != BuffID.GelBalloonBuff && type != BuffID.Frostburn2 && + type != BuffID.Shimmer) { detectedNPCBuffTimeCheat = true; } @@ -2529,7 +2530,9 @@ namespace TShockAPI { BuffID.OnFire3, 360 }, // BuffID: 323 { BuffID.Frostburn2, 900 }, // BuffID: 324 { BuffID.BoneWhipNPCDebuff, 240 }, // BuffID: 326 - { BuffID.TentacleSpike, 540 } // BuffID: 337 + { BuffID.TentacleSpike, 540 }, // BuffID: 337 + { BuffID.BloodButcherer, 540 }, // BuffID: 344 + { BuffID.Shimmer, 100 }, // BuffID: 353 }; /// From daff6758440cf13154884459eeb94087f4ce4142 Mon Sep 17 00:00:00 2001 From: James Puleo Date: Fri, 7 Oct 2022 18:24:50 -0400 Subject: [PATCH 2/2] Update `CHANGELOD.md` --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d651ce6d..1e665432 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 * Fixed painting wall/tile being rejected from hand of creation. (@Rozen4334) * Added a second `Utils.TryParseTime` method for parsing large, positive time spans. (@punchready) * Fixed `/tempgroup` breaking on durations greater than roughly 24 days. (@punchready) +* Allow Blood Butcherer and Shimmer buffs to be applied to NPCs by players (@drunderscore) ## TShock 4.5.18 * Fixed `TSPlayer.GiveItem` not working if the player is in lava. (@gohjoseph)