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

Merge branch 'master' of github.com:TShock/TShock

Browse source
This commit is contained in:
high 2011-06-25 00:44:21 -04:00
commit f501212dfe
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/ItemManager.cs
View file

@ -25,7 +25,7 @@ namespace TShockAPI
int ID = -1; int ID = -1;
if (Int32.TryParse(line, out ID)) if (Int32.TryParse(line, out ID))
{ {
if (ID <= Main.item.Length) if (ID < Main.maxItemTypes && ID > 0)
{ {
var item = Tools.GetItemById(ID); var item = Tools.GetItemById(ID);
BannedItems.Add(new ItemBan(ID, item.name)); BannedItems.Add(new ItemBan(ID, item.name));

6
TShockAPI/RegionManager.cs
View file

@ -129,11 +129,13 @@ namespace TShockAPI
settingsw.WriteElementString("Point2Y", region.RegionArea.Height.ToString()); settingsw.WriteElementString("Point2Y", region.RegionArea.Height.ToString());
settingsw.WriteElementString("Protected", region.DisableBuild.ToString()); settingsw.WriteElementString("Protected", region.DisableBuild.ToString());
settingsw.WriteElementString("WorldName", region.WorldRegionName); settingsw.WriteElementString("WorldName", region.WorldRegionName);
settingsw.WriteElementString("AllowedUserCount", region.RegionAllowedIPs.Count.ToString()); settingsw.WriteElementString("AllowedUserCount", region.RegionAllowedIPs.Count.ToString());
for (int i = 0; i < region.RegionAllowedIPs.Count; i++) for (int i = 0; i < region.RegionAllowedIPs.Count; i++)
{ {
settingsw.WriteElementString("IP", region.RegionAllowedIPs[i]); settingsw.WriteElementString("IP", region.RegionAllowedIPs[i]);
} }
settingsw.WriteEndElement(); settingsw.WriteEndElement();
} }
@ -231,12 +233,10 @@ namespace TShockAPI
settingr.Read(); settingr.Read();
settingr.Read(); settingr.Read();
if (settingr.Value != "" || settingr.Value != null) if (settingr.Value != "" || settingr.Value != null)
worldname = settingr.Value; worldname = settingr.Value;
else else
Log.Warn("Worldname for region " + name + " is empty"); Log.Warn("Worldname for region " + name + " is empty");
Console.WriteLine(settingr.Value);
settingr.Read(); settingr.Read();
settingr.Read(); settingr.Read();
settingr.Read(); settingr.Read();

1
TShockAPI/TSPlayer.cs
View file

@ -143,6 +143,7 @@ namespace TShockAPI
Main.spawnTileX = tileX; Main.spawnTileX = tileX;
Main.spawnTileY = tileY; Main.spawnTileY = tileY;
SendData(PacketTypes.WorldInfo); SendData(PacketTypes.WorldInfo);
SendTileSquare(tileX, tileY, 30);
if (TPlayer.SpawnX >= 0 && TPlayer.SpawnY >= 0) if (TPlayer.SpawnX >= 0 && TPlayer.SpawnY >= 0)
{ {
Main.tile[TPlayer.SpawnX, TPlayer.SpawnY].active = false; Main.tile[TPlayer.SpawnX, TPlayer.SpawnY].active = false;