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

Merge pull request #302 from DaGamesta/general-devel

Browse source 
General devel
This commit is contained in:
Lucas Nicodemus 2011-11-29 21:02:09 -08:00
commit d80671c2b3
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
TShockAPI/Commands.cs
View file

@ -152,6 +152,7 @@ namespace TShockAPI
add(Permissions.cfg, ShowConfiguration, "showconfig");
add(Permissions.cfg, ServerPassword, "serverpassword");
add(Permissions.cfg, Save, "save");
add(Permissions.cfg, Settle, "settle");
add(Permissions.cfg, MaxSpawns, "maxspawns");
add(Permissions.cfg, SpawnRate, "spawnrate");
add(Permissions.time, Time, "time");
@ -1580,6 +1581,19 @@ namespace TShockAPI
SaveWorld.Start();
}
private static void Settle(CommandArgs args)
{
if (Liquid.panicMode)
{
args.Player.SendMessage("Liquid is already settling!", Color.Red);
return;
}
Liquid.StartPanic();
Tools.Broadcast("Settling all liquids...");
}
private static void MaxSpawns(CommandArgs args)
{
if (args.Parameters.Count != 1)

4
TShockAPI/TShockAPI.csproj
View file

@ -32,7 +32,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\serverplugins\</OutputPath>
<OutputPath>..\..\..\Downloads\TShock 3.3.4.924\ServerPlugins\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@ -181,7 +181,7 @@
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties BuildVersion_IncrementBeforeBuild="False" BuildVersion_StartDate="2011/6/17" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_BuildAction="Both" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" />
<UserProperties BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_StartDate="2011/6/17" BuildVersion_IncrementBeforeBuild="False" />
</VisualStudio>
</ProjectExtensions>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.