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 
Conflicts:
	TShockAPI/Properties/AssemblyInfo.cs
This commit is contained in:
high 2011-09-24 18:31:05 -04:00
commit c4b2d6f438
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/Commands.cs
View file

@ -165,6 +165,7 @@ namespace TShockAPI
add(null, AuthToken, "auth"); add(null, AuthToken, "auth");
add(null, ThirdPerson, "me"); add(null, ThirdPerson, "me");
add(null, PartyChat, "p"); add(null, PartyChat, "p");
add(null, Motd, "motd");
add(null, Rules, "rules"); add(null, Rules, "rules");
add(Permissions.logs, DisplayLogs, "displaylogs"); add(Permissions.logs, DisplayLogs, "displaylogs");
ChatCommands.Add(new Command(PasswordUser, "password") { DoLog = false }); ChatCommands.Add(new Command(PasswordUser, "password") { DoLog = false });
@ -2155,6 +2156,11 @@ namespace TShockAPI
} }
} }
private static void Motd(CommandArgs args)
{
Tools.ShowFileToUser(args.Player, "motd.txt");
}
private static void Rules(CommandArgs args) private static void Rules(CommandArgs args)
{ {
Tools.ShowFileToUser(args.Player, "rules.txt"); Tools.ShowFileToUser(args.Player, "rules.txt");

7
TShockAPI/GetDataHandlers.cs
View file

@ -349,6 +349,13 @@ namespace TShockAPI
args.Player.SendTileSquare(x, y); args.Player.SendTileSquare(x, y);
return true; return true;
} }
if (type == 1 && tiletype == 21 && Tools.MaxChests())
{
args.Player.SendMessage("Reached world's max chest limit, unable to place more!", Color.Red);
Log.Info("Reached world's chest limit, unable to place more.");
args.Player.SendTileSquare(x, y);
return true;
}
} }
if (!args.Player.Group.HasPermission(Permissions.editspawn) && !TShock.Regions.CanBuild(x, y, args.Player) && TShock.Regions.InArea(x, y)) if (!args.Player.Group.HasPermission(Permissions.editspawn) && !TShock.Regions.CanBuild(x, y, args.Player) && TShock.Regions.InArea(x, y))
{ {

2
UnitTests/RegionManagerTest.cs
View file

@ -92,8 +92,6 @@ namespace UnitTests
/** /**
* For now, this test is useless. Need to implement user groups so we can alter Canbuild permission. * For now, this test is useless. Need to implement user groups so we can alter Canbuild permission.
*/ */
TSPlayer t = new TSPlayer(0);
Assert.IsFalse( manager.CanBuild( 100,100,t) );
} }
[TestMethod] [TestMethod]