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

Merge branch 'general-devel' of github.com:NyxStudios/TShock into general-devel

Browse source
This commit is contained in:
Lucas Nicodemus 2016-10-23 16:24:41 -06:00
commit 6f723820a0
No known key found for this signature in database
GPG key ID: CEE668CCE1BF2C7C
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
TShockAPI/TShock.cs
View file

@ -409,17 +409,19 @@ namespace TShockAPI
KnownIps = JsonConvert.DeserializeObject<List<String>>(args.Player.User.KnownIps); KnownIps = JsonConvert.DeserializeObject<List<String>>(args.Player.User.KnownIps);
} }
bool last = KnownIps.Last() == args.Player.IP; if (KnownIps.Count > 0)
if (!last)
{ {
if (KnownIps.Count == 100) bool last = KnownIps.Last() == args.Player.IP;
if (!last)
{ {
KnownIps.RemoveAt(0); if (KnownIps.Count == 100)
{
KnownIps.RemoveAt(0);
}
KnownIps.Add(args.Player.IP);
} }
KnownIps.Add(args.Player.IP);
} }
args.Player.User.KnownIps = JsonConvert.SerializeObject(KnownIps, Formatting.Indented); args.Player.User.KnownIps = JsonConvert.SerializeObject(KnownIps, Formatting.Indented);
Users.UpdateLogin(args.Player.User); Users.UpdateLogin(args.Player.User);
} }
@ -1170,7 +1172,7 @@ namespace TShockAPI
{ {
if (args.Handled) if (args.Handled)
return; return;
if (!Config.AllowCrimsonCreep && (args.Type == TileID.Dirt || args.Type == TileID.FleshWeeds if (!Config.AllowCrimsonCreep && (args.Type == TileID.Dirt || args.Type == TileID.FleshWeeds
|| TileID.Sets.Crimson[args.Type])) || TileID.Sets.Crimson[args.Type]))
{ {