Merge branch 'general-devel' into regions

This commit is contained in:
Lucas Nicodemus 2018-05-06 09:07:15 -06:00 committed by GitHub
commit c06e000997
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions

13
.github/no-response.yml vendored Normal file
View file

@ -0,0 +1,13 @@
# Configuration for probot-no-response - https://github.com/probot/no-response
# Number of days of inactivity before an Issue is closed for lack of response
daysUntilClose: 7
# Label requiring a response
responseRequiredLabel: followup-required
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
closeComment: >
This issue has been automatically closed because there has been no response
to our request for more information from the original author. With only the
information that is currently in the issue, we don't have enough information
to take action. Please reach out if you have or find the answers we need so
that we can investigate further.

View file

@ -83,6 +83,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Removed the stat tracking system. (@hakusaro)
* Fixed erroneous kicks and bans when using `KickOnMediumcoreDeath` and `BanOnMediumcoreDeath` options. (@DankRank)
* Removed `TSPlayer.InitSpawn` field. (@DankRank)
* `OnPlayerSpawn`'s player ID field is now `PlayerId`. (@DankRank)
## TShock 4.3.25
* Fixed a critical exploit in the Terraria protocol that could cause massive unpreventable world corruption as well as a number of other problems. Thanks to @bartico6 for reporting. Fixed by the efforts of @QuiCM, @hakusaro, and tips in the right directioon from @bartico6.

View file

@ -803,7 +803,7 @@ namespace TShockAPI
/// <summary>
/// The Terraria playerID of the player
/// </summary>
public byte PlayerID { get; set; }
public byte PlayerId { get; set; }
/// <summary>
/// X location of the player's spawn
/// </summary>
@ -827,7 +827,7 @@ namespace TShockAPI
{
Player = player,
Data = data,
PlayerID = pid,
PlayerId = pid,
SpawnX = spawnX,
SpawnY = spawnY,
};