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

Converted all files to LF line endings

Browse source
This commit is contained in:
stevenh 2012-02-21 15:56:34 +00:00
parent 3890a82b0e
commit 41dbd31aac
21 changed files with 14591 additions and 14591 deletions
Download patch file Download diff file Expand all files Collapse all files

200
TShockAPI/Commands.cs
View file

@ -1,4 +1,4 @@
/*
/*
TShock, a server mod for Terraria
Copyright (C) 2011 The TShock Team
@ -583,10 +583,10 @@ namespace TShockAPI
// User deletion requires a username
else if (subcmd == "del" && args.Parameters.Count == 2)
{
var user = new User();
if (args.Parameters[1].Split('.').Count() ==4)
// changed to support dot character in usernames
var user = new User();
if (args.Parameters[1].Split('.').Count() ==4)
// changed to support dot character in usernames
// if (args.Parameters[1].Contains("."))
user.Address = args.Parameters[1];
else
@ -632,7 +632,7 @@ namespace TShockAPI
// Group changing requires a username or IP address, and a new group to set
else if (subcmd == "group")
{
var user = new User();
var user = new User();
if (args.Parameters[1].Split('.').Count()==4)
//changed to support dot character in usernames
@ -1116,34 +1116,34 @@ namespace TShockAPI
else if (args.Parameters[0] == "gold")
{
num = 5;
}
else if (args.Parameters[0] == "demonite")
{
num = 7;
}
else if (args.Parameters[0] == "sapphire")
{
num = 8;
}
else if (args.Parameters[0] == "ruby")
{
num = 9;
}
else if (args.Parameters[0] == "emerald")
{
num = 10;
}
else if (args.Parameters[0] == "topaz")
{
num = 11;
}
else if (args.Parameters[0] == "amethyst")
{
num = 12;
}
else if (args.Parameters[0] == "diamond")
{
num = 13;
else if (args.Parameters[0] == "demonite")
{
num = 7;
}
else if (args.Parameters[0] == "sapphire")
{
num = 8;
}
else if (args.Parameters[0] == "ruby")
{
num = 9;
}
else if (args.Parameters[0] == "emerald")
{
num = 10;
}
else if (args.Parameters[0] == "topaz")
{
num = 11;
}
else if (args.Parameters[0] == "amethyst")
{
num = 12;
}
else if (args.Parameters[0] == "diamond")
{
num = 13;
}
else
{
@ -1179,40 +1179,40 @@ namespace TShockAPI
num = 9;
num3 *= 1.1f;
}
else if (num == 7)
{
num = 22;
num3 *= 1;
}
else if (num == 8)
{
num = 63;
num3 *= .80f;
}
else if (num == 9)
{
num = 64;
num3 *=1;
}
else if (num == 10)
{
num = 65;
num3 *= 1;
}
else if (num == 11)
{
num = 66;
num3 *= 1;
}
else if (num == 12)
{
num = 67;
num3 *= 1;
}
else if (num == 13)
{
num = 68;
num3 *= 1;
else if (num == 7)
{
num = 22;
num3 *= 1;
}
else if (num == 8)
{
num = 63;
num3 *= .80f;
}
else if (num == 9)
{
num = 64;
num3 *=1;
}
else if (num == 10)
{
num = 65;
num3 *= 1;
}
else if (num == 11)
{
num = 66;
num3 *= 1;
}
else if (num == 12)
{
num = 67;
num3 *= 1;
}
else if (num == 13)
{
num = 68;
num3 *= 1;
}
else
{
@ -1598,38 +1598,38 @@ namespace TShockAPI
for (int x = 0; x < Main.maxTilesX; x++)
{
for (int y = 0; y < Main.maxTilesY; y++)
{
switch (Main.tile[x, y].type)
{
case 117:
case 25:
Main.tile[x, y].type = 1;
break;
case 109:
case 23:
Main.tile[x, y].type = 2;
break;
case 32:
case 113:
case 110:
Main.tile[x, y].type = 0;
Main.tile[x, y].active = false;
break;
case 24:
Main.tile[x, y].type = 3;
break;
case 112:
case 116:
Main.tile[x, y].type = 53;
break;
case 118:
Main.tile[x, y].type = 38;
break;
case 115:
Main.tile[x, y].type = 52;
break;
default:
continue;
{
switch (Main.tile[x, y].type)
{
case 117:
case 25:
Main.tile[x, y].type = 1;
break;
case 109:
case 23:
Main.tile[x, y].type = 2;
break;
case 32:
case 113:
case 110:
Main.tile[x, y].type = 0;
Main.tile[x, y].active = false;
break;
case 24:
Main.tile[x, y].type = 3;
break;
case 112:
case 116:
Main.tile[x, y].type = 53;
break;
case 118:
Main.tile[x, y].type = 38;
break;
case 115:
Main.tile[x, y].type = 52;
break;
default:
continue;
}
}
}
@ -2262,7 +2262,7 @@ namespace TShockAPI
private static void Reload(CommandArgs args)
{
FileTools.SetupConfig();
FileTools.SetupConfig();
TShock.HandleCommandLinePostConfigLoad(Environment.GetCommandLineArgs());
TShock.Groups.LoadPermisions();
TShock.Regions.ReloadAllRegions();