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

Fix warps

Browse source
This commit is contained in:
MarioE 2013-11-03 17:10:20 -05:00
parent a9ef5d9b6d
commit 3405acd15b
5 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Commands.cs
View file

@ -2103,7 +2103,7 @@ namespace TShockAPI
bool state = false;
if (Boolean.TryParse(args.Parameters[2], out state))
{
if (TShock.Warps.HideWarp(args.Parameters[1], state))
if (TShock.Warps.Hide(args.Parameters[1], state))
{
if (state)
args.Player.SendSuccessMessage("Warp " + warpName + " is now private.");
@ -3447,7 +3447,7 @@ namespace TShockAPI
if (tsplr != null && tsplr.IsRaptor && tsplr.Group.HasPermission(Permissions.manageregion))
tsplr.SendRaptorRegion(TShock.Regions.GetRegionByName(args.Parameters[1]));
}
TShock.Regions.ReloadAllRegions();
TShock.Regions.Reload();
}
else
args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /region resize <region> <u/d/l/r> <amount>");

12
TShockAPI/DB/RegionManager.cs
View file

@ -27,11 +27,14 @@ namespace TShockAPI.DB
{
public class RegionManager
{
/// <summary>
/// The list of regions.
/// </summary>
public List<Region> Regions = new List<Region>();
private IDbConnection database;
public RegionManager(IDbConnection db)
internal RegionManager(IDbConnection db)
{
database = db;
var table = new SqlTable("Regions",
@ -52,11 +55,12 @@ namespace TShockAPI.DB
? (IQueryBuilder) new SqliteQueryCreator()
: new MysqlQueryCreator());
creator.EnsureExists(table);
ReloadAllRegions();
}
public void ReloadAllRegions()
/// <summary>
/// Reloads all regions.
/// </summary>
public void Reload()
{
try
{

8
TShockAPI/DB/WarpsManager.cs
View file

@ -35,7 +35,7 @@ namespace TShockAPI.DB
public List<Warp> Warps = new List<Warp>();
[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
public WarpManager(IDbConnection db)
internal WarpManager(IDbConnection db)
{
database = db;
@ -51,8 +51,6 @@ namespace TShockAPI.DB
? (IQueryBuilder) new SqliteQueryCreator()
: new MysqlQueryCreator());
creator.EnsureExists(table);
ReloadWarps();
}
/// <summary>
@ -95,7 +93,7 @@ namespace TShockAPI.DB
Warps.Add(new Warp(
new Point(reader.Get<int>("X"), reader.Get<int>("Y")),
reader.Get<string>("WarpName"),
reader.Get<string>("Private") != "0"));
(reader.Get<string>("Private") ?? "0") != "0"));
}
}
}
@ -164,7 +162,7 @@ namespace TShockAPI.DB
/// <param name="warpName">The warp name.</param>
/// <param name="state">The state.</param>
/// <returns>Whether the operation suceeded.</returns>
public bool HideWarp(string warpName, bool state)
public bool Hide(string warpName, bool state)
{
try
{

5
TShockAPI/TShock.cs
View file

@ -612,12 +612,11 @@ namespace TShockAPI
AuthToken = 0;
}
Regions.ReloadAllRegions();
Regions.Reload();
Warps.ReloadWarps();
Lighting.lightMode = 2;
FixChestStacks();
}
private void FixChestStacks()

2
TShockAPI/Utils.cs
View file

@ -591,7 +591,7 @@ namespace TShockAPI
FileTools.SetupConfig();
TShock.HandleCommandLinePostConfigLoad(Environment.GetCommandLineArgs());
TShock.Groups.LoadPermisions();
TShock.Regions.ReloadAllRegions();
TShock.Regions.Reload();
TShock.Itembans.UpdateItemBans();
Hooks.GeneralHooks.OnReloadEvent(player);
}