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

Merge branch 'general-devel' into feature/database

Browse source
This commit is contained in:
Sakura Isayeki 2025-05-09 12:10:38 +02:00 • committed by GitHub
commit f59095c848
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
.github/workflows/wiki-notify.yml vendored Normal file
View file

@ -0,0 +1,13 @@
name: Wiki Changed Discord Notification
on:
gollum
jobs:
notify:
runs-on: ubuntu-latest
steps:
- uses: 'oznu/gh-wiki-edit-discord-notification@dfc866fd048f04c239ad113eef3c6c73504d333e'
with:
discord-webhook-url: ${{ secrets.DISCORD_WEBHOOK_WIKI_EDIT }}
ignore-collaborators: false

1
TShockAPI/DB/GroupManager.cs
View file

@ -74,6 +74,7 @@ namespace TShockAPI.DB
Permissions.canchangepassword, Permissions.canchangepassword,
Permissions.canlogout, Permissions.canlogout,
Permissions.summonboss, Permissions.summonboss,
Permissions.spawnpets,
Permissions.worldupgrades, Permissions.worldupgrades,
Permissions.whisper, Permissions.whisper,
Permissions.wormhole, Permissions.wormhole,

6
TShockAPI/TShock.cs
View file

@ -63,7 +63,7 @@ namespace TShockAPI
/// <summary>VersionNum - The version number the TerrariaAPI will return back to the API. We just use the Assembly info.</summary> /// <summary>VersionNum - The version number the TerrariaAPI will return back to the API. We just use the Assembly info.</summary>
public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version; public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version;
/// <summary>VersionCodename - The version codename is displayed when the server starts. Inspired by software codenames conventions.</summary> /// <summary>VersionCodename - The version codename is displayed when the server starts. Inspired by software codenames conventions.</summary>
public static readonly string VersionCodename = "Stargazer"; public static readonly string VersionCodename = "Hopefully SSC works somewhat correctly now edition";
/// <summary>SavePath - This is the path TShock saves its data in. This path is relative to the TerrariaServer.exe (not in ServerPlugins).</summary> /// <summary>SavePath - This is the path TShock saves its data in. This path is relative to the TerrariaServer.exe (not in ServerPlugins).</summary>
public static string SavePath = "tshock"; public static string SavePath = "tshock";
@ -1441,8 +1441,8 @@ namespace TShockAPI
Hooks.PlayerHooks.OnPlayerLogout(tsplr); Hooks.PlayerHooks.OnPlayerLogout(tsplr);
} }
// The last player will leave after this hook is executed. // If this is the last player online, update the console title and save the world if needed
if (Utils.GetActivePlayerCount() == 1) if (Utils.GetActivePlayerCount() == 0)
{ {
if (Config.Settings.SaveWorldOnLastPlayerExit) if (Config.Settings.SaveWorldOnLastPlayerExit)
SaveManager.Instance.SaveWorld(); SaveManager.Instance.SaveWorld();

4
TShockAPI/TShockAPI.csproj
View file

@ -18,11 +18,11 @@
Also, be sure to release on github with the exact assembly version tag as below Also, be sure to release on github with the exact assembly version tag as below
so that the update manager works correctly (via the Github releases api and mimic) so that the update manager works correctly (via the Github releases api and mimic)
--> -->
<Version>5.2.3</Version> <Version>5.2.4</Version>
<AssemblyTitle>TShock for Terraria</AssemblyTitle> <AssemblyTitle>TShock for Terraria</AssemblyTitle>
<Company>Pryaxis &amp; TShock Contributors</Company> <Company>Pryaxis &amp; TShock Contributors</Company>
<Product>TShockAPI</Product> <Product>TShockAPI</Product>
<Copyright>Copyright © Pryaxis &amp; TShock Contributors 2011-2023</Copyright> <Copyright>Copyright © Pryaxis &amp; TShock Contributors 2011-2025</Copyright>
<!-- extras for nuget --> <!-- extras for nuget -->
<GeneratePackageOnBuild>True</GeneratePackageOnBuild> <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression> <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>