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

Merge pull request #316 from middas/general-devel

Browse source 
General devel
This commit is contained in:
Lucas Nicodemus 2011-12-26 14:59:55 -08:00
commit 70874a3462
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TShockAPI/BackupManager.cs
View file

@ -69,7 +69,8 @@ namespace TShockAPI
foreach (TSPlayer player in TShock.Players) foreach (TSPlayer player in TShock.Players)
{ {
if (player.IsLoggedIn) // prevent null point exceptions
if (player != null && player.IsLoggedIn)
{ {
TShock.InventoryDB.InsertPlayerData(player); TShock.InventoryDB.InsertPlayerData(player);
} }

18
TShockAPI/DB/RegionManager.cs
View file

@ -664,12 +664,20 @@ namespace TShockAPI.DB
public void SetAllowedGroups( String groups ) public void SetAllowedGroups( String groups )
{ {
List<String> groupArr = groups.Split(',').ToList(); // prevent null pointer exceptions
if (!string.IsNullOrEmpty(groups))
for (int i = 0; i < groupArr.Count; i++) {
groupArr[i] = groupArr[i].Trim(); List<String> groupArr = groups.Split(',').ToList();
AllowedGroups = groupArr; for (int i = 0; i < groupArr.Count; i++)
groupArr[i] = groupArr[i].Trim();
AllowedGroups = groupArr;
}
else
{
AllowedGroups = new List<string>();
}
} }
public void RemoveID(int id) public void RemoveID(int id)