Merge branch 'general-devel' into patch-32

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 new `DisablePrimeBombs` config option (`false` by default). Highly recommended to set this to `true` in order to prevent griefing on servers doing a `for the worthy` play-through, since the prime bombs on this seed can destroy most tiles and bypass region protection. (@moisterrific)
 
 ## TShock 4.5.5

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)

TShockAPI/Commands.cs

@@ -50,7 +50,7 @@ namespace TShockAPI
 		public bool Silent { get; private set; }
 
 		/// <summary>
-		/// 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
 		/// </summary>
 		public List<string> 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);
 			}
 		}
@@ -1216,7 +1216,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);
 					}
 
@@ -6472,6 +6472,6 @@ namespace TShockAPI
 			}
 		}
 
-		#endregion Cheat Comamnds
+		#endregion Cheat Commands
 	}
 }

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}");
 						}
 					}
 				}

TShockAPI/DB/RegionManager.cs

@@ -168,7 +168,7 @@ namespace TShockAPI.DB
 		}
 
 		/// <summary>
-		/// Delets the region from this world with a given ID.
+		/// Deletes the region from this world with a given ID.
 		/// </summary>
 		/// <param name="id">The ID of the region to delete.</param>
 		/// <returns>Whether the region was successfully deleted.</returns>
@@ -584,7 +584,7 @@ namespace TShockAPI.DB
 		/// </summary>
 		/// <param name="regionName">Region name</param>
 		/// <param name="newOwner">New owner's username</param>
-		/// <returns>Whether the change was successfull</returns>
+		/// <returns>Whether the change was successful</returns>
 		public bool ChangeOwner(string regionName, string newOwner)
 		{
 			var region = GetRegionByName(regionName);
@@ -604,7 +604,7 @@ namespace TShockAPI.DB
 		/// </summary>
 		/// <param name="regionName">Region name</param>
 		/// <param name="groupName">Group's name</param>
-		/// <returns>Whether the change was successfull</returns>
+		/// <returns>Whether the change was successful</returns>
 		public bool AllowGroup(string regionName, string groupName)
 		{
 			string mergedGroups = "";
@@ -646,7 +646,7 @@ namespace TShockAPI.DB
 		/// </summary>
 		/// <param name="regionName">Region name</param>
 		/// <param name="group">Group name</param>
-		/// <returns>Whether the change was successfull</returns>
+		/// <returns>Whether the change was successful</returns>
 		public bool RemoveGroup(string regionName, string group)
 		{
 			Region r = GetRegionByName(regionName);
@@ -688,7 +688,7 @@ namespace TShockAPI.DB
 		/// </summary>
 		/// <param name="name">Region name</param>
 		/// <param name="z">New Z index</param>
-		/// <returns>Whether the change was successfull</returns>
+		/// <returns>Whether the change was successful</returns>
 		public bool SetZ(string name, int z)
 		{
 			try

TShockAPI/DB/RememberedPosManager.cs

@@ -56,7 +56,7 @@ namespace TShockAPI.DB
 					{
 						int checkX=reader.Get<int>("X");
 						int checkY=reader.Get<int>("Y");
-						//fix leftover inconsistancies
+						//fix leftover inconsistencies
 						if (checkX==0)
 						   checkX++;
 						if (checkY==0)

TShockAPI/DB/UserManager.cs

@@ -378,7 +378,7 @@ namespace TShockAPI.DB
 		/// <summary>The hashed password for the user account.</summary>
 		public string Password { get; internal set; }
 
-		/// <summary>The user's saved Univerally Unique Identifier token.</summary>
+		/// <summary>The user's saved Universally Unique Identifier token.</summary>
 		public string UUID { get; set; }
 
 		/// <summary>The group object that the user account is a part of.</summary>

TShockAPI/DB/WarpsManager.cs

@@ -139,7 +139,7 @@ namespace TShockAPI.DB
 		/// <param name="warpName">The warp name.</param>
 		/// <param name="x">The X position.</param>
 		/// <param name="y">The Y position.</param>
-		/// <returns>Whether the operation suceeded.</returns>
+		/// <returns>Whether the operation succeeded.</returns>
 		public bool Position(string warpName, int x, int y)
 		{
 			try
@@ -163,7 +163,7 @@ namespace TShockAPI.DB
 		/// </summary>
 		/// <param name="warpName">The warp name.</param>
 		/// <param name="state">The state.</param>
-		/// <returns>Whether the operation suceeded.</returns>
+		/// <returns>Whether the operation succeeded.</returns>
 		public bool Hide(string warpName, bool state)
 		{
 			try
@@ -216,4 +216,4 @@ namespace TShockAPI.DB
 			IsPrivate = false;
 		}
 	}
-}
+}

TShockAPI/GetDataHandlers.cs

@@ -346,7 +346,7 @@ namespace TShockAPI
 			/// </summary>
 			public Vector2 Velocity { get; set; }
 			/// <summary>
-			/// Original poisition of the player when using Potion of Return.
+			/// Original position of the player when using Potion of Return.
 			/// </summary>
 			public Vector2? OriginalPos { get; set; }
 			/// <summary>
@@ -770,7 +770,7 @@ namespace TShockAPI
 		{
 			/// <summary>The projectile's identity...?</summary>
 			public int ProjectileIdentity;
-			/// <summary>The the player index of the projectile's owner (Main.players).</summary>
+			/// <summary>The player index of the projectile's owner (Main.players).</summary>
 			public byte ProjectileOwner;
 			/// <summary>The index of the projectile in Main.projectile.</summary>
 			public int ProjectileIndex;
@@ -1846,7 +1846,7 @@ namespace TShockAPI
 			/// </summary>
 			public byte ID { get; set; }
 			/// <summary>
-			/// The direction the damage is occuring from
+			/// The direction the damage is occurring from
 			/// </summary>
 			public byte Direction { get; set; }
 			/// <summary>
@@ -1902,7 +1902,7 @@ namespace TShockAPI
 			/// </summary>
 			public byte Direction { get; set; }
 			/// <summary>
-			/// Amount of damage delt
+			/// Amount of damage dealt
 			/// </summary>
 			public short Damage { get; set; }
 			/// <summary>
@@ -1989,7 +1989,7 @@ namespace TShockAPI
 			/// </summary>
 			public int Slot { get; set; }
 			/// <summary>
-			/// 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.
 			/// </summary>
 			public bool IsDye { get; set; }
 			/// <summary>

TShockAPI/Group.cs

@@ -273,7 +273,7 @@ namespace TShockAPI
 
 		/// <summary>
 		/// 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.
 		/// </summary>
 		/// <param name="permission">The new list of permissions to associate with the group.</param>
 		public void SetPermission(List<string> permission)

TShockAPI/Handlers/NetModules/PylonHandler.cs

@@ -11,7 +11,7 @@ namespace TShockAPI.Handlers.NetModules
 	public class PylonHandler : INetModuleHandler
 	{
 		/// <summary>
-		/// Event occuring
+		/// Event occurring
 		/// </summary>
 		public SubPacketType PylonEventType { get; set; }
 		/// <summary>

TShockAPI/ILog.cs

@@ -119,7 +119,7 @@ namespace TShockAPI
 		/// Writes a message to the log
 		/// </summary>
 		/// <param name="message">Message to write</param>
-		/// <param name="level">LogLevel assosciated with the message</param>
+		/// <param name="level">LogLevel associated with the message</param>
 		void Write(string message, TraceLevel level);
 
 		/// <summary>
@@ -152,4 +152,4 @@ namespace TShockAPI
 		/// </summary>
 		void Dispose();
 	}
-}
+}

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.")]

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)
 		{

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;

TShockAPI/TSPlayer.cs

@@ -1018,7 +1018,7 @@ namespace TShockAPI
 		}
 
 		/// <summary>
-		/// Player Y cooridnate divided by 16. Supposed Y world coordinate.
+		/// Player Y coordinate divided by 16. Supposed Y world coordinate.
 		/// </summary>
 		public int TileY
 		{

TShockAPI/TSServerPlayer.cs

@@ -182,12 +182,12 @@ namespace TShockAPI
 
 		public void RevertTiles(Dictionary<Vector2, ITile> 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<Vector2, ITile> 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);

TShockAPI/TShock.cs

@@ -1614,7 +1614,7 @@ namespace TShockAPI
 		}
 
 		/// <summary>OnProjectileSetDefaults - Called when a projectile sets the default attributes for itself.</summary>
-		/// <param name="e">e - The SetDefaultsEventArgs object praameterized with Projectile and int.</param>
+		/// <param name="e">e - The SetDefaultsEventArgs object parameterized with Projectile and int.</param>
 		private void OnProjectileSetDefaults(SetDefaultsEventArgs<Projectile, int> e)
 		{
 			//tombstone fix.

TShockAPI/Utils.cs

@@ -141,7 +141,7 @@ namespace TShockAPI
 		}
 
 		/// <summary>
-		/// Broadcasts a message from a Terraria playerplayer, not TShock
+		/// Broadcasts a message from a Terraria player, not TShock
 		/// </summary>
 		/// <param name="ply">ply - the Terraria player index that will send the packet</param>
 		/// <param name="msg">msg - The message to send</param>