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

Merge pull request #2130 from Quinci135/patch-3

Browse source 
Added 1.4.1.0 player inflicted debuffs to bouncer
This commit is contained in:
Chris 2020-10-15 19:00:41 +10:30 • committed by GitHub
commit 1720301212
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 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

@ -15,6 +15,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
## Upcoming changes
* Added Gravedigger's Shovel support. (@Zennos)
* You can now start up multiple TShock servers at once without getting a startup error. (@ZakFahey)
* Updated bouncer to include new Magma Stone, Frost Armor, and Spinal Tap inflicted npc debuffs to bouncer. (@Quinci135)
## TShock 4.4.0 (Pre-release 12)
* Fixed various bugs related to Snake Charmer's Flute. (@rustly)

5
TShockAPI/Bouncer.cs
View file

@ -2099,7 +2099,10 @@ namespace TShockAPI
{ BuffID.ThornWhipNPCDebuff, 240 }, // BuffID: 315
{ BuffID.RainbowWhipNPCDebuff, 240 }, // BuffID: 316
{ BuffID.MaceWhipNPCDebuff, 240 }, // BuffID: 319
{ BuffID.GelBalloonBuff, 1800 } // BuffID: 320
{ BuffID.GelBalloonBuff, 1800 }, // BuffID: 320
{ BuffID.OnFire3, 360 }, // BuffID: 323
{ BuffID.Frostburn2, 900 }, // BuffID: 324
{ BuffID.BoneWhipNPCDebuff, 240 } // BuffID: 326
};
/// <summary>

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit 7942fe87e30e0c42c311848e95cde9100d08ae8d
Subproject commit 407c54586498b6f429237664f4039a9496c21d4a