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

Added reader closing (if it will help) and returns default group rather than "null"

Browse source
This commit is contained in:
Twitchy 2011-07-12 21:16:59 +12:00
parent c090d9a9f6
commit 30d0d48386
8 changed files with 37 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/DB/BanManager.cs
View file

@ -59,6 +59,8 @@ namespace TShockAPI.DB
{ {
if (reader.Read()) if (reader.Read())
return new Ban((string)reader["IP"], (string)reader["Name"], (string)reader["Reason"]); return new Ban((string)reader["IP"], (string)reader["Name"], (string)reader["Reason"]);
reader.Close();
} }
} }
} }
@ -84,6 +86,8 @@ namespace TShockAPI.DB
{ {
if (reader.Read()) if (reader.Read())
return new Ban((string)reader["IP"], (string)reader["Name"], (string)reader["Reason"]); return new Ban((string)reader["IP"], (string)reader["Name"], (string)reader["Reason"]);
reader.Close();
} }
} }
} }

4
TShockAPI/DB/GroupManager.cs
View file

@ -85,6 +85,8 @@ namespace TShockAPI.DB
while (reader.Read()) while (reader.Read())
if (reader.Get<string>("GroupName") == group) if (reader.Get<string>("GroupName") == group)
return true; return true;
reader.Close();
} }
} }
} }
@ -122,6 +124,8 @@ namespace TShockAPI.DB
} }
groups.Add(group); groups.Add(group);
reader.Close();
} }
} }

2
TShockAPI/DB/ItemManager.cs
View file

@ -75,6 +75,8 @@ namespace TShockAPI.DB
if (reader.Read()) if (reader.Read())
if (reader.Get<string>("ItemName") == name) if (reader.Get<string>("ItemName") == name)
return true; return true;
reader.Close();
} }
} }
} }

3
TShockAPI/DB/RegionManager.cs
View file

@ -158,6 +158,7 @@ namespace TShockAPI.DB
return true; return true;
} }
} }
reader.Close();
} }
} }
return false; return false;
@ -208,6 +209,7 @@ namespace TShockAPI.DB
{ {
MergedIDs = reader.Get<string>("UserIds"); MergedIDs = reader.Get<string>("UserIds");
} }
reader.Close();
} }
if (MergedIDs == string.Empty) if (MergedIDs == string.Empty)
@ -242,6 +244,7 @@ namespace TShockAPI.DB
{ {
while (reader.Read()) while (reader.Read())
Regions.Add(new Region(new Rectangle(reader.Get<int>("X1"), reader.Get<int>("Y1"), reader.Get<int>("X2"), reader.Get<int>("Y2")), reader.Get<string>("RegionName"), reader.Get<int>("Protected"), reader.Get<string>("WorldID"))); Regions.Add(new Region(new Rectangle(reader.Get<int>("X1"), reader.Get<int>("Y1"), reader.Get<int>("X2"), reader.Get<int>("Y2")), reader.Get<string>("RegionName"), reader.Get<int>("Protected"), reader.Get<string>("WorldID")));
reader.Close();
} }
} }
} }

15
TShockAPI/DB/UserManager.cs
View file

@ -77,11 +77,15 @@ namespace TShockAPI.DB
using (var reader = com.ExecuteReader()) using (var reader = com.ExecuteReader())
{ {
if (reader.RecordsAffected > 0) if (reader.RecordsAffected > 0)
{
//Return code 1 (User added) //Return code 1 (User added)
return 1; return 1;
}
else else
{
//Return code 0 (Add failed) //Return code 0 (Add failed)
return 0; return 0;
}
} }
} }
} }
@ -112,11 +116,17 @@ namespace TShockAPI.DB
using (var reader = com.ExecuteReader()) using (var reader = com.ExecuteReader())
{ {
if (reader.RecordsAffected > 0) if (reader.RecordsAffected > 0)
{
//Return code 1 (User removed) //Return code 1 (User removed)
reader.Close();
return 1; return 1;
}
else else
{
//Return code 0 (Remove failed) //Return code 0 (Remove failed)
reader.Close();
return 0; return 0;
}
} }
} }
} }
@ -142,6 +152,7 @@ namespace TShockAPI.DB
{ {
com.CommandText = "SELECT * FROM Users WHERE Username=@name"; com.CommandText = "SELECT * FROM Users WHERE Username=@name";
com.AddParameter("@name", username.ToLower()); com.AddParameter("@name", username.ToLower());
using (var reader = com.ExecuteReader()) using (var reader = com.ExecuteReader())
{ {
if (reader.Read()) if (reader.Read())
@ -150,6 +161,7 @@ namespace TShockAPI.DB
returndata[1] = reader.Get<string>("UserGroup"); returndata[1] = reader.Get<string>("UserGroup");
return returndata; return returndata;
} }
reader.Close();
} }
} }
} }
@ -172,6 +184,7 @@ namespace TShockAPI.DB
{ {
com.CommandText = "SELECT * FROM Users WHERE IP=@ip"; com.CommandText = "SELECT * FROM Users WHERE IP=@ip";
com.AddParameter("@ip", ip); com.AddParameter("@ip", ip);
using (var reader = com.ExecuteReader()) using (var reader = com.ExecuteReader())
{ {
if (reader.Read()) if (reader.Read())
@ -179,6 +192,7 @@ namespace TShockAPI.DB
string group = reader.Get<string>("UserGroup"); string group = reader.Get<string>("UserGroup");
return Tools.GetGroup(group); return Tools.GetGroup(group);
} }
reader.Close();
} }
} }
} }
@ -215,6 +229,7 @@ namespace TShockAPI.DB
string ID = reader.Get<string>("ID"); string ID = reader.Get<string>("ID");
return ID; return ID;
} }
reader.Close();
} }
} }
} }

7
TShockAPI/DB/WarpsManager.cs
View file

@ -105,7 +105,10 @@ namespace TShockAPI.DB
using (var reader = com.ExecuteReader()) using (var reader = com.ExecuteReader())
{ {
if (reader.Read()) if (reader.Read())
return new Warp(new Vector2(reader.Get<int>("X"), reader.Get<int>("Y")), reader.Get<string>("WarpName"), reader.Get<string>("WorldID")); {
return new Warp(new Vector2(reader.Get<int>("X"), reader.Get<int>("Y")), reader.Get<string>("WarpName"), reader.Get<string>("WorldID"));
}
reader.Close();
} }
} }
} }
@ -128,6 +131,8 @@ namespace TShockAPI.DB
{ {
while (reader.Read()) while (reader.Read())
Warps.Add(new Warp(new Vector2(reader.Get<int>("X"), reader.Get<int>("Y")), reader.Get<string>("WarpName"), reader.Get<string>("WorldID"))); Warps.Add(new Warp(new Vector2(reader.Get<int>("X"), reader.Get<int>("Y")), reader.Get<string>("WarpName"), reader.Get<string>("WorldID")));
reader.Close();
} }
} }
} }

4
TShockAPI/TShock.cs
View file

@ -312,6 +312,7 @@ namespace TShockAPI
if (!player.Group.HasPermission("usebanneditem")) if (!player.Group.HasPermission("usebanneditem"))
{ {
var inv = player.TPlayer.inventory; var inv = player.TPlayer.inventory;
for (int i = 0; i < inv.Length; i++) for (int i = 0; i < inv.Length; i++)
{ {
if (inv[i] != null && TShock.Itembans.ItemIsBanned(inv[i].name)) if (inv[i] != null && TShock.Itembans.ItemIsBanned(inv[i].name))
@ -328,6 +329,7 @@ namespace TShockAPI
private void OnJoin(int ply, HandledEventArgs handler) private void OnJoin(int ply, HandledEventArgs handler)
{ {
var player = new TSPlayer(ply); var player = new TSPlayer(ply);
player.Group = TShock.Users.GetGroupForIP(player.IP); player.Group = TShock.Users.GetGroupForIP(player.IP);
if (Tools.ActivePlayers() + 1 > TShock.Config.MaxSlots && !player.Group.HasPermission("reservedslot")) if (Tools.ActivePlayers() + 1 > TShock.Config.MaxSlots && !player.Group.HasPermission("reservedslot"))
@ -345,8 +347,6 @@ namespace TShockAPI
return; return;
} }
if (!FileTools.OnWhitelist(player.IP)) if (!FileTools.OnWhitelist(player.IP))
{ {
Tools.ForceKick(player, "Not on whitelist."); Tools.ForceKick(player, "Not on whitelist.");

11
TShockAPI/Tools.cs
View file

@ -478,16 +478,7 @@ namespace TShockAPI
return TShock.Groups.groups[i]; return TShock.Groups.groups[i];
} }
} }
//shit, it didnt work, reload and try again return new Group("default");
TShock.Groups.LoadPermisions();
for (int i = 0; i < TShock.Groups.groups.Count; i++)
{
if (TShock.Groups.groups[i].Name.Equals(groupName))
{
return TShock.Groups.groups[i];
}
}
return new Group("null");
} }
/// <summary> /// <summary>