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

Changed Group. This isn't java. Don't use accessor/mutator methods. Use properties.

Browse source
This commit is contained in:
high 2011-06-14 17:06:17 -04:00
parent c3bf304c0c
commit fff6e1bcbc
3 changed files with 69 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

45
TShockAPI/Group.cs
View file

@ -22,30 +22,16 @@ namespace TShockAPI
{
public class Group
{
private string name;
private Group parent;
private List<string> permissions = new List<string>();
private List<string> negatedPermissions = new List<string>();
private readonly List<string> permissions = new List<string>();
private readonly List<string> negatedpermissions = new List<string>();
public Group(string groupName, Group parentGroup = null)
{
name = groupName;
parent = parentGroup;
}
public string Name { get; protected set; }
public Group Parent { get; protected set; }
public Group()
public Group(string groupname, Group parentgroup = null)
{
throw new Exception("Called Group constructor with no parameters");
}
public string GetName()
{
return name;
}
public Group GetParent()
{
return parent;
Name = groupname;
Parent = parentgroup;
}
public virtual bool HasPermission(string permission)
@ -54,25 +40,25 @@ namespace TShockAPI
{
return true;
}
if (negatedPermissions.Contains(permission))
if (negatedpermissions.Contains(permission))
{
return false;
}
else if (permissions.Contains(permission))
if (permissions.Contains(permission))
{
return true;
}
else if (parent != null)
if (Parent != null)
{
//inception
return parent.HasPermission(permission);
return Parent.HasPermission(permission);
}
return false;
}
public void NegatePermission(string permission)
{
negatedPermissions.Add(permission);
negatedpermissions.Add(permission);
}
public void AddPermission(string permission)
@ -83,11 +69,8 @@ namespace TShockAPI
public class SuperAdminGroup : Group
{
public SuperAdminGroup(string groupName, Group parentGroup = null) : base(groupName, parentGroup)
{
}
public SuperAdminGroup()
public SuperAdminGroup(string groupName, Group parentGroup = null)
: base(groupName, parentGroup)
{
}

2
TShockAPI/TShock.cs
View file

@ -570,7 +570,7 @@ namespace TShockAPI
if (Main.netMode != 2)
return;
Log.Info(string.Format("{0} ({1}) from '{2}' group joined.", Tools.FindPlayer(who), Tools.GetPlayerIP(who), players[who].Group.GetName()));
Log.Info(string.Format("{0} ({1}) from '{2}' group joined.", Tools.FindPlayer(who), Tools.GetPlayerIP(who), players[who].Group.Name));
Tools.ShowMOTD(who);
if (HackedHealth(who))

6
TShockAPI/Tools.cs
View file

@ -415,7 +415,7 @@ namespace TShockAPI
{
for (int j = 0; j < groups.Count; j++)
{
if (groups[j].GetName().Equals(parent))
if (groups[j].Name.Equals(parent))
{
group = new Group(name, groups[j]);
break;
@ -455,7 +455,7 @@ namespace TShockAPI
//first attempt on cached groups
for (int i = 0; i < groups.Count; i++)
{
if (groups[i].GetName().Equals(groupName))
if (groups[i].Name.Equals(groupName))
{
return groups[i];
}
@ -465,7 +465,7 @@ namespace TShockAPI
for (int i = 0; i < groups.Count; i++)
{
if (groups[i].GetName().Equals(groupName))
if (groups[i].Name.Equals(groupName))
{
return groups[i];
}