diff --git a/CHANGELOG.md b/CHANGELOG.md index d4590865..2c49d81f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * Fixed player not being checked for permissions to use the Shellphone (Ocean), Shellphone (Underworld) and Shellphone (Spawn). (@hufang360) * Updated to OTAPI 3.1.10-alpha, which allows FreeBSD .NET 6 to use Re-Logic's Linux platform. (@SignatureBeef) * Update Github CI to not tarball files for Windows only (@PotatoCider) +* 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. (@PotatoCider) 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 }; ///