Merge branch 'sql' of github.com:TShock/TShock into general-devel-sql (test)

This commit is contained in:
Twitchy 2011-07-12 15:49:24 +12:00
commit 9cefc69075
23 changed files with 1369 additions and 834 deletions

View file

@ -1,4 +1,4 @@
/*
/*
TShock, a server mod for Terraria
Copyright (C) 2011 The TShock Team
@ -34,7 +34,7 @@ namespace TShockAPI
{
foreach (Warp nametest in Warps)
{
if (name.ToLower() == nametest.WarpName.ToLower() && worldname == nametest.WorldWarpName)
if (name.ToLower() == nametest.WarpName.ToLower())
{
return false;
}