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

Merge remote-tracking branch 'drunderscore/fix/new-add-buffs-to-npc' into general-devel

Browse source
This commit is contained in:
Lucas Nicodemus 2022-10-09 00:36:52 -07:00
commit 004ff63899
No known key found for this signature in database
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -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) * 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) * 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) * 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 ## TShock 4.5.18
* Fixed `TSPlayer.GiveItem` not working if the player is in lava. (@PotatoCider) * Fixed `TSPlayer.GiveItem` not working if the player is in lava. (@PotatoCider)

7
TShockAPI/Bouncer.cs
View file

@ -1739,7 +1739,8 @@ namespace TShockAPI
if (npc.townNPC && npc.netID != NPCID.Guide && npc.netID != NPCID.Clothier) if (npc.townNPC && npc.netID != NPCID.Guide && npc.netID != NPCID.Clothier)
{ {
if (type != BuffID.Lovestruck && type != BuffID.Stinky && type != BuffID.DryadsWard && 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; detectedNPCBuffTimeCheat = true;
} }
@ -2529,7 +2530,9 @@ namespace TShockAPI
{ BuffID.OnFire3, 360 }, // BuffID: 323 { BuffID.OnFire3, 360 }, // BuffID: 323
{ BuffID.Frostburn2, 900 }, // BuffID: 324 { BuffID.Frostburn2, 900 }, // BuffID: 324
{ BuffID.BoneWhipNPCDebuff, 240 }, // BuffID: 326 { 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
}; };
/// <summary> /// <summary>