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

Tick version and clean up some white space.

Browse source
This commit is contained in:
Zack Piispanen 2015-03-25 21:17:43 -04:00
parent 015cf61b77
commit 7ad1889a13
2 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -53,5 +53,5 @@ using System.Runtime.InteropServices;
// Also, be sure to release on github with the exact assembly version tag as below // Also, be sure to release on github with the exact assembly version tag as below
// so that the update manager works correctly (via the Github releases api and mimic) // so that the update manager works correctly (via the Github releases api and mimic)
[assembly: AssemblyVersion("4.2.9")] [assembly: AssemblyVersion("4.2.10")]
[assembly: AssemblyFileVersion("4.2.9")] [assembly: AssemblyFileVersion("4.2.10")]

43
TShockAPI/TShock.cs
View file

@ -35,6 +35,7 @@ using Rests;
using Terraria; using Terraria;
using TerrariaApi.Server; using TerrariaApi.Server;
using TShockAPI.DB; using TShockAPI.DB;
using TShockAPI.Hooks;
using TShockAPI.Net; using TShockAPI.Net;
using TShockAPI.ServerSideCharacters; using TShockAPI.ServerSideCharacters;
@ -322,7 +323,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")))
{ {
@ -335,29 +336,29 @@ namespace TShockAPI
base.Dispose(disposing); base.Dispose(disposing);
} }
private void OnPlayerLogin(Hooks.PlayerPostLoginEventArgs args) private void OnPlayerLogin(Hooks.PlayerPostLoginEventArgs args)
{ {
User u = Users.GetUserByName(args.Player.UserAccountName); User u = Users.GetUserByName(args.Player.UserAccountName);
List<String> KnownIps = new List<string>(); List<String> KnownIps = new List<string>();
if (!string.IsNullOrWhiteSpace(u.KnownIps)) if (!string.IsNullOrWhiteSpace(u.KnownIps))
{ {
KnownIps = JsonConvert.DeserializeObject<List<String>>(u.KnownIps); KnownIps = JsonConvert.DeserializeObject<List<String>>(u.KnownIps);
} }
bool found = KnownIps.Any(s => s.Equals(args.Player.IP)); bool found = KnownIps.Any(s => s.Equals(args.Player.IP));
if (!found) if (!found)
{ {
if (KnownIps.Count == 100) if (KnownIps.Count == 100)
{ {
KnownIps.RemoveAt(0); KnownIps.RemoveAt(0);
} }
KnownIps.Add(args.Player.IP); KnownIps.Add(args.Player.IP);
} }
u.KnownIps = JsonConvert.SerializeObject(KnownIps, Formatting.Indented); u.KnownIps = JsonConvert.SerializeObject(KnownIps, Formatting.Indented);
Users.UpdateLogin(u); Users.UpdateLogin(u);
} }
private void OnAccountDelete(Hooks.AccountDeleteEventArgs args) private void OnAccountDelete(Hooks.AccountDeleteEventArgs args)
{ {