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

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

Browse source
This commit is contained in:
Zack Piispanen 2013-10-01 04:53:06 -04:00
commit 98a282cd2a
12 changed files with 164 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TShockAPI/TShock.cs
View file

@ -845,6 +845,11 @@ namespace TShockAPI
ban = Bans.GetBanByIp(player.IP);
}
if (Config.EnableUUIDBans && null == ban)
{
ban = Bans.GetBanByUUID(player.UUID);
}
if (ban != null)
{
if (!Utils.HasBanExpired(ban))