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

Merge branch 'general-devel' into addtileentityinteraction

Browse source
This commit is contained in:
Patrikkk 2020-06-25 01:52:06 +02:00 • committed by GitHub
commit c6723dbfa4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

34
TShockAPI/Commands.cs
View file

@ -521,7 +521,7 @@ namespace TShockAPI
{
HelpText = "Changes the wind speed."
});
add(new Command(Permissions.worldinfo, WorldInfo, "world")
add(new Command(Permissions.worldinfo, WorldInfo, "worldinfo")
{
HelpText = "Shows information about the current world."
});
@ -1155,9 +1155,11 @@ namespace TShockAPI
private static void WorldInfo(CommandArgs args)
{
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);
args.Player.SendInfoMessage("Information of the currently running world");
args.Player.SendInfoMessage("Name: " + (TShock.Config.UseServerName ? TShock.Config.ServerName : Main.worldName));
args.Player.SendInfoMessage("Size: {0}x{1}", Main.maxTilesX, Main.maxTilesY);
args.Player.SendInfoMessage("ID: " + Main.worldID);
args.Player.SendInfoMessage("Seed: " + WorldGen.currentWorldSeed);
}
#endregion
@ -3749,6 +3751,14 @@ namespace TShockAPI
}
#endregion
return;
default:
#region Default
{
args.Player.SendErrorMessage("Invalid subcommand! Type {0}itemban help for more information on valid subcommands.", Specifier);
}
#endregion
return;
}
}
#endregion Item Management
@ -3919,6 +3929,13 @@ namespace TShockAPI
}
#endregion
return;
default:
#region Default
{
args.Player.SendErrorMessage("Invalid subcommand! Type {0}projban help for more information on valid subcommands.", Specifier);
}
#endregion
return;
}
}
#endregion Projectile Management
@ -4088,6 +4105,13 @@ namespace TShockAPI
}
#endregion
return;
default:
#region Default
{
args.Player.SendErrorMessage("Invalid subcommand! Type {0}tileban help for more information on valid subcommands.", Specifier);
}
#endregion
return;
}
}
#endregion Tile Management
@ -5066,7 +5090,7 @@ namespace TShockAPI
{
if (displayIdsRequested)
{
players.Add(String.Format("{0} (ID: {1}{2})", ply.Name, ply.Index, ply.Account != null ? ", ID: " + ply.Account.ID : ""));
players.Add(String.Format("{0} (Index: {1}{2})", ply.Name, ply.Index, ply.Account != null ? ", Account ID: " + ply.Account.ID : ""));
}
else
{

9
TShockAPI/DB/GroupManager.cs
View file

@ -77,7 +77,7 @@ namespace TShockAPI.DB
Permissions.whisper,
Permissions.wormhole,
Permissions.canpaint,
Permissions.pylon));
Permissions.pylon));
AddDefaultGroup("vip", "default",
string.Join(",",
@ -125,7 +125,7 @@ namespace TShockAPI.DB
Permissions.tppos,
Permissions.tpsilent,
Permissions.userinfo,
Permissions.spawn));
Permissions.spawn));
AddDefaultGroup("trustedadmin", "admin",
string.Join(",",
@ -158,7 +158,8 @@ namespace TShockAPI.DB
Permissions.startdd2,
Permissions.uploaddata,
Permissions.uploadothersdata,
Permissions.journey_timefreeze,
Permissions.spawnpets,
Permissions.journey_timefreeze,
Permissions.journey_timeset,
Permissions.journey_timespeed,
Permissions.journey_godmode,
@ -170,7 +171,7 @@ namespace TShockAPI.DB
Permissions.journey_setdifficulty,
Permissions.journey_biomespreadfreeze,
Permissions.journey_setspawnrate,
Permissions.journey_contributeresearch));
Permissions.journey_contributeresearch));
AddDefaultGroup("owner", "trustedadmin",
string.Join(",",