Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop
This commit is contained in:
@@ -48,20 +48,6 @@ namespace reallife_gamemode.Server.Events
|
||||
return;
|
||||
}
|
||||
|
||||
using (var loginUser = new DatabaseContext())
|
||||
{
|
||||
var user = loginUser.Users.SingleOrDefault(b => b.Name == player.Name);
|
||||
if(user.Dead == true)
|
||||
{
|
||||
player.TriggerEvent("startDeathTimer");
|
||||
player.SetData("isDead", true);
|
||||
}
|
||||
else
|
||||
{
|
||||
player.SetData("isDead", false);
|
||||
}
|
||||
}
|
||||
|
||||
player.SetData("isLoggedIn", false);
|
||||
player.Position = new Vector3(-1883.736, -781.4911, -10);
|
||||
player.FreezePosition = true;
|
||||
|
||||
@@ -48,7 +48,17 @@ namespace reallife_gamemode.Server.Events
|
||||
player.SetData("spec", true);
|
||||
var userBankAccount = loginUser.UserBankAccounts.SingleOrDefault(u => u.UserId == user.Id);
|
||||
userBankAccount.Balance = userBankAccount.Balance;
|
||||
player.TriggerEvent("draw", player.Name, player.Handle.Value);
|
||||
player.TriggerEvent("draw", player.Name, player.Handle.Value);
|
||||
|
||||
if (user.Dead == true)
|
||||
{
|
||||
player.TriggerEvent("startDeathTimer");
|
||||
player.SetData("isDead", true);
|
||||
}
|
||||
else
|
||||
{
|
||||
player.SetData("isDead", false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user