rendered paste bodydiff --git a/Trinity.Encore.AccountService/Accounts/Account.cs b/Trinity.Encore.AccountService/Accounts/Account.cs
index 0e46b1b..e095a26 100644
--- a/Trinity.Encore.AccountService/Accounts/Account.cs
+++ b/Trinity.Encore.AccountService/Accounts/Account.cs
@@ -192,8 +192,8 @@ namespace Trinity.Encore.AccountService.Accounts
public AccountBan Ban
{
- get { return BanManager.Instance.FindAccountBan(x => x.Account.Id == Id); }
- set { Record.Ban = value != null ? value.Record : null; }
+ get { return BanManager.Instance.FindAccountBan(x => x.Expiry > DateTime.Now && x.Account.Id == Id); }
+ set { this.Ban = value }
}
}
}
diff --git a/Trinity.Encore.AccountService/Database/AccountRecord.cs b/Trinity.Encore.AccountService/Database/AccountRecord.cs
index aff2747..af199ce 100644
--- a/Trinity.Encore.AccountService/Database/AccountRecord.cs
+++ b/Trinity.Encore.AccountService/Database/AccountRecord.cs
@@ -69,8 +69,6 @@ namespace Trinity.Encore.AccountService.Database
public virtual byte[] LastIP { get; set; }
public virtual AccountRecord Recruiter { get; set; }
-
- public virtual AccountBanRecord Ban { get; set; }
}
public sealed class AccountMapping : MappableObject<AccountRecord>
@@ -87,7 +85,6 @@ namespace Trinity.Encore.AccountService.Database
Map(c => c.LastLogin).Nullable();
Map(c => c.LastIP).Nullable();
References(x => x.Recruiter).Nullable();
- HasOne(c => c.Ban).Cascade.All();
}
}
}