diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1697775c..e3f434b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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)  
diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs
index 3c2d7c23..b79d59c5 100644
--- a/TShockAPI/Bouncer.cs
+++ b/TShockAPI/Bouncer.cs
@@ -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>
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index 7942fe87..407c5458 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit 7942fe87e30e0c42c311848e95cde9100d08ae8d
+Subproject commit 407c54586498b6f429237664f4039a9496c21d4a