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

Merge pull request #2437 from Rozen4334/patch-1

Browse source 
Fix return for sundial
This commit is contained in:
Chris 2021-08-27 14:46:56 +09:30 • committed by GitHub
commit 367883417d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -23,6 +23,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Added a new `/respawn` command that lets you respawn yourself or another player. Respawning yourself requires the `tshock.respawn` permission and respawning others requires the `tshock.respawn.other` permission. The full command syntax is `/respawn [player]`. (@moisterrific) * Added a new `/respawn` command that lets you respawn yourself or another player. Respawning yourself requires the `tshock.respawn` permission and respawning others requires the `tshock.respawn.other` permission. The full command syntax is `/respawn [player]`. (@moisterrific)
* 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) * 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) * 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)
## TShock 4.5.5 ## TShock 4.5.5
* Changed the world autosave message so that it no longer warns of a "potential lag spike." (@hakusaro) * Changed the world autosave message so that it no longer warns of a "potential lag spike." (@hakusaro)

3
TShockAPI/GetDataHandlers.cs
View file

@ -3246,6 +3246,7 @@ namespace TShockAPI
{ {
TShock.Log.ConsoleDebug($"GetDataHandlers / HandleSpecial rejected enchanted sundial permission {args.Player.Name}"); TShock.Log.ConsoleDebug($"GetDataHandlers / HandleSpecial rejected enchanted sundial permission {args.Player.Name}");
args.Player.SendErrorMessage("You do not have permission to use the Enchanted Sundial."); args.Player.SendErrorMessage("You do not have permission to use the Enchanted Sundial.");
return true;
} }
else if (TShock.Config.Settings.ForceTime != "normal") else if (TShock.Config.Settings.ForceTime != "normal")
{ {
@ -3256,8 +3257,8 @@ namespace TShockAPI
} }
else else
args.Player.SendErrorMessage("You must set ForceTime to normal via config to use the Enchanted Sundial."); args.Player.SendErrorMessage("You must set ForceTime to normal via config to use the Enchanted Sundial.");
return true;
} }
return true;
} }
return false; return false;