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

Minor changes pertaining to spacing & some unclear messages

Browse source
This commit is contained in:
Lucas Nicodemus 2015-02-24 19:08:30 -07:00
parent 2f24484012
commit 183084d60f
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/Commands.cs
View file

@ -4367,7 +4367,7 @@ namespace TShockAPI
} }
else else
{ {
string reason = "misbehavior"; string reason = "Banned by Administrator";
if (args.Parameters.Count > 1) if (args.Parameters.Count > 1)
reason = String.Join(" ", args.Parameters.ToArray(), 1, args.Parameters.Count - 1); reason = String.Join(" ", args.Parameters.ToArray(), 1, args.Parameters.Count - 1);
var plr = players[0]; var plr = players[0];

28
TShockAPI/TShock.cs
View file

@ -46,7 +46,7 @@ namespace TShockAPI
public class TShock : TerrariaPlugin public class TShock : TerrariaPlugin
{ {
public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version; 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"; public static string SavePath = "tshock";
private const string LogFormatDefault = "yyyy-MM-dd_HH-mm-ss"; private const string LogFormatDefault = "yyyy-MM-dd_HH-mm-ss";
@ -244,7 +244,7 @@ namespace TShockAPI
if (Config.EnableGeoIP && File.Exists(geoippath)) if (Config.EnableGeoIP && File.Exists(geoippath))
Geo = new GeoIPCountry(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.GamePostInitialize.Register(this, OnPostInit);
ServerApi.Hooks.GameUpdate.Register(this, OnUpdate); ServerApi.Hooks.GameUpdate.Register(this, OnUpdate);
@ -262,7 +262,7 @@ namespace TShockAPI
ServerApi.Hooks.ProjectileSetDefaults.Register(this, OnProjectileSetDefaults); ServerApi.Hooks.ProjectileSetDefaults.Register(this, OnProjectileSetDefaults);
ServerApi.Hooks.WorldStartHardMode.Register(this, OnStartHardMode); ServerApi.Hooks.WorldStartHardMode.Register(this, OnStartHardMode);
ServerApi.Hooks.WorldSave.Register(this, SaveManager.Instance.OnSaveWorld); 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.WorldHalloweenCheck.Register(this, OnHalloweenCheck);
ServerApi.Hooks.NetNameCollision.Register(this, NetHooks_NameCollision); ServerApi.Hooks.NetNameCollision.Register(this, NetHooks_NameCollision);
Hooks.PlayerHooks.PlayerPreLogin += OnPlayerPreLogin; Hooks.PlayerHooks.PlayerPreLogin += OnPlayerPreLogin;
@ -344,7 +344,7 @@ namespace TShockAPI
ServerApi.Hooks.WorldChristmasCheck.Deregister(this, OnXmasCheck); ServerApi.Hooks.WorldChristmasCheck.Deregister(this, OnXmasCheck);
ServerApi.Hooks.WorldHalloweenCheck.Deregister(this, OnHalloweenCheck); ServerApi.Hooks.WorldHalloweenCheck.Deregister(this, OnHalloweenCheck);
ServerApi.Hooks.NetNameCollision.Deregister(this, NetHooks_NameCollision); 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"))) if (File.Exists(Path.Combine(SavePath, "tshock.pid")))
{ {
@ -430,17 +430,17 @@ namespace TShockAPI
} }
} }
private void OnXmasCheck(ChristmasCheckEventArgs args) private void OnXmasCheck(ChristmasCheckEventArgs args)
{ {
if (args.Handled) if (args.Handled)
return; return;
if(Config.ForceXmas) if(Config.ForceXmas)
{ {
args.Xmas = true; args.Xmas = true;
args.Handled = true; args.Handled = true;
}
} }
}
private void OnHalloweenCheck(HalloweenCheckEventArgs args) private void OnHalloweenCheck(HalloweenCheckEventArgs args)
{ {
@ -1057,7 +1057,7 @@ namespace TShockAPI
} }
catch (Exception ex) catch (Exception ex)
{ {
Log.ConsoleError("Command exception"); Log.ConsoleError("An exeption occurred executing a command.");
Log.Error(ex.ToString()); Log.Error(ex.ToString());
} }
} }