diff --git a/SqlBins/Community.CsharpSqlite.SQLiteClient.dll b/SqlBins/Community.CsharpSqlite.SQLiteClient.dll
deleted file mode 100644
index 269f3f98..00000000
Binary files a/SqlBins/Community.CsharpSqlite.SQLiteClient.dll and /dev/null differ
diff --git a/SqlBins/Community.CsharpSqlite.dll b/SqlBins/Community.CsharpSqlite.dll
deleted file mode 100644
index 2f69364b..00000000
Binary files a/SqlBins/Community.CsharpSqlite.dll and /dev/null differ
diff --git a/SqlBins/MySql.Data.dll b/SqlBins/MySql.Data.dll
index 2f84ad9a..da3babd9 100644
Binary files a/SqlBins/MySql.Data.dll and b/SqlBins/MySql.Data.dll differ
diff --git a/SqlBins/MySql.Web.dll b/SqlBins/MySql.Web.dll
index e815a772..dc69aff8 100644
Binary files a/SqlBins/MySql.Web.dll and b/SqlBins/MySql.Web.dll differ
diff --git a/SqlBins/sqlite3.def b/SqlBins/sqlite3.def
new file mode 100644
index 00000000..3da3804f
--- /dev/null
+++ b/SqlBins/sqlite3.def
@@ -0,0 +1,196 @@
+EXPORTS
+sqlite3_aggregate_context
+sqlite3_aggregate_count
+sqlite3_auto_extension
+sqlite3_backup_finish
+sqlite3_backup_init
+sqlite3_backup_pagecount
+sqlite3_backup_remaining
+sqlite3_backup_step
+sqlite3_bind_blob
+sqlite3_bind_double
+sqlite3_bind_int
+sqlite3_bind_int64
+sqlite3_bind_null
+sqlite3_bind_parameter_count
+sqlite3_bind_parameter_index
+sqlite3_bind_parameter_name
+sqlite3_bind_text
+sqlite3_bind_text16
+sqlite3_bind_value
+sqlite3_bind_zeroblob
+sqlite3_blob_bytes
+sqlite3_blob_close
+sqlite3_blob_open
+sqlite3_blob_read
+sqlite3_blob_reopen
+sqlite3_blob_write
+sqlite3_busy_handler
+sqlite3_busy_timeout
+sqlite3_changes
+sqlite3_clear_bindings
+sqlite3_close
+sqlite3_collation_needed
+sqlite3_collation_needed16
+sqlite3_column_blob
+sqlite3_column_bytes
+sqlite3_column_bytes16
+sqlite3_column_count
+sqlite3_column_database_name
+sqlite3_column_database_name16
+sqlite3_column_decltype
+sqlite3_column_decltype16
+sqlite3_column_double
+sqlite3_column_int
+sqlite3_column_int64
+sqlite3_column_name
+sqlite3_column_name16
+sqlite3_column_origin_name
+sqlite3_column_origin_name16
+sqlite3_column_table_name
+sqlite3_column_table_name16
+sqlite3_column_text
+sqlite3_column_text16
+sqlite3_column_type
+sqlite3_column_value
+sqlite3_commit_hook
+sqlite3_compileoption_get
+sqlite3_compileoption_used
+sqlite3_complete
+sqlite3_complete16
+sqlite3_config
+sqlite3_context_db_handle
+sqlite3_create_collation
+sqlite3_create_collation16
+sqlite3_create_collation_v2
+sqlite3_create_function
+sqlite3_create_function16
+sqlite3_create_function_v2
+sqlite3_create_module
+sqlite3_create_module_v2
+sqlite3_data_count
+sqlite3_db_config
+sqlite3_db_handle
+sqlite3_db_mutex
+sqlite3_db_status
+sqlite3_declare_vtab
+sqlite3_enable_load_extension
+sqlite3_enable_shared_cache
+sqlite3_errcode
+sqlite3_errmsg
+sqlite3_errmsg16
+sqlite3_exec
+sqlite3_expired
+sqlite3_extended_errcode
+sqlite3_extended_result_codes
+sqlite3_file_control
+sqlite3_finalize
+sqlite3_free
+sqlite3_free_table
+sqlite3_get_autocommit
+sqlite3_get_auxdata
+sqlite3_get_table
+sqlite3_global_recover
+sqlite3_initialize
+sqlite3_interrupt
+sqlite3_last_insert_rowid
+sqlite3_libversion
+sqlite3_libversion_number
+sqlite3_limit
+sqlite3_load_extension
+sqlite3_log
+sqlite3_malloc
+sqlite3_memory_alarm
+sqlite3_memory_highwater
+sqlite3_memory_used
+sqlite3_mprintf
+sqlite3_mutex_alloc
+sqlite3_mutex_enter
+sqlite3_mutex_free
+sqlite3_mutex_leave
+sqlite3_mutex_try
+sqlite3_next_stmt
+sqlite3_open
+sqlite3_open16
+sqlite3_open_v2
+sqlite3_os_end
+sqlite3_os_init
+sqlite3_overload_function
+sqlite3_prepare
+sqlite3_prepare16
+sqlite3_prepare16_v2
+sqlite3_prepare_v2
+sqlite3_profile
+sqlite3_progress_handler
+sqlite3_randomness
+sqlite3_realloc
+sqlite3_release_memory
+sqlite3_reset
+sqlite3_reset_auto_extension
+sqlite3_result_blob
+sqlite3_result_double
+sqlite3_result_error
+sqlite3_result_error16
+sqlite3_result_error_code
+sqlite3_result_error_nomem
+sqlite3_result_error_toobig
+sqlite3_result_int
+sqlite3_result_int64
+sqlite3_result_null
+sqlite3_result_text
+sqlite3_result_text16
+sqlite3_result_text16be
+sqlite3_result_text16le
+sqlite3_result_value
+sqlite3_result_zeroblob
+sqlite3_rollback_hook
+sqlite3_rtree_geometry_callback
+sqlite3_set_authorizer
+sqlite3_set_auxdata
+sqlite3_shutdown
+sqlite3_sleep
+sqlite3_snprintf
+sqlite3_soft_heap_limit
+sqlite3_soft_heap_limit64
+sqlite3_sourceid
+sqlite3_sql
+sqlite3_status
+sqlite3_step
+sqlite3_stmt_readonly
+sqlite3_stmt_status
+sqlite3_strnicmp
+sqlite3_table_column_metadata
+sqlite3_test_control
+sqlite3_thread_cleanup
+sqlite3_threadsafe
+sqlite3_total_changes
+sqlite3_trace
+sqlite3_transfer_bindings
+sqlite3_update_hook
+sqlite3_uri_parameter
+sqlite3_user_data
+sqlite3_value_blob
+sqlite3_value_bytes
+sqlite3_value_bytes16
+sqlite3_value_double
+sqlite3_value_int
+sqlite3_value_int64
+sqlite3_value_numeric_type
+sqlite3_value_text
+sqlite3_value_text16
+sqlite3_value_text16be
+sqlite3_value_text16le
+sqlite3_value_type
+sqlite3_vfs_find
+sqlite3_vfs_register
+sqlite3_vfs_unregister
+sqlite3_vmprintf
+sqlite3_vsnprintf
+sqlite3_vtab_config
+sqlite3_vtab_on_conflict
+sqlite3_wal_autocheckpoint
+sqlite3_wal_checkpoint
+sqlite3_wal_checkpoint_v2
+sqlite3_wal_hook
+sqlite3_win32_mbcs_to_utf8
+sqlite3_win32_utf8_to_mbcs
diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index b3cc4cdc..8610c7ae 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -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));
}
diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs
index 7a5973b2..71927ec9 100644
--- a/TShockAPI/Properties/AssemblyInfo.cs
+++ b/TShockAPI/Properties/AssemblyInfo.cs
@@ -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")]
diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs
index 89221924..1cda0126 100644
--- a/TShockAPI/TSPlayer.cs
+++ b/TShockAPI/TSPlayer.cs
@@ -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);
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 0b985c57..1899b94f 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -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;
diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj
index 9a60f687..0fc0d777 100644
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@@ -48,16 +48,12 @@
true
-
- False
- ..\SqlBins\Community.CsharpSqlite.SQLiteClient.dll
-
..\HttpBins\HttpServer.dll
-
-
-
+
+ ..\SqlBins\Mono.Data.Sqlite.dll
+
False
..\SqlBins\MySql.Data.dll
@@ -184,7 +180,7 @@
-
+