From 183084d60fde697b9ce0238fd6b81b7968c68b3b Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Tue, 24 Feb 2015 19:08:30 -0700 Subject: [PATCH] Minor changes pertaining to spacing & some unclear messages --- TShockAPI/Commands.cs | 2 +- TShockAPI/TShock.cs | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index a2443e91..58d7f132 100755 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -4367,7 +4367,7 @@ namespace TShockAPI } else { - string reason = "misbehavior"; + string reason = "Banned by Administrator"; if (args.Parameters.Count > 1) reason = String.Join(" ", args.Parameters.ToArray(), 1, args.Parameters.Count - 1); var plr = players[0]; diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 1346113a..2df3078d 100755 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -46,7 +46,7 @@ namespace TShockAPI public class TShock : TerrariaPlugin { public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version; - public static readonly string VersionCodename = "And the great beast rose from its slumber, ready to take on the world again."; + public static readonly string VersionCodename = "2015!!"; public static string SavePath = "tshock"; private const string LogFormatDefault = "yyyy-MM-dd_HH-mm-ss"; @@ -244,7 +244,7 @@ namespace TShockAPI if (Config.EnableGeoIP && File.Exists(geoippath)) Geo = new GeoIPCountry(geoippath); - Log.ConsoleInfo(string.Format("|> Version {0} ({1}) now running.", Version, VersionCodename)); + Log.ConsoleInfo(string.Format("TShock {0} ({1}) now running.", Version, VersionCodename)); ServerApi.Hooks.GamePostInitialize.Register(this, OnPostInit); ServerApi.Hooks.GameUpdate.Register(this, OnUpdate); @@ -262,7 +262,7 @@ namespace TShockAPI ServerApi.Hooks.ProjectileSetDefaults.Register(this, OnProjectileSetDefaults); ServerApi.Hooks.WorldStartHardMode.Register(this, OnStartHardMode); ServerApi.Hooks.WorldSave.Register(this, SaveManager.Instance.OnSaveWorld); - ServerApi.Hooks.WorldChristmasCheck.Register(this, OnXmasCheck); + ServerApi.Hooks.WorldChristmasCheck.Register(this, OnXmasCheck); ServerApi.Hooks.WorldHalloweenCheck.Register(this, OnHalloweenCheck); ServerApi.Hooks.NetNameCollision.Register(this, NetHooks_NameCollision); Hooks.PlayerHooks.PlayerPreLogin += OnPlayerPreLogin; @@ -344,7 +344,7 @@ namespace TShockAPI ServerApi.Hooks.WorldChristmasCheck.Deregister(this, OnXmasCheck); ServerApi.Hooks.WorldHalloweenCheck.Deregister(this, OnHalloweenCheck); ServerApi.Hooks.NetNameCollision.Deregister(this, NetHooks_NameCollision); - TShockAPI.Hooks.PlayerHooks.PlayerPostLogin -= OnPlayerLogin; + TShockAPI.Hooks.PlayerHooks.PlayerPostLogin -= OnPlayerLogin; if (File.Exists(Path.Combine(SavePath, "tshock.pid"))) { @@ -430,17 +430,17 @@ namespace TShockAPI } } - private void OnXmasCheck(ChristmasCheckEventArgs args) - { - if (args.Handled) - return; + private void OnXmasCheck(ChristmasCheckEventArgs args) + { + if (args.Handled) + return; - if(Config.ForceXmas) - { - args.Xmas = true; - args.Handled = true; - } + if(Config.ForceXmas) + { + args.Xmas = true; + args.Handled = true; } + } private void OnHalloweenCheck(HalloweenCheckEventArgs args) { @@ -1057,7 +1057,7 @@ namespace TShockAPI } catch (Exception ex) { - Log.ConsoleError("Command exception"); + Log.ConsoleError("An exeption occurred executing a command."); Log.Error(ex.ToString()); } }