From bd704957741e5ef9ebcb2ad1fa3932cf98c82a8d Mon Sep 17 00:00:00 2001 From: SGKoishi Date: Sun, 6 Nov 2022 11:45:02 -0800 Subject: [PATCH 1/2] Allow Torch God's Facor to place biome torch and campfire --- TShockAPI/Bouncer.cs | 13 +++++++++---- docs/changelog.md | 4 ++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs index edc1b2f7..c962c4a5 100644 --- a/TShockAPI/Bouncer.cs +++ b/TShockAPI/Bouncer.cs @@ -2303,10 +2303,15 @@ namespace TShockAPI if (args.Player.SelectedItem.placeStyle != style) { - TShock.Log.ConsoleError(GetString("Bouncer / OnPlaceObject rejected object placement with invalid style from {0}", args.Player.Name)); - args.Player.SendTileSquareCentered(x, y, 4); - args.Handled = true; - return; + var validTorch = args.Player.SelectedItem.createTile == TileID.Torches && args.Player.TPlayer.BiomeTorchPlaceStyle(args.Player.SelectedItem.placeStyle) == style; + var validCampfire = args.Player.SelectedItem.createTile == TileID.Campfire && args.Player.TPlayer.BiomeCampfirePlaceStyle(args.Player.SelectedItem.placeStyle) == style; + if (!args.Player.TPlayer.unlockedBiomeTorches || (!validTorch && !validCampfire)) + { + TShock.Log.ConsoleError(GetString("Bouncer / OnPlaceObject rejected object placement with invalid style {1} (expected {2}) from {0}", args.Player.Name, style, args.Player.SelectedItem.placeStyle)); + args.Player.SendTileSquareCentered(x, y, 4); + args.Handled = true; + return; + } } } diff --git a/docs/changelog.md b/docs/changelog.md index a2e64843..a67d9759 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -17,6 +17,10 @@ Use past tense when adding new entries; sign your name off when you add or chang ## Upcoming changes * Fixed item giving potentially dropping too many items (@PotatoCider, @punchready) * Excluded GeoIP.dat from release bundle (@SignatureBeef) +* Allowed Torch God's Favor to place different types of torches and campfires (@sgkoishi, #2811) +* Allowed Crystal Shard to grow (@sgkoishi, @cc004, SignatureBeef/Open-Terraria-API#96) +* Allowed the use of Aether Monolith (@sgkoishi, #2801) +* Added permission for summoning Mechdusa, Deerclops and slime pet (@sgkoishi, #2808) ## TShock 5.0.0 * Reduced load/save console spam. (@SignatureBeef, @YehnBeep) From 287bb84f07e04eb0034e688221cfa8b977db313a Mon Sep 17 00:00:00 2001 From: Stargazing Koishi Date: Mon, 7 Nov 2022 11:37:35 -0800 Subject: [PATCH 2/2] Update changelog --- docs/changelog.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index a67d9759..6781046f 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -19,8 +19,6 @@ Use past tense when adding new entries; sign your name off when you add or chang * Excluded GeoIP.dat from release bundle (@SignatureBeef) * Allowed Torch God's Favor to place different types of torches and campfires (@sgkoishi, #2811) * Allowed Crystal Shard to grow (@sgkoishi, @cc004, SignatureBeef/Open-Terraria-API#96) -* Allowed the use of Aether Monolith (@sgkoishi, #2801) -* Added permission for summoning Mechdusa, Deerclops and slime pet (@sgkoishi, #2808) ## TShock 5.0.0 * Reduced load/save console spam. (@SignatureBeef, @YehnBeep)