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

Warp now uses int(11) instead of char(4).

Browse source
This commit is contained in:
high 2011-07-05 05:45:34 -04:00
parent c26867633a
commit 80b07c5dd8
4 changed files with 24 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

22
TShockAPI/BanManager.cs
View file

@ -22,6 +22,7 @@ using System.Data;
using System.IO;
using System.Text;
using Community.CsharpSqlite.SQLiteClient;
using TShockAPI.DB;
namespace TShockAPI
{
@ -48,7 +49,7 @@ namespace TShockAPI
using (var com = database.CreateCommand())
{
com.CommandText = "SELECT * FROM Bans WHERE IP=@ip";
AddParameter(com, "@ip", ip);
com.AddParameter("@ip", ip);
using (var reader = com.ExecuteReader())
{
if (reader.Read())
@ -61,15 +62,6 @@ namespace TShockAPI
}
return null;
}
static IDbDataParameter AddParameter(IDbCommand command, string name, object data)
{
var parm = command.CreateParameter();
parm.ParameterName = name;
parm.Value = data;
command.Parameters.Add(parm);
return parm;
}
public Ban GetBanByName(string name, bool casesensitive = true)
{
@ -81,7 +73,7 @@ namespace TShockAPI
if (!casesensitive)
name = name.ToUpper();
com.CommandText = "SELECT * FROM Bans WHERE " + namecol + "=@name";
AddParameter(com, "@name", name);
com.AddParameter("@name", name);
using (var reader = com.ExecuteReader())
{
if (reader.Read())
@ -102,9 +94,9 @@ namespace TShockAPI
using (var com = database.CreateCommand())
{
com.CommandText = "INSERT INTO Bans (IP, Name, Reason) VALUES (@ip, @name, @reason)";
AddParameter(com, "@ip", ip);
AddParameter(com, "@name", name);
AddParameter(com, "@reason", reason);
com.AddParameter("@ip", ip);
com.AddParameter("@name", name);
com.AddParameter("@reason", reason);
com.ExecuteNonQuery();
}
return true;
@ -122,7 +114,7 @@ namespace TShockAPI
using (var com = database.CreateCommand())
{
com.CommandText = "DELETE FROM Bans WHERE IP=@ip";
AddParameter(com, "@ip", ip);
com.AddParameter("@ip", ip);
com.ExecuteNonQuery();
return true;
}

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.3.2.0701")]
[assembly: AssemblyFileVersion("2.3.2.0701")]
[assembly: AssemblyVersion("2.3.2.0705")]
[assembly: AssemblyFileVersion("2.3.2.0705")]

4
TShockAPI/TShockAPI.csproj
View file

@ -77,6 +77,7 @@
<ItemGroup>
<Compile Include="BackupManager.cs" />
<Compile Include="BanManager.cs" />
<Compile Include="DB\DbExt.cs" />
<Compile Include="IPackable.cs" />
<Compile Include="ItemManager.cs" />
<Compile Include="Commands.cs" />
@ -138,6 +139,7 @@
<ItemGroup>
<Content Include="config\itembans.txt" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
@ -148,7 +150,7 @@
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_StartDate="2011/6/17" BuildVersion_IncrementBeforeBuild="False" />
<UserProperties BuildVersion_IncrementBeforeBuild="False" BuildVersion_StartDate="2011/6/17" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_BuildAction="Both" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" />
</VisualStudio>
</ProjectExtensions>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

30
TShockAPI/WarpsManager.cs
View file

@ -25,6 +25,7 @@ using Community.CsharpSqlite.SQLiteClient;
using Microsoft.Xna.Framework;
using System.Xml;
using Terraria;
using TShockAPI.DB;
namespace TShockAPI
{
@ -41,19 +42,12 @@ namespace TShockAPI
using (var com = database.CreateCommand())
{
com.CommandText =
"CREATE TABLE IF NOT EXISTS \"Warps\" (\"X\" VARCHAR(4) NOT NULL UNIQUE, \"Y\" VARCHAR(4) NOT NULL UNIQUE , \"WarpName\" VARCHAR(32) NOT NULL , \"WorldName\" VARCHAR(255) NOT NULL );";
"CREATE TABLE IF NOT EXISTS \"Warps\" (\"X\" INTEGER(11) NOT NULL UNIQUE, \"Y\" INTEGER(11) NOT NULL UNIQUE , \"WarpName\" VARCHAR(32) NOT NULL UNIQUE , \"WorldName\" VARCHAR(255) NOT NULL );";
com.ExecuteNonQuery();
}
}
static IDbDataParameter AddParameter(IDbCommand command, string name, object data)
{
var parm = command.CreateParameter();
parm.ParameterName = name;
parm.Value = data;
command.Parameters.Add(parm);
return parm;
}
public bool AddWarp(int x, int y, string name, string worldname)
{
@ -62,10 +56,10 @@ namespace TShockAPI
using (var com = database.CreateCommand())
{
com.CommandText = "INSERT INTO Warps (X, Y, WarpName, WorldName) VALUES (@x, @y, @name, @worldname)";
AddParameter(com, "@x", x);
AddParameter(com, "@y", y);
AddParameter(com, "@name", name.ToLower());
AddParameter(com, "@worldname", worldname);
com.AddParameter("@x", x);
com.AddParameter("@y", y);
com.AddParameter("@name", name.ToLower());
com.AddParameter("@worldname", worldname);
com.ExecuteNonQuery();
}
return true;
@ -83,8 +77,8 @@ namespace TShockAPI
using (var com = database.CreateCommand())
{
com.CommandText = "DELETE FROM Warps WHERE WarpName=@name AND WorldName=@worldname";
AddParameter(com, "@name", name.ToLower());
AddParameter(com, "@worldname", Main.worldName);
com.AddParameter("@name", name.ToLower());
com.AddParameter("@worldname", Main.worldName);
com.ExecuteNonQuery();
return true;
}
@ -102,12 +96,12 @@ namespace TShockAPI
using (var com = database.CreateCommand())
{
com.CommandText = "SELECT * FROM Warps WHERE WarpName=@name AND WorldName=@worldname";
AddParameter(com, "@name", name.ToLower());
AddParameter(com, "@worldname", Main.worldName);
com.AddParameter("@name", name.ToLower());
com.AddParameter("@worldname", Main.worldName);
using (var reader = com.ExecuteReader())
{
if (reader.Read())
return new Warp(new Vector2(Int32.Parse((string)reader["X"]),Int32.Parse((string)reader["Y"])), (string)reader["WarpName"], (string)reader["WorldName"]);
return new Warp(new Vector2(reader.Get<int>("X"),reader.Get<int>("Y")), reader.Get<string>("WarpName"), reader.Get<string>("WorldName"));
}
}
}