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

You can now add entire groups to a region. You can define as many groups as you want to a region, just like users. The new commands are /region allowg group region and /region removeg group region.

Browse source 
Any player in the group has build rights in the region.
This commit is contained in:
Zack Piispanen 2011-12-24 15:21:16 -05:00
parent 1aed7f4bdb
commit d0a9b47f2f
2 changed files with 167 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

74
TShockAPI/Commands.cs
View file

@ -1984,7 +1984,7 @@ namespace TShockAPI
var width = Math.Abs(args.Player.TempPoints[0].X - args.Player.TempPoints[1].X); var width = Math.Abs(args.Player.TempPoints[0].X - args.Player.TempPoints[1].X);
var height = Math.Abs(args.Player.TempPoints[0].Y - args.Player.TempPoints[1].Y); var height = Math.Abs(args.Player.TempPoints[0].Y - args.Player.TempPoints[1].Y);
if (TShock.Regions.AddRegion(x, y, width, height, regionName, Main.worldID.ToString())) if (TShock.Regions.AddRegion(x, y, width, height, regionName, args.Player.UserAccountName, Main.worldID.ToString()))
{ {
args.Player.TempPoints[0] = Point.Zero; args.Player.TempPoints[0] = Point.Zero;
args.Player.TempPoints[1] = Point.Zero; args.Player.TempPoints[1] = Point.Zero;
@ -2120,8 +2120,78 @@ namespace TShockAPI
} }
} }
else else
args.Player.SendMessage("Invalid syntax! Proper syntax: /region allow [name] [region]", Color.Red); args.Player.SendMessage("Invalid syntax! Proper syntax: /region remove [name] [region]", Color.Red);
break; break;
case "allowg":
{
if (args.Parameters.Count > 2)
{
string group = args.Parameters[1];
string regionName = "";
for (int i = 2; i < args.Parameters.Count; i++)
{
if (regionName == "")
{
regionName = args.Parameters[2];
}
else
{
regionName = regionName + " " + args.Parameters[i];
}
}
if (TShock.Groups.GroupExists(group))
{
if (TShock.Regions.AllowGroup(regionName, group))
{
args.Player.SendMessage("Added group " + group + " to " + regionName, Color.Yellow);
}
else
args.Player.SendMessage("Region " + regionName + " not found", Color.Red);
}
else
{
args.Player.SendMessage("Group " + group + " not found", Color.Red);
}
}
else
args.Player.SendMessage("Invalid syntax! Proper syntax: /region allow [group] [region]", Color.Red);
break;
}
case "removeg":
if (args.Parameters.Count > 2)
{
string group = args.Parameters[1];
string regionName = "";
for (int i = 2; i < args.Parameters.Count; i++)
{
if (regionName == "")
{
regionName = args.Parameters[2];
}
else
{
regionName = regionName + " " + args.Parameters[i];
}
}
if (TShock.Groups.GroupExists(group))
{
if (TShock.Regions.RemoveGroup(regionName, group))
{
args.Player.SendMessage("Removed group " + group + " from " + regionName, Color.Yellow);
}
else
args.Player.SendMessage("Region " + regionName + " not found", Color.Red);
}
else
{
args.Player.SendMessage("Group " + group + " not found", Color.Red);
}
}
else
args.Player.SendMessage("Invalid syntax! Proper syntax: /region removeg [group] [region]", Color.Red);
break;
case "list": case "list":
{ {
//How many regions per page //How many regions per page

114
TShockAPI/DB/RegionManager.cs
View file

@ -38,7 +38,6 @@ namespace TShockAPI.DB
public RegionManager(IDbConnection db) public RegionManager(IDbConnection db)
{ {
database = db; database = db;
var table = new SqlTable("Regions", var table = new SqlTable("Regions",
new SqlColumn("X1", MySqlDbType.Int32), new SqlColumn("X1", MySqlDbType.Int32),
new SqlColumn("Y1", MySqlDbType.Int32), new SqlColumn("Y1", MySqlDbType.Int32),
@ -47,7 +46,10 @@ namespace TShockAPI.DB
new SqlColumn("RegionName", MySqlDbType.VarChar, 50) { Primary = true }, new SqlColumn("RegionName", MySqlDbType.VarChar, 50) { Primary = true },
new SqlColumn("WorldID", MySqlDbType.Text), new SqlColumn("WorldID", MySqlDbType.Text),
new SqlColumn("UserIds", MySqlDbType.Text), new SqlColumn("UserIds", MySqlDbType.Text),
new SqlColumn("Protected", MySqlDbType.Int32) new SqlColumn("Protected", MySqlDbType.Int32),
new SqlColumn("Groups", MySqlDbType.Text),
new SqlColumn("Owner", MySqlDbType.VarChar, 50)
); );
var creator = new SqlTableCreator(db, db.GetSqlType() == SqlType.Sqlite ? (IQueryBuilder)new SqliteQueryCreator() : new MysqlQueryCreator()); var creator = new SqlTableCreator(db, db.GetSqlType() == SqlType.Sqlite ? (IQueryBuilder)new SqliteQueryCreator() : new MysqlQueryCreator());
creator.EnsureExists(table); creator.EnsureExists(table);
@ -180,11 +182,13 @@ namespace TShockAPI.DB
int Protected = reader.Get<int>("Protected"); int Protected = reader.Get<int>("Protected");
string mergedids = reader.Get<string>("UserIds"); string mergedids = reader.Get<string>("UserIds");
string name = reader.Get<string>("RegionName"); string name = reader.Get<string>("RegionName");
string owner = reader.Get<string>("Owner");
string groups = reader.Get<string>("Groups");
string[] splitids = mergedids.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries); string[] splitids = mergedids.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
Region r = new Region(new Rectangle(X1, Y1, width, height), name, Protected != 0, Main.worldID.ToString()); Region r = new Region(new Rectangle(X1, Y1, width, height), name, owner, Protected != 0, Main.worldID.ToString());
r.SetAllowedGroups( groups );
try try
{ {
for (int i = 0; i < splitids.Length; i++) for (int i = 0; i < splitids.Length; i++)
@ -231,8 +235,11 @@ namespace TShockAPI.DB
string MergedIDs = reader.Get<string>("UserIds"); string MergedIDs = reader.Get<string>("UserIds");
string name = reader.Get<string>("RegionName"); string name = reader.Get<string>("RegionName");
string[] SplitIDs = MergedIDs.Split(','); string[] SplitIDs = MergedIDs.Split(',');
string owner = reader.Get<string>("Owner");
string groups = reader.Get<string>("Groups");
Region r = new Region(new Rectangle(X1, Y1, width, height), name, Protected != 0, Main.worldID.ToString()); Region r = new Region(new Rectangle(X1, Y1, width, height), name, owner, Protected != 0, Main.worldID.ToString());
r.SetAllowedGroups( groups );
try try
{ {
for (int i = 0; i < SplitIDs.Length; i++) for (int i = 0; i < SplitIDs.Length; i++)
@ -260,7 +267,7 @@ namespace TShockAPI.DB
} }
public bool AddRegion(int tx, int ty, int width, int height, string regionname, string worldid) public bool AddRegion(int tx, int ty, int width, int height, string regionname, string owner, string worldid)
{ {
if (GetRegionByName(regionname) != null) if (GetRegionByName(regionname) != null)
{ {
@ -268,9 +275,9 @@ namespace TShockAPI.DB
} }
try try
{ {
database.Query("INSERT INTO Regions (X1, Y1, width, height, RegionName, WorldID, UserIds, Protected) VALUES (@0, @1, @2, @3, @4, @5, @6, @7);", database.Query("INSERT INTO Regions (X1, Y1, width, height, RegionName, WorldID, UserIds, Protected, Groups, Owner) VALUES (@0, @1, @2, @3, @4, @5, @6, @7, @8, @9);",
tx, ty, width, height, regionname, worldid, "", 1); tx, ty, width, height, regionname, worldid, "", 1, "", owner);
Regions.Add(new Region(new Rectangle(tx, ty, width, height), regionname, true, worldid)); Regions.Add(new Region(new Rectangle(tx, ty, width, height), regionname, owner, true, worldid));
return true; return true;
} }
catch (Exception ex) catch (Exception ex)
@ -524,23 +531,84 @@ namespace TShockAPI.DB
} }
return null; return null;
} }
public bool ChangeOwner( string regionName, string newOwner )
{
var region = GetRegionByName(regionName);
if( region != null )
{
region.Owner = newOwner;
int q = database.Query("UPDATE Regions SET Owner=@0 WHERE RegionName=@1 AND WorldID=@2", newOwner,
regionName, Main.worldID.ToString());
if (q > 0)
return true;
}
return false;
}
public bool AllowGroup( string regionName, string groups)
{
string groupsNew = "";
using (var reader = database.QueryReader("SELECT * FROM Regions WHERE RegionName=@0 AND WorldID=@1", regionName, Main.worldID.ToString()))
{
if (reader.Read())
groupsNew = reader.Get<string>("Groups");
}
if (groupsNew != "")
groupsNew += ",";
groupsNew += groups;
int q = database.Query("UPDATE Regions SET Groups=@0 WHERE RegionName=@1 AND WorldID=@2", groupsNew,
regionName, Main.worldID.ToString());
Region r = GetRegionByName(regionName);
if( r != null )
{
r.SetAllowedGroups( groupsNew );
}
else
{
return false;
}
return q > 0;
}
public bool RemoveGroup( string regionName, string group )
{
Region r = GetRegionByName(regionName);
if (r != null)
{
r.RemoveGroup(group);
string groups = string.Join(",", r.AllowedGroups);
int q = database.Query("UPDATE Regions SET Groups=@0 WHERE RegionName=@1 AND WorldID=@2", groups,
regionName, Main.worldID.ToString());
if (q > 0)
return true;
}
return false;
}
} }
public class Region public class Region
{ {
public Rectangle Area { get; set; } public Rectangle Area { get; set; }
public string Name { get; set; } public string Name { get; set; }
public string Owner { get; set; }
public bool DisableBuild { get; set; } public bool DisableBuild { get; set; }
public string WorldID { get; set; } public string WorldID { get; set; }
public List<int> AllowedIDs { get; set; } public List<int> AllowedIDs { get; set; }
public List<string> AllowedGroups { get; set; }
public Region(Rectangle region, string name, bool disablebuild, string RegionWorldIDz) public Region(Rectangle region, string name, string owner, bool disablebuild, string RegionWorldIDz)
: this() : this()
{ {
Area = region; Area = region;
Name = name; Name = name;
DisableBuild = disablebuild; Owner = owner;
DisableBuild = disablebuild;
WorldID = RegionWorldIDz; WorldID = RegionWorldIDz;
} }
public Region() public Region()
@ -577,14 +645,7 @@ namespace TShockAPI.DB
return true; return true;
} }
for (int i = 0; i < AllowedIDs.Count; i++) return AllowedIDs.Contains(ply.UserID) || AllowedGroups.Contains(ply.Group.Name) || Owner == ply.UserAccountName;
{
if (AllowedIDs[i] == ply.UserID)
{
return true;
}
}
return false;
} }
public void setAllowedIDs(String ids) public void setAllowedIDs(String ids)
@ -601,6 +662,16 @@ namespace TShockAPI.DB
AllowedIDs = id_list; AllowedIDs = id_list;
} }
public void SetAllowedGroups( String groups )
{
List<String> groupArr = groups.Split(',').ToList();
for (int i = 0; i < groupArr.Count; i++)
groupArr[i] = groupArr[i].Trim();
AllowedGroups = groupArr;
}
public void RemoveID(int id) public void RemoveID(int id)
{ {
var index = -1; var index = -1;
@ -614,5 +685,10 @@ namespace TShockAPI.DB
} }
AllowedIDs.RemoveAt(index); AllowedIDs.RemoveAt(index);
} }
public bool RemoveGroup(string groupName)
{
return AllowedGroups.Remove(groupName);
}
} }
} }