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

Merge remote-tracking branch 'drunderscore/fix/whitelist-more-buffs' into general-devel

Browse source
This commit is contained in:
Lucas Nicodemus 2022-12-05 21:40:10 -08:00
commit 2606805073
No known key found for this signature in database
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/Bouncer.cs
View file

@ -400,7 +400,7 @@ namespace TShockAPI
}; };
PlayerAddBuffWhitelist[BuffID.OnFire3] = new BuffLimit PlayerAddBuffWhitelist[BuffID.OnFire3] = new BuffLimit
{ {
MaxTicks = 60 * 5, MaxTicks = 60 * 6,
CanBeAddedWithoutHostile = false, CanBeAddedWithoutHostile = false,
CanOnlyBeAppliedToSender = false CanOnlyBeAppliedToSender = false
}; };
@ -428,6 +428,12 @@ namespace TShockAPI
CanBeAddedWithoutHostile = true, CanBeAddedWithoutHostile = true,
CanOnlyBeAppliedToSender = true CanOnlyBeAppliedToSender = true
}; };
PlayerAddBuffWhitelist[BuffID.WindPushed] = new BuffLimit
{
MaxTicks = 2,
CanBeAddedWithoutHostile = true,
CanOnlyBeAppliedToSender = true
};
#endregion Whitelist #endregion Whitelist
} }

2
docs/changelog.md
View file

@ -86,6 +86,8 @@ Use past tense when adding new entries; sign your name off when you add or chang
* Allowed Digging Molecart and bomb fish to break tiles and place tracks (@sgkoishi) * Allowed Digging Molecart and bomb fish to break tiles and place tracks (@sgkoishi)
* Add built-in package management capabilities for plugins * Add built-in package management capabilities for plugins
* Fixed Super Sponge unable to absorb shimmer. (@sgkoishi, #2833) * Fixed Super Sponge unable to absorb shimmer. (@sgkoishi, #2833)
* Increased whitelisted duration of the Mighty Wind (`WindPushed`) buff (from sandstorms). (@drunderscore)
* Whitelisted the Hellfire (`OnFire3`) buff. (@drunderscore)
## TShock 5.1.3 ## TShock 5.1.3
* Added support for Terraria 1.4.4.9 via OTAPI 3.1.20. (@SignatureBeef) * Added support for Terraria 1.4.4.9 via OTAPI 3.1.20. (@SignatureBeef)