From d8aa7b0f69ec66aaa46a302f70048d00838a6a58 Mon Sep 17 00:00:00 2001 From: stacey <57187883+moisterrific@users.noreply.github.com> Date: Mon, 13 Sep 2021 10:02:03 -0400 Subject: [PATCH 1/4] Change RespawnSeconds & RespawnBossSeconds to use default a value of 0 will use the default time based on selected difficulty --- TShockAPI/Configuration/TShockConfig.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/TShockAPI/Configuration/TShockConfig.cs b/TShockAPI/Configuration/TShockConfig.cs index 14e56cb6..38ed0c46 100644 --- a/TShockAPI/Configuration/TShockConfig.cs +++ b/TShockAPI/Configuration/TShockConfig.cs @@ -251,13 +251,13 @@ namespace TShockAPI.Configuration [Description("Allows groups on the banned item allowed list to spawn banned items even if PreventBannedItemSpawn is set to true.")] public bool AllowAllowedGroupsToSpawnBannedItems = false; - /// The number of seconds a player must wait before being respawned. Cannot be longer than normal value now. Use at your own risk. - [Description("The number of seconds a player must wait before being respawned. Cannot be longer than normal value now. Use at your own risk.")] - public int RespawnSeconds = 10; + /// The number of seconds a player must wait before being respawned. Valid range: 0 (default) to 15 seconds. Use at your own risk. + [Description("The number of seconds a player must wait before being respawned. Valid range: 0 (default) to 15 seconds. Use at your own risk.")] + public int RespawnSeconds = 0; - /// The number of seconds a player must wait before being respawned if there is a boss nearby. Cannot be longer than normal value now. Use at your own risk. - [Description("The number of seconds a player must wait before being respawned if there is a boss nearby. Cannot be longer than normal value now. Use at your own risk.")] - public int RespawnBossSeconds = 10; + /// The number of seconds a player must wait before being respawned if there is a boss nearby. Valid range: 0 (default) to 30 seconds. Use at your own risk. + [Description("The number of seconds a player must wait before being respawned if there is a boss nearby. Valid range: 0 (default) to 30 seconds. Use at your own risk.")] + public int RespawnBossSeconds = 0; /// Whether or not to announce boss spawning or invasion starts. [Description("Whether or not to announce boss spawning or invasion starts.")] From 8ce61c1e0154afd35942f2e81c4f24a56eb6138e Mon Sep 17 00:00:00 2001 From: stacey <57187883+moisterrific@users.noreply.github.com> Date: Mon, 13 Sep 2021 10:04:06 -0400 Subject: [PATCH 2/4] Add RespawnSeconds change to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f007a22c..f962e669 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * Added a notification message and silent command support for permanently changing a target player's user group. Now players who received a group change will be notified of their new group if they are currently online. (@moisterrific, @QuiCM) * Changed the TSPlayer IP method to return the loopback IP if RealPlayer is false. (@Rozen4334) * Fixed a bug that caused sundials to be ignored all the time, instead of only when the player has no permission or time is frozen. (@Rozen4334) +* Changed `RespawnSeconds` and `RespawnBossSeconds` from `10` to `0` to respect the game's default respawn timers. (@moisterrific) ## TShock 4.5.5 * Changed the world autosave message so that it no longer warns of a "potential lag spike." (@hakusaro) From f7effe9c822119e93ec98b30d95a333257b298d1 Mon Sep 17 00:00:00 2001 From: Nezbednik <47603275+NezbednikSK@users.noreply.github.com> Date: Sat, 13 Nov 2021 08:37:15 +0100 Subject: [PATCH 3/4] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2dd705ce..93d08ba6 100644 --- a/README.md +++ b/README.md @@ -212,7 +212,7 @@ You need to re-run the patcher any time `OTAPI` updates. You need to rebuild `Te 1. Verify that non-zero modifications ran successfully. Then, build the Terraria Server API executable. - $ cd ./../../../ + $ cd ../../../../ $ xbuild ./TerrariaServerAPI/TerrariaServerAPI/TerrariaServerAPI.csproj \ /p:Configuration=$BUILD_MODE @@ -220,13 +220,13 @@ You need to re-run the patcher any time `OTAPI` updates. You need to rebuild `Te ##### TShock -1. Perform a NuGet restore in `TShockAPI` folder that contains `TShockAPI.sln`. +1. Perform a NuGet restore in the folder that contains `TShock.sln`. $ mono ~/bin/nuget.exe restore 1. Build TShock in the `BUILD_MODE` you set earlier. - $ xbuild ./TShockAPI.sln /p:Configuration=$BUILD_MODE + $ xbuild ./TShock.sln /p:Configuration=$BUILD_MODE You're done! From 5bf36fd799e4c73ed3c0b8cb8f79c28a3babcdfe Mon Sep 17 00:00:00 2001 From: Nezbednik <47603275+NezbednikSK@users.noreply.github.com> Date: Sat, 13 Nov 2021 08:46:14 +0100 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f007a22c..af12b9d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * If there is no section called "Upcoming changes" below this line, please add one with `## Upcoming changes` as the first line, and then a bulleted item directly after with the first change. ## Upcoming changes +* Updated Linux guide. (@NezbednikSK) * Fixed SendTileRectHandler not sending tile rect updates like Pylons/Mannequins to other clients. (@Stealownz) * Introduced `SoftcoreOnly` config option to allow only softcore characters to connect. (@drunderscore) * Fixed some typos that have been in the repository for over a lustrum. (@Killia0)