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

Merge pull request #1578 from Pryaxis/checkspawn

Browse source 
Move TShock.CheckSpawn to Utils.IsInSpawn
This commit is contained in:
Chris 2017-12-23 12:25:54 +10:30 • committed by GitHub
commit fe62b14a13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -60,6 +60,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Added `TSPlayer.CheckIgnores()` and removed `TShock.CheckIgnores(TSPlayer)`. (@hakusaro) * Added `TSPlayer.CheckIgnores()` and removed `TShock.CheckIgnores(TSPlayer)`. (@hakusaro)
* Hooks inside TShock can now be registered with their `Register` method and can be prioritized according to the TShock HandlerList system. (@hakusaro) * Hooks inside TShock can now be registered with their `Register` method and can be prioritized according to the TShock HandlerList system. (@hakusaro)
* Fix message requiring login not using the command specifier set in the config file. (@hakusaro) * Fix message requiring login not using the command specifier set in the config file. (@hakusaro)
* Move `TShock.CheckSpawn` to `Utils.IsInSpawn`. (@hakusaro)
* Fix stack hack detection being inconsistent between two different check points. Moved `TShock.HackedInventory` to `TSPlayer.HasHackedItemStacks`. Added `GetDataHandlers.GetDataHandledEventArgs` which is where most hooks will inherit from in the future. (@hakusaro) * Fix stack hack detection being inconsistent between two different check points. Moved `TShock.HackedInventory` to `TSPlayer.HasHackedItemStacks`. Added `GetDataHandlers.GetDataHandledEventArgs` which is where most hooks will inherit from in the future. (@hakusaro)
## TShock 4.3.25 ## TShock 4.3.25

15
TShockAPI/TShock.cs
View file

@ -1825,7 +1825,7 @@ namespace TShockAPI
{ {
if (!player.HasPermission(Permissions.editspawn)) if (!player.HasPermission(Permissions.editspawn))
{ {
if (CheckSpawn(tileX, tileY)) if (Utils.IsInSpawn(tileX, tileY))
{ {
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.SPm) > 2000) if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.SPm) > 2000)
{ {
@ -1892,7 +1892,7 @@ namespace TShockAPI
{ {
if (!player.HasPermission(Permissions.editspawn)) if (!player.HasPermission(Permissions.editspawn))
{ {
if (CheckSpawn(tileX, tileY)) if (Utils.IsInSpawn(tileX, tileY))
{ {
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.SPm) > 1000) if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.SPm) > 1000)
{ {
@ -1906,16 +1906,7 @@ namespace TShockAPI
return false; 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> /// <summary>Distance - Determines the distance between two vectors.</summary>
/// <param name="value1">value1 - The first vector location.</param> /// <param name="value1">value1 - The first vector location.</param>

11
TShockAPI/Utils.cs
View file

@ -1525,6 +1525,17 @@ namespace TShockAPI
return (float)Math.Sqrt(num3); return (float)Math.Sqrt(num3);
} }
/// <summary>Checks to see if a location is in the spawn protection area.</summary>
/// <param name="x">The x coordinate to check.</param>
/// <param name="y">The y coordinate to check.</param>
/// <returns>If the given x,y location is in the spawn area.</returns>
public static bool IsInSpawn(int x, int y)
{
Vector2 tile = new Vector2(x, y);
Vector2 spawn = new Vector2(Main.spawnTileX, Main.spawnTileY);
return Distance(spawn, tile) <= TShock.Config.SpawnProtectionRadius;
}
/// <summary>Computes the max styles...</summary> /// <summary>Computes the max styles...</summary>
internal void ComputeMaxStyles() internal void ComputeMaxStyles()
{ {