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

Renamed TShockAPI.DB 'User' to 'UserAccount'

Browse source
This commit is contained in:
Edgar Luque 2017-12-08 01:38:15 +01:00
parent 27ac4c6318
commit 6589531868
12 changed files with 335 additions and 328 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/DB/RegionManager.cs
View file

@ -447,7 +447,7 @@ namespace TShockAPI.DB
Region r = GetRegionByName(regionName);
if (r != null)
{
if (!r.RemoveID(TShock.Users.GetUserID(userName)))
if (!r.RemoveID(TShock.UserAccounts.GetUserAccountID(userName)))
{
return false;
}
@ -479,7 +479,7 @@ namespace TShockAPI.DB
mergedIDs = reader.Get<string>("UserIds");
}
string userIdToAdd = Convert.ToString(TShock.Users.GetUserID(userName));
string userIdToAdd = Convert.ToString(TShock.UserAccounts.GetUserAccountID(userName));
string[] ids = mergedIDs.Split(',');
// Is the user already allowed to the region?
if (ids.Contains(userIdToAdd))
@ -788,7 +788,7 @@ namespace TShockAPI.DB
return false;
}
return ply.HasPermission(Permissions.editregion) || AllowedIDs.Contains(ply.User.ID) || AllowedGroups.Contains(ply.Group.Name) || Owner == ply.User.Name;
return ply.HasPermission(Permissions.editregion) || AllowedIDs.Contains(ply.Account.ID) || AllowedGroups.Contains(ply.Group.Name) || Owner == ply.Account.Name;
}
/// <summary>