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

Move TShock.CheckSpawn to Utils.IsInSpawn

Browse source 
Continuing in the quest to clean things out of the TShock main class,
this moves CheckSpawn out and renames it for clarity.
This commit is contained in:
Lucas Nicodemus 2017-12-21 19:54:14 -07:00
parent d4cb07379b
commit 64241a44c7
3 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
TShockAPI/TShock.cs
View file

@ -1846,7 +1846,7 @@ namespace TShockAPI
{
if (!player.HasPermission(Permissions.editspawn))
{
if (CheckSpawn(tileX, tileY))
if (Utils.IsInSpawn(tileX, tileY))
{
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.SPm) > 2000)
{
@ -1913,7 +1913,7 @@ namespace TShockAPI
{
if (!player.HasPermission(Permissions.editspawn))
{
if (CheckSpawn(tileX, tileY))
if (Utils.IsInSpawn(tileX, tileY))
{
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.SPm) > 1000)
{
@ -1927,16 +1927,7 @@ namespace TShockAPI
return false;
}
/// <summary>CheckSpawn - Checks to see if a location is inside the spawn protection zone.</summary>
/// <param name="x">x - The x coordinate to check.</param>
/// <param name="y">y - The y coordinate to check.</param>
/// <returns>bool - True if the location is inside the spawn protection zone.</returns>
public static bool CheckSpawn(int x, int y)
{
Vector2 tile = new Vector2(x, y);
Vector2 spawn = new Vector2(Main.spawnTileX, Main.spawnTileY);
return Utils.Distance(spawn, tile) <= Config.SpawnProtectionRadius;
}
/// <summary>Distance - Determines the distance between two vectors.</summary>
/// <param name="value1">value1 - The first vector location.</param>