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

Merge branch 'general-devel' of github.com:TShock/TShock into general-devel

Browse source
This commit is contained in:
Zidonuke 2011-12-27 11:36:29 -05:00
commit a766f1e5d9
3 changed files with 16 additions and 10 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);
} }

21
TShockAPI/DB/RegionManager.cs
View file

@ -618,6 +618,7 @@ namespace TShockAPI.DB
DisableBuild = true; DisableBuild = true;
WorldID = string.Empty; WorldID = string.Empty;
AllowedIDs = new List<int>(); AllowedIDs = new List<int>();
AllowedGroups = new List<string>();
} }
public bool InArea(Rectangle point) public bool InArea(Rectangle point)
@ -662,15 +663,19 @@ namespace TShockAPI.DB
AllowedIDs = id_list; AllowedIDs = id_list;
} }
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;
}
}
public void RemoveID(int id) public void RemoveID(int id)
{ {

2
TShockAPI/TSPlayer.cs
View file

@ -377,7 +377,7 @@ namespace TShockAPI
public override void SendMessage(string msg, byte red, byte green, byte blue) public override void SendMessage(string msg, byte red, byte green, byte blue)
{ {
Console.WriteLine(msg); Console.WriteLine(msg);
RconHandler.Response += msg + "\n"; //RconHandler.Response += msg + "\n";
} }
public void SetFullMoon(bool fullmoon) public void SetFullMoon(bool fullmoon)