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

Merge remote-tracking branch 'sgk/general-devel' into general-devel

Browse source
This commit is contained in:
Lucas Nicodemus 2022-10-31 15:33:36 -07:00
commit 46001c5be1
No known key found for this signature in database
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TShockAPI/Commands.cs
View file

@ -684,7 +684,10 @@ namespace TShockAPI
{
if (!cmd.CanRun(player))
{
TShock.Utils.SendLogs(GetString("{0} tried to execute {1}{2}.", player.Name, Specifier, cmdText), Color.PaleVioletRed, player);
if (cmd.DoLog)
TShock.Utils.SendLogs(GetString("{0} tried to execute {1}{2}.", player.Name, Specifier, cmdText), Color.PaleVioletRed, player);
else
TShock.Utils.SendLogs(GetString("{0} tried to execute (args omitted) {1}{2}.", player.Name, Specifier, cmdName), Color.PaleVioletRed, player);
player.SendErrorMessage(GetString("You do not have access to this command."));
if (player.HasPermission(Permissions.su))
{
@ -699,6 +702,8 @@ namespace TShockAPI
{
if (cmd.DoLog)
TShock.Utils.SendLogs(GetString("{0} executed: {1}{2}.", player.Name, silent ? SilentSpecifier : Specifier, cmdText), Color.PaleVioletRed, player);
else
TShock.Utils.SendLogs(GetString("{0} executed (args omitted): {1}{2}.", player.Name, silent ? SilentSpecifier : Specifier, cmdName), Color.PaleVioletRed, player);
cmd.Run(cmdText, silent, player, args);
}
}

1
docs/changelog.md
View file

@ -72,6 +72,7 @@ Use past tense when adding new entries; sign your name off when you add or chang
* Fixed SSC not save `ateArtisanBread`, `usedAegisCrystal`, `usedAegisFruit`, `usedArcaneCrystal`, `usedGalaxyPearl`, `usedGummyWorm`, `usedAmbrosia`, `unlockedSuperCart`, `enabledSuperCart` flags, and Server will correct read them. (@hufang360)
* Allow flask buffs to be applied on town npc due to the Flymeal. Add a permission could skip the buff detection. (@KawaiiYuyu)
* Dockerize TShock (@PotatoCider)
* Log the command itself without arguments if the command is not DoLog. (@sgkoishi, [#2779](https://github.com/Pryaxis/TShock/issues/2779))
* Add ability for items given to players to be inserted directly into their inventory instead of spawned as an item drop (@pontaoski)
* Added support of `-lang` and `-language` flags for our i18n system. (@KawaiiYuyu)