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

Use less obsolete code

Browse source 
Disable XML comment warnings for the love of god
Fix some random tab/space conflict indentation
This commit is contained in:
Lucas Nicodemus 2015-02-28 19:09:02 -07:00
parent 008de9b28c
commit db6c09787d
4 changed files with 143 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/BackupManager.cs
View file

@ -61,7 +61,7 @@ namespace TShockAPI
if (worldpath != null && !Directory.Exists(worldpath)) if (worldpath != null && !Directory.Exists(worldpath))
Directory.CreateDirectory(worldpath); Directory.CreateDirectory(worldpath);
TShock.Utils.Broadcast("Server map saving, potential lag spike."); TSPlayer.All.SendInfoMessage("Server map saving, potential lag spike.");
Console.WriteLine("Backing up world..."); Console.WriteLine("Backing up world...");
SaveManager.Instance.SaveWorld(); SaveManager.Instance.SaveWorld();

11
TShockAPI/GetDataHandlers.cs
View file

@ -2444,13 +2444,6 @@ namespace TShockAPI
args.Player.RemoveProjectile(ident, owner); args.Player.RemoveProjectile(ident, owner);
return true; return true;
} }
// Server now checks owner + ident, if owner is different, server will create new projectile.
/*if (args.Player.Index != owner)
{
args.Player.Disable(String.Format("Owner ({0}) and player ID ({1}) does not match to update projectile", owner, args.Player.Index));
args.Player.RemoveProjectile(ident, owner);
return true;
}*/
if (dmg > TShock.Config.MaxProjDamage && !args.Player.Group.HasPermission(Permissions.ignoredamagecap)) if (dmg > TShock.Config.MaxProjDamage && !args.Player.Group.HasPermission(Permissions.ignoredamagecap))
{ {
@ -2470,7 +2463,7 @@ namespace TShockAPI
{ {
if (type == 100 || type == 164 || type == 180 || type == 261 || (type > 289 && type < 298) || (type >= 325 && type <= 328) || (type >= 345 && type <= 352)) if (type == 100 || type == 164 || type == 180 || type == 261 || (type > 289 && type < 298) || (type >= 325 && type <= 328) || (type >= 345 && type <= 352))
{ {
Log.Debug("Certain projectiles have been ignored for cheat detection."); TShock.Log.Debug("Certain projectiles have been ignored for cheat detection.");
} }
else else
{ {
@ -2497,7 +2490,7 @@ namespace TShockAPI
{ {
if (type == 90 && TShock.Config.ProjIgnoreShrapnel) // Ignore crystal shards if (type == 90 && TShock.Config.ProjIgnoreShrapnel) // Ignore crystal shards
{ {
Log.Debug("Ignoring shrapnel per config.."); TShock.Log.Debug("Ignoring shrapnel per config..");
} }
else if (!Main.projectile[index].active) else if (!Main.projectile[index].active)
{ {

8
TShockAPI/SaveManager.cs
View file

@ -58,8 +58,8 @@ namespace TShockAPI
} }
catch (Exception ex) catch (Exception ex)
{ {
Log.Error("World saved notification failed"); TShock.Log.Error("World saved notification failed");
Log.Error(ex.ToString()); TShock.Log.Error(ex.ToString());
} }
} }
} }
@ -134,8 +134,8 @@ namespace TShockAPI
} }
catch (Exception e) catch (Exception e)
{ {
Log.Error("World saved failed"); TShock.Log.Error("World saved failed");
Log.Error(e.ToString()); TShock.Log.Error(e.ToString());
} }
} }
} }

3
TShockAPI/TShockAPI.csproj
View file

@ -39,6 +39,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DocumentationFile>bin\Debug\TShockAPI.XML</DocumentationFile> <DocumentationFile>bin\Debug\TShockAPI.XML</DocumentationFile>
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
<NoWarn>1591</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
@ -185,7 +186,7 @@
</PropertyGroup> </PropertyGroup>
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <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> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.