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

Merge pull request #376 from k0rd/bugfix-devel

Browse source 
-maxplayers and -players override ; added hallowed vines and plants to /removespecial
This commit is contained in:
Will 2012-02-13 10:44:10 -08:00
commit 862a06e820
2 changed files with 41 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/Commands.cs Normal file → Executable file
View file

@ -1554,6 +1554,8 @@ namespace TShockAPI
Main.tile[x, y].type = 2; Main.tile[x, y].type = 2;
break; break;
case 32: case 32:
case 113:
case 110:
Main.tile[x, y].type = 0; Main.tile[x, y].type = 0;
Main.tile[x, y].active = false; Main.tile[x, y].active = false;
break; break;
@ -1564,9 +1566,12 @@ namespace TShockAPI
case 116: case 116:
Main.tile[x, y].type = 53; Main.tile[x, y].type = 53;
break; break;
case 113: case 118:
Main.tile[x, y].type = 38; Main.tile[x, y].type = 38;
break; break;
case 115:
Main.tile[x, y].type = 52;
break;
default: default:
continue; continue;
} }
@ -2205,6 +2210,7 @@ namespace TShockAPI
private static void Reload(CommandArgs args) private static void Reload(CommandArgs args)
{ {
FileTools.SetupConfig(); FileTools.SetupConfig();
TShock.HandleCommandLinePostConfigLoad(Environment.GetCommandLineArgs());
TShock.Groups.LoadPermisions(); TShock.Groups.LoadPermisions();
TShock.Regions.ReloadAllRegions(); TShock.Regions.ReloadAllRegions();
args.Player.SendMessage( args.Player.SendMessage(

7
TShockAPI/TShock.cs Normal file → Executable file
View file

@ -355,7 +355,7 @@ namespace TShockAPI
} }
} }
private void HandleCommandLinePostConfigLoad(string[] parms) public static void HandleCommandLinePostConfigLoad(string[] parms)
{ {
for (int i = 0; i < parms.Length; i++) for (int i = 0; i < parms.Length; i++)
{ {
@ -385,6 +385,11 @@ namespace TShockAPI
Console.WriteLine("Startup parameter overrode REST port."); Console.WriteLine("Startup parameter overrode REST port.");
} }
if ((parms[i].ToLower() == "-maxplayers")||(parms[i].ToLower() == "-players"))
{
Config.MaxSlots = Convert.ToInt32(parms[++i]);
Console.WriteLine("Startup parameter overrode maximum player slot configuration value.");
}
} }
} }