Merge branch 'general-devel' of github.com:NyxStudios/TShock into general-devel

This commit is contained in:
Lucas Nicodemus 2015-04-12 21:46:46 -06:00
commit 0f1b334d8e
9 changed files with 29 additions and 85 deletions

View file

@ -1121,7 +1121,7 @@ namespace TShockAPI
private static void WorldInfo(CommandArgs args)
{
args.Player.SendInfoMessage("World name: " + Main.worldName);
args.Player.SendInfoMessage("World name: " + (TShock.Config.UseServerName ? TShock.Config.ServerName : Main.worldName));
args.Player.SendInfoMessage("World size: {0}x{1}", Main.maxTilesX, Main.maxTilesY);
args.Player.SendInfoMessage("World ID: " + Main.worldID);
}