diff --git a/CHANGELOG.md b/CHANGELOG.md index c9774b06..46470e3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin ## Upcoming changes * Fixed SendTileRectHandler not sending tile rect updates like Pylons/Mannequins to other clients. (@Stealownz) +* Fix some typos that have been in the repository for over a lustrum. (@Killia0) * 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) ## TShock 4.5.5 diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs index 60737a7f..a625190b 100644 --- a/TShockAPI/Bouncer.cs +++ b/TShockAPI/Bouncer.cs @@ -1724,7 +1724,7 @@ namespace TShockAPI return; } - // This is neccessary to check in order to prevent special tiles such as + // This is necessary to check in order to prevent special tiles such as // queen bee larva, paintings etc that use this packet from being placed // without selecting the right item. if (type != args.Player.TPlayer.inventory[args.Player.TPlayer.selectedItem].createTile) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 86a99e31..e1f5c7b0 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -50,7 +50,7 @@ namespace TShockAPI public bool Silent { get; private set; } /// - /// Parameters passed to the arguement. Does not include the command name. + /// Parameters passed to the argument. Does not include the command name. /// IE '/kick "jerk face"' will only have 1 argument /// public List Parameters { get; private set; } @@ -939,7 +939,7 @@ namespace TShockAPI } catch (UserAccountManagerException ex) { - args.Player.SendErrorMessage("Sorry, an error occured: " + ex.Message + "."); + args.Player.SendErrorMessage("Sorry, an error occurred: " + ex.Message + "."); TShock.Log.ConsoleError("PasswordUser returned an error: " + ex); } } @@ -1003,7 +1003,7 @@ namespace TShockAPI } catch (UserAccountManagerException ex) { - args.Player.SendErrorMessage("Sorry, an error occured: " + ex.Message + "."); + args.Player.SendErrorMessage("Sorry, an error occurred: " + ex.Message + "."); TShock.Log.ConsoleError("RegisterUser returned an error: " + ex); } } @@ -1221,7 +1221,7 @@ namespace TShockAPI if (DateTime.TryParse(account.LastAccessed, out LastSeen)) { LastSeen = DateTime.Parse(account.LastAccessed).ToLocalTime(); - args.Player.SendSuccessMessage("{0}'s last login occured {1} {2} UTC{3}.", account.Name, LastSeen.ToShortDateString(), + args.Player.SendSuccessMessage("{0}'s last login occurred {1} {2} UTC{3}.", account.Name, LastSeen.ToShortDateString(), LastSeen.ToShortTimeString(), Timezone); } @@ -5523,7 +5523,7 @@ namespace TShockAPI #endregion General Commands - #region Cheat Commands + #region Game Commands private static void Clear(CommandArgs args) { @@ -6477,6 +6477,6 @@ namespace TShockAPI } } - #endregion Cheat Comamnds + #endregion Game Commands } } diff --git a/TShockAPI/DB/GroupManager.cs b/TShockAPI/DB/GroupManager.cs index 7b3b62dd..3bb50881 100644 --- a/TShockAPI/DB/GroupManager.cs +++ b/TShockAPI/DB/GroupManager.cs @@ -425,14 +425,14 @@ namespace TShockAPI.DB } catch (Exception ex) { - TShock.Log.Error($"An exception has occured during database transaction: {ex.Message}"); + TShock.Log.Error($"An exception has occurred during database transaction: {ex.Message}"); try { transaction.Rollback(); } catch (Exception rollbackEx) { - TShock.Log.Error($"An exception has occured during database rollback: {rollbackEx.Message}"); + TShock.Log.Error($"An exception has occurred during database rollback: {rollbackEx.Message}"); } } } diff --git a/TShockAPI/DB/RegionManager.cs b/TShockAPI/DB/RegionManager.cs index eaf8f1ba..60ff0ed5 100644 --- a/TShockAPI/DB/RegionManager.cs +++ b/TShockAPI/DB/RegionManager.cs @@ -168,7 +168,7 @@ namespace TShockAPI.DB } /// - /// Delets the region from this world with a given ID. + /// Deletes the region from this world with a given ID. /// /// The ID of the region to delete. /// Whether the region was successfully deleted. @@ -584,7 +584,7 @@ namespace TShockAPI.DB /// /// Region name /// New owner's username - /// Whether the change was successfull + /// Whether the change was successful public bool ChangeOwner(string regionName, string newOwner) { var region = GetRegionByName(regionName); @@ -604,7 +604,7 @@ namespace TShockAPI.DB /// /// Region name /// Group's name - /// Whether the change was successfull + /// Whether the change was successful public bool AllowGroup(string regionName, string groupName) { string mergedGroups = ""; @@ -646,7 +646,7 @@ namespace TShockAPI.DB /// /// Region name /// Group name - /// Whether the change was successfull + /// Whether the change was successful public bool RemoveGroup(string regionName, string group) { Region r = GetRegionByName(regionName); @@ -688,7 +688,7 @@ namespace TShockAPI.DB /// /// Region name /// New Z index - /// Whether the change was successfull + /// Whether the change was successful public bool SetZ(string name, int z) { try diff --git a/TShockAPI/DB/RememberedPosManager.cs b/TShockAPI/DB/RememberedPosManager.cs index 77fef847..c49c5912 100644 --- a/TShockAPI/DB/RememberedPosManager.cs +++ b/TShockAPI/DB/RememberedPosManager.cs @@ -56,7 +56,7 @@ namespace TShockAPI.DB { int checkX=reader.Get("X"); int checkY=reader.Get("Y"); - //fix leftover inconsistancies + //fix leftover inconsistencies if (checkX==0) checkX++; if (checkY==0) diff --git a/TShockAPI/DB/UserManager.cs b/TShockAPI/DB/UserManager.cs index 2d09ba5a..4fedaaed 100644 --- a/TShockAPI/DB/UserManager.cs +++ b/TShockAPI/DB/UserManager.cs @@ -378,7 +378,7 @@ namespace TShockAPI.DB /// The hashed password for the user account. public string Password { get; internal set; } - /// The user's saved Univerally Unique Identifier token. + /// The user's saved Universally Unique Identifier token. public string UUID { get; set; } /// The group object that the user account is a part of. diff --git a/TShockAPI/DB/WarpsManager.cs b/TShockAPI/DB/WarpsManager.cs index a409580e..bd13ce4d 100644 --- a/TShockAPI/DB/WarpsManager.cs +++ b/TShockAPI/DB/WarpsManager.cs @@ -139,7 +139,7 @@ namespace TShockAPI.DB /// The warp name. /// The X position. /// The Y position. - /// Whether the operation suceeded. + /// Whether the operation succeeded. public bool Position(string warpName, int x, int y) { try @@ -163,7 +163,7 @@ namespace TShockAPI.DB /// /// The warp name. /// The state. - /// Whether the operation suceeded. + /// Whether the operation succeeded. public bool Hide(string warpName, bool state) { try @@ -216,4 +216,4 @@ namespace TShockAPI.DB IsPrivate = false; } } -} \ No newline at end of file +} diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index ed701f2f..c675910b 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -346,7 +346,7 @@ namespace TShockAPI /// public Vector2 Velocity { get; set; } /// - /// Original poisition of the player when using Potion of Return. + /// Original position of the player when using Potion of Return. /// public Vector2? OriginalPos { get; set; } /// @@ -770,7 +770,7 @@ namespace TShockAPI { /// The projectile's identity...? public int ProjectileIdentity; - /// The the player index of the projectile's owner (Main.players). + /// The player index of the projectile's owner (Main.players). public byte ProjectileOwner; /// The index of the projectile in Main.projectile. public int ProjectileIndex; @@ -1846,7 +1846,7 @@ namespace TShockAPI /// public byte ID { get; set; } /// - /// The direction the damage is occuring from + /// The direction the damage is occurring from /// public byte Direction { get; set; } /// @@ -1902,7 +1902,7 @@ namespace TShockAPI /// public byte Direction { get; set; } /// - /// Amount of damage delt + /// Amount of damage dealt /// public short Damage { get; set; } /// @@ -1989,7 +1989,7 @@ namespace TShockAPI /// public int Slot { get; set; } /// - /// Wether or not the slot that is being modified is a Dye slot. + /// Whether or not the slot that is being modified is a Dye slot. /// public bool IsDye { get; set; } /// diff --git a/TShockAPI/Group.cs b/TShockAPI/Group.cs index fa2d1975..ff2ba2e9 100644 --- a/TShockAPI/Group.cs +++ b/TShockAPI/Group.cs @@ -273,7 +273,7 @@ namespace TShockAPI /// /// Clears the permission list and sets it to the list provided, - /// will parse "!permssion" and add it to the negated permissions. + /// will parse "!permission" and add it to the negated permissions. /// /// The new list of permissions to associate with the group. public void SetPermission(List permission) diff --git a/TShockAPI/Handlers/NetModules/PylonHandler.cs b/TShockAPI/Handlers/NetModules/PylonHandler.cs index 7cbe054b..10a30b68 100644 --- a/TShockAPI/Handlers/NetModules/PylonHandler.cs +++ b/TShockAPI/Handlers/NetModules/PylonHandler.cs @@ -11,7 +11,7 @@ namespace TShockAPI.Handlers.NetModules public class PylonHandler : INetModuleHandler { /// - /// Event occuring + /// Event occurring /// public SubPacketType PylonEventType { get; set; } /// diff --git a/TShockAPI/ILog.cs b/TShockAPI/ILog.cs index 9fac3789..4c560f1f 100644 --- a/TShockAPI/ILog.cs +++ b/TShockAPI/ILog.cs @@ -119,7 +119,7 @@ namespace TShockAPI /// Writes a message to the log /// /// Message to write - /// LogLevel assosciated with the message + /// LogLevel associated with the message void Write(string message, TraceLevel level); /// @@ -152,4 +152,4 @@ namespace TShockAPI /// void Dispose(); } -} \ No newline at end of file +} diff --git a/TShockAPI/Permissions.cs b/TShockAPI/Permissions.cs index 8ce013b8..7df1ca83 100644 --- a/TShockAPI/Permissions.cs +++ b/TShockAPI/Permissions.cs @@ -399,7 +399,7 @@ namespace TShockAPI [Description("User can use Creative UI to set world time speed.")] public static readonly string journey_timespeed = "tshock.journey.time.setspeed"; - [Description("User can use Creative UI to to toggle character godmode.")] + [Description("User can use Creative UI to toggle character godmode.")] public static readonly string journey_godmode = "tshock.journey.godmode"; [Description("User can use Creative UI to set world wind strength/seed.")] diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs index 8a88dbb6..6ca9889e 100644 --- a/TShockAPI/Rest/RestManager.cs +++ b/TShockAPI/Rest/RestManager.cs @@ -1117,7 +1117,7 @@ namespace TShockAPI [Permission(RestPermissions.restmanagegroups)] [Noun("group", true, "The name of the new group.", typeof(String))] [Noun("parent", false, "The name of the parent group.", typeof(String))] - [Noun("permissions", false, "A comma seperated list of permissions for the new group.", typeof(String))] + [Noun("permissions", false, "A comma separated list of permissions for the new group.", typeof(String))] [Noun("chatcolor", false, "A r,g,b string representing the color for this groups chat.", typeof(String))] [Token] private object GroupCreate(RestRequestArgs args) @@ -1142,7 +1142,7 @@ namespace TShockAPI [Noun("group", true, "The name of the group to modify.", typeof(String))] [Noun("parent", false, "The name of the new parent for this group.", typeof(String))] [Noun("chatcolor", false, "The new chat color r,g,b.", typeof(String))] - [Noun("permissions", false, "The new comma seperated list of permissions.", typeof(String))] + [Noun("permissions", false, "The new comma separated list of permissions.", typeof(String))] [Token] private object GroupUpdate(RestRequestArgs args) { diff --git a/TShockAPI/Sockets/LinuxTcpSocket.cs b/TShockAPI/Sockets/LinuxTcpSocket.cs index 98892c42..5a95794b 100644 --- a/TShockAPI/Sockets/LinuxTcpSocket.cs +++ b/TShockAPI/Sockets/LinuxTcpSocket.cs @@ -200,7 +200,7 @@ namespace TShockAPI.Sockets this._listener.Stop(); // currently vanilla will stop listening when the slots are full, however it appears that this Netplay.IsListening - // flag is still set, making the server loop beleive it's still listening when it's actually not. + // flag is still set, making the server loop believe it's still listening when it's actually not. // clearing this flag when we actually have stopped will allow the ServerLoop to start listening again when // there are enough slots available. Netplay.IsListening = false; diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index 47dea08b..afde7cef 100644 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -1018,7 +1018,7 @@ namespace TShockAPI } /// - /// Player Y cooridnate divided by 16. Supposed Y world coordinate. + /// Player Y coordinate divided by 16. Supposed Y world coordinate. /// public int TileY { diff --git a/TShockAPI/TSServerPlayer.cs b/TShockAPI/TSServerPlayer.cs index 09642f59..9f59da49 100644 --- a/TShockAPI/TSServerPlayer.cs +++ b/TShockAPI/TSServerPlayer.cs @@ -182,12 +182,12 @@ namespace TShockAPI public void RevertTiles(Dictionary tiles) { - // Update Main.Tile first so that when tile sqaure is sent it is correct + // Update Main.Tile first so that when tile square is sent it is correct foreach (KeyValuePair entry in tiles) { Main.tile[(int)entry.Key.X, (int)entry.Key.Y] = entry.Value; } - // Send all players updated tile sqaures + // Send all players updated tile squares foreach (Vector2 coords in tiles.Keys) { All.SendTileSquare((int)coords.X, (int)coords.Y, 3); diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 2114b469..5a874e55 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -1614,7 +1614,7 @@ namespace TShockAPI } /// OnProjectileSetDefaults - Called when a projectile sets the default attributes for itself. - /// e - The SetDefaultsEventArgs object praameterized with Projectile and int. + /// e - The SetDefaultsEventArgs object parameterized with Projectile and int. private void OnProjectileSetDefaults(SetDefaultsEventArgs e) { //tombstone fix. diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs index 23007b19..92d45299 100644 --- a/TShockAPI/Utils.cs +++ b/TShockAPI/Utils.cs @@ -141,7 +141,7 @@ namespace TShockAPI } /// - /// Broadcasts a message from a Terraria playerplayer, not TShock + /// Broadcasts a message from a Terraria player, not TShock /// /// ply - the Terraria player index that will send the packet /// msg - The message to send