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

Kill Mono Branch with fire, move it all into general-devel

Browse source
This commit is contained in:
Zidonuke 2011-12-18 21:55:50 -05:00
commit 25c55330fb
12 changed files with 204 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/Commands.cs
View file

@ -1068,7 +1068,7 @@ namespace TShockAPI
args.Player.SendMessage("Can't spawn Wall of Flesh!", Color.Red);
return;
}
NPC.SpawnWOF(new Microsoft.Xna.Framework.Vector2(args.Player.X, args.Player.Y));
NPC.SpawnWOF(new Vector2(args.Player.X, args.Player.Y));
TShock.Utils.Broadcast(string.Format("{0} has spawned Wall of Flesh!", args.Player.Name));
}

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -36,5 +36,5 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.3.4.1212")]
[assembly: AssemblyFileVersion("3.3.4.1212")]
[assembly: AssemblyVersion("3.3.4.1213")]
[assembly: AssemblyFileVersion("3.3.4.1213")]

7
TShockAPI/TSPlayer.cs
View file

@ -24,8 +24,6 @@ using Terraria;
using TShockAPI.Net;
using Microsoft.Xna.Framework.Graphics;
namespace TShockAPI
{
public class TSPlayer
@ -293,11 +291,6 @@ namespace TShockAPI
SendMessage(msg, color.R, color.G, color.B);
}
public virtual void SendMessage(string msg, Microsoft.Xna.Framework.Color color)
{
SendMessage(msg, color.R, color.G, color.B);
}
public virtual void SendMessage(string msg, byte red, byte green, byte blue)
{
SendData(PacketTypes.ChatText, msg, 255, red, green, blue);

2
TShockAPI/TShock.cs
View file

@ -34,7 +34,7 @@ using System.Net;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading;
using Community.CsharpSqlite.SQLiteClient;
using Mono.Data.Sqlite;
using Hooks;
using MySql.Data.MySqlClient;
using Newtonsoft.Json;

12
TShockAPI/TShockAPI.csproj
View file

@ -48,16 +48,12 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="Community.CsharpSqlite.SQLiteClient, Version=3.7.5.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\SqlBins\Community.CsharpSqlite.SQLiteClient.dll</HintPath>
</Reference>
<Reference Include="HttpServer">
<HintPath>..\HttpBins\HttpServer.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
<Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
<Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" />
<Reference Include="Mono.Data.Sqlite">
<HintPath>..\SqlBins\Mono.Data.Sqlite.dll</HintPath>
</Reference>
<Reference Include="MySql.Data, Version=6.3.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\SqlBins\MySql.Data.dll</HintPath>
@ -184,7 +180,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.

1
TShockAPI/postbuild.bat
View file

@ -1,4 +1,3 @@
@echo off
set pluginspath=C:\Program Files (x86)\Steam\steamapps\common\terraria\serverplugins\
IF NOT EXIST "%pluginspath%" GOTO SkipCopy
attrib -r "%pluginspath%TShockAPI.dll"