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

Merge remote-tracking branch 'stealownz/fix/inferno-fork-onnpcaddbuff-kick' into general-devel

Browse source
This commit is contained in:
Lucas Nicodemus 2022-10-14 23:10:45 -07:00
commit 980ceeb4a1
No known key found for this signature in database
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -39,6 +39,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* In OTAPI 3.1.11-alpha, chest stacking was fixed. (@SignatureBeef) * In OTAPI 3.1.11-alpha, chest stacking was fixed. (@SignatureBeef)
* In OTAPI 3.1.12-alpha, "server world deletions" were fixed. (@SignatureBeef) * In OTAPI 3.1.12-alpha, "server world deletions" were fixed. (@SignatureBeef)
* Fixed NetTile errors by implementing new packet read/write data. (@SignatureBeef) * Fixed NetTile errors by implementing new packet read/write data. (@SignatureBeef)
* Fixed Inferno Fork causing kick from rejected abnormal buff. (@Stealownz)
## 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)

2
TShockAPI/Bouncer.cs
View file

@ -2527,7 +2527,7 @@ namespace TShockAPI
{ BuffID.RainbowWhipNPCDebuff, 240 }, // BuffID: 316 { BuffID.RainbowWhipNPCDebuff, 240 }, // BuffID: 316
{ BuffID.MaceWhipNPCDebuff, 240 }, // BuffID: 319 { BuffID.MaceWhipNPCDebuff, 240 }, // BuffID: 319
{ BuffID.GelBalloonBuff, 1800 }, // BuffID: 320 { BuffID.GelBalloonBuff, 1800 }, // BuffID: 320
{ BuffID.OnFire3, 360 }, // BuffID: 323 { BuffID.OnFire3, 960 }, // 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