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

Merge branch 'general-devel' into sqliteconf

Browse source
This commit is contained in:
Axeel 2020-05-20 22:46:15 +08:00 • committed by GitHub
commit 773092b7bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 54 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/TShock.cs
View file

@ -1048,7 +1048,7 @@ namespace TShockAPI
if (player.RespawnTimer > 0 && --player.RespawnTimer == 0 && player.Difficulty != 2)
{
player.Spawn();
player.Spawn(PlayerSpawnContext.ReviveFromDeath);
}
if (!Main.ServerSideCharacter || (Main.ServerSideCharacter && player.IsLoggedIn))